| f5037ad1ebb04e99622af5e99aeac0c1b44090b7 |
02-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 96076964863ee6887f0bed9d0f11f424b48ab9b9 |
01-Nov-2012 |
Andreas Huber <andih@google.com> |
Make video encoders' bitrate mode (constant, variable, ...) configurable
through the desired output format. Configure the video encoder to use
constant bitrate mode for WFD.
Change-Id: Id7bd619598153c13448a9c5acd69d80f8a01f333
related-to-bug: 7459597
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
|
| 006ceacb82f62a22945c7702c4c0d78f31eb2290 |
01-Nov-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 90a92053219ae50ddf4bb54e3d54db2d309e2b8d |
30-Oct-2012 |
Andreas Huber <andih@google.com> |
Various tweaks to wfd
related-to-bug: 7426218
Squashed commit of the following:
commit 1553f1a1c66af998674168f7f7a3be23fcb0c794
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:51:27 2012 -0700
Add LPCM, AVC and AVC HRD descriptors as necessary.
Change-Id: Ibc836fced0fe37e8a25574c2295e886765b9ea6f
commit 4e74db61d2d31ebe239acbdec8f110f88016a4ea
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:52 2012 -0700
added copyright headers to Sender.{cpp,h}
Change-Id: If615ccb8767e32bd83ed1f0f669acc39a72489f6
commit 7144bf8ae68c5cdb8faa6e219547aabbd750f04e
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:25 2012 -0700
Reenable suspension of the RepeaterSource
Change-Id: I765338fcde89c65e4b69be45a5949eba6bcdcf6f
commit 812164bcfa0699821d7d8eefcc0dff96b2e2cd08
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 14:03:50 2012 -0700
Add 2 stuffing bytes to the PES headers for audio tracks.
Change-Id: I8b9c634f6a565ab7fa7ecdb610f7d8557e0b139b
commit a084a741a63015d47c92d99fcd8b980fe615dc7d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:38 2012 -0700
Fix PCM audio packetization in WFD.
Change-Id: I99a435f9fe6b4397f24d6c22afae5ae2505ffc14
commit c5cb9369585f701f34bce41534940d5f9b59248f
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:12 2012 -0700
Support extraction of PCM audio from transport streams.
Change-Id: I28a0516756ebcb5587325b6588df013ac871ffb9
commit b0a0512300ae037d6b39c2d04952d34b5fc12b2d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 08:54:13 2012 -0700
disable suspend of the RepeaterSource
Change-Id: Ibf42a98185b0567f817ae582a82e6580f95d3d40
commit 4330e8b7668dc92a6d882b5622c0697cf292d04c
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 14:11:25 2012 -0700
Better handling of datagrams in ANetworkSession
reduce unnecessary copy overhead.
Change-Id: I2ed8c767274ba07764f03e8d4913041168e5755f
commit a44e73c322ba3f2c336f7cc4e1d63d3a74faa75d
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 11:14:47 2012 -0700
Network traffic is now handled on a separate thread.
Audio and video are queued to ensure proper A/V interleaving.
Scheduled packet sends according to capture timestamps to reduce
send-jitter.
Change-Id: Ibd6357c1e663086cf87bec0a98f8e54dfdfaa0e5
related-to-bug: 7426218
Change-Id: Ia440129d656c35814abf18df06da50b73d5bb554
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
edia/libstagefright/wifi-display/ANetworkSession.cpp
edia/libstagefright/wifi-display/Android.mk
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/Sender.cpp
edia/libstagefright/wifi-display/source/Sender.h
edia/libstagefright/wifi-display/source/TSPacketizer.cpp
edia/libstagefright/wifi-display/source/TSPacketizer.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 090e1b311aabe287eae5bc4f7816d0384f284713 |
29-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2295ce2c6fcf07ffaa134440691a8cea5fe35b43 |
27-Oct-2012 |
Dave Burke <daveburke@google.com> |
Increase bitrate now that other issues have been resolved.
Bug: 7426218
Change-Id: I67dfa1e4b85f326f355ad0ec5b6c699e87b45564
edia/libstagefright/wifi-display/source/Converter.cpp
|
| c0d3ce2614121cb15f8d27d5f9f53c65932af1c3 |
27-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| e815552c9cb17be79cb3b7eb6fbdfa9ad81c861b |
27-Oct-2012 |
Dave Burke <daveburke@google.com> |
Disable silence suppression (causes issues with dongles).
Bug: 7426218
Change-Id: Ie1517a8017bae1f9a9b6c224cd3170dfcc5fb941
edia/libstagefright/wifi-display/source/Converter.h
|
| 13ae89946332e776b57fa0752000ad4f0313ab44 |
25-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| b8d6efba8b87e6eeb049651cb67f9827198e658e |
25-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Don't hold locks while waiting to sync.
Bug: 7409877
Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
ervices/camera/libcameraservice/Camera2Client.cpp
|
| a183a3b03aef24bd93a512975e982afabefeb9e9 |
24-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| ac1a450a76c2f42f66c876200cb724d1e93ef4c7 |
24-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Don't attempt to seek audio and video separately." into jb-mr1-dev
|
| 32f5c03e678f829027e7e5dcd261b1b4bf1443eb |
23-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 14744c076e2e361f049e8c3c43cef502ba3fcbd5 |
23-Oct-2012 |
Andreas Huber <andih@google.com> |
Don't attempt to seek audio and video separately.
The widevine extractor doesn't deal too well with that...
Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff
related-to-bug: 7262386
edia/libstagefright/AwesomePlayer.cpp
|
| 6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc |
23-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
|
| 43b7ac6bd1a949ecb8ffc7e50d0a2f01a6258034 |
23-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Increase mode update timeout.
During camera startup, it might take a few hundred milliseconds before
requests start to be dequeued by the HAL. Increase the timeout for
synchronizing mode changes and triggers so that triggers near startup
don't time out.
Bug: 6970465
Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1 |
23-Oct-2012 |
Eric Laurent <elaurent@google.com> |
Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
|
| b1eb1a0dd38a36dd0c0626d3d57043dbd0042a92 |
23-Oct-2012 |
Eric Laurent <elaurent@google.com> |
stagefright: discard audio at start of capture
The new camcorder start sound is longer than previous one and we
must discard more audio when capture starts.
Ideally, camcorder should use synchronous record start.
Bug 7394330.
Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
edia/libmedia/MediaProfiles.cpp
|
| c4640c9eef850bb1c754bd6b477f1cc8350c6081 |
23-Oct-2012 |
Glenn Kasten <gkasten@google.com> |
Increase allowed number of VHQ resamplers to 3
Bug: 7378660
Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
ervices/audioflinger/AudioResampler.cpp
|
| 389572a3182f7c372b73d94023057eaf8e64e5d0 |
23-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| e384d75b95b9db30d64a18ada93e070cf07de306 |
22-Oct-2012 |
Mathias Agopian <mathias@google.com> |
Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
|
| 0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20 |
22-Oct-2012 |
Andreas Huber <andih@google.com> |
WFD use of HDCP is now optional.
if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't
we won't. If an HDCP session is established we'll tell our observer that
the connection is secure, otherwise we don't.
Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46
related-to-bug: 7368436
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| 61ea117b03b53382b5ecbc33004c7d37ea70ea8b |
21-Oct-2012 |
Mathias Agopian <mathias@google.com> |
Fix a typo that caused the high quality resampler to produce garbage
the problem is that if libaudio_resampler is present, it is those
coefficients that will always be selected, but the correct
meta-data.
Bug: 7385994
Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
ervices/audioflinger/AudioResamplerSinc.cpp
|
| ca890f5add8864e0eed0b41c260b369f091032d0 |
21-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| c3ed4a1c3ea71681c71de48c206a899e702864bd |
20-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
|
| 9e760d66c5dfae4d9688e32d7a02fca09569f7ef |
20-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
|
| 5127deb5c9fcfa0c84d4ccf0a9613e6a28d8bc38 |
20-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 347f35436be724a64272c41e6325f03fe6b9d43a |
19-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
AAC DRC reference level for mobile is -16dB
Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.
Bug 7370764
Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 3c9e53c6ea2b01506addd4fb1164e6a9bbe6e16f |
19-Oct-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Fix valgrind issues" into jb-mr1-dev
|
| 291f824e02ff517a34cfe50220b4e2b402ee998d |
19-Oct-2012 |
Glenn Kasten <gkasten@google.com> |
Remove active track when thread goes to standby
Bug: 7369232
Change-Id: I7ff9f525dad4be0aef562a53015b06ee7d3d50f1
ervices/audioflinger/AudioFlinger.cpp
|
| eba1b4d65a425b27a124f8ea456a9e0992eaa71f |
18-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| f1945f0435e431fab2e6b83337a1ffe71a8df28c |
18-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix potential deadlock
setPreviewWindow was holding a lock during long-lasting HAL calls
which may cause deadlock if the HAL calls back into the service during
the call. Stop holding the lock during these calls, since it's not
essential to do so.
Bug: 7320517
Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
ervices/camera/libcameraservice/Camera2Client.cpp
|
| ccd08439c7914d86264c7ad81bfd03cf39aaa9f7 |
17-Oct-2012 |
James Dong <jdong@google.com> |
Added some extra failure logging messages
o related-to-bug: 7282066
Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| a4fe9a13c432afc5d1e94a4617b75e8f962540e9 |
17-Oct-2012 |
Marco Nelissen <marcone@google.com> |
Fix valgrind issues
We were reading some uninitialized memory when creating bass boost and EQ
effects, and using memcpy() with identical source and destination.
Change-Id: I15ea1b2c52ae05cbf54aef04351e89805e0ebf8e
edia/libeffects/lvm/lib/Bass/src/LVDBE_Init.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Init.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| 7981764836b37fd761974caf5d5ee5b99c62e790 |
17-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| a21e5de9bc1777a5ac49e9216b29d52af1af39c8 |
17-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| ecfbc952d51c71832f739b7483dcc8cb5fe68038 |
17-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
|
| ac0cd56627b121081308213d5a327cfbae410f4d |
16-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Improve quirks focusing behavior.
- When scene mode is set and the AF quirk is in use, don't change AF
mode and then cancel when AF cancel is received. Just change mode
since that also implies a cancel.
- Only trigger quirks switch when a focusing area is set.
Bug: 7318812
Change-Id: I28d8755553bd78052e774701210cb94d84ee2046
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| bbe11e46faf8f9e3296431993c36d3efc61337b5 |
16-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Fix track estimation for presentation complete" into jb-mr1-dev
|
| a045dcafd2b77036210f5b72e79d745ad4c1b848 |
16-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix track estimation for presentation complete
Audio tracks were not using the right latency estimation for
signalling the completion of their presetation. This caused
the synchronization mechanism between playback and record to be
off, and a synchronized recording would contain some of the audio
that was meant to be over once recording would start.
Use the playback thread's latency reporting which takes the audio
pipe into account.
Bug 7237669
Change-Id: I23a907a53ad0b0d68d246789ec595a77a79fced5
ervices/audioflinger/AudioFlinger.cpp
|
| 547173205b3fd909dd72b597f6372840c38460e4 |
16-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Don't touch frame counter on output frames.
Bug: 7357069
Change-Id: I9cd0cdcc23959bfecced5f47bb9e8c59c997dade
ervices/camera/libcameraservice/Camera2Device.h
|
| d6cc4a62f3d94cad4dd36bd0a844ba8764177d26 |
16-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: When focus is already locked in CAF mode, do not trigger HAL.
In HAL2 CAF modes, once focus is locked by an AF trigger, additional
triggers will not cause AF notifications, since the state will not
change again until a cancelAutofocus call.
Since the old API still expects to see a notification, short-circuit
this at the service and send an immediate success notification.
Bug: 7318298
Change-Id: Ib209a24eaf2a35a247d06aea671efe80a33d751e
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| fd2dee0196e7e06779c3bb7b90be3f2ef9e8220d |
12-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| b4a55269a5b39c73de2cc1d4013d0631ef18c77d |
12-Oct-2012 |
James Dong <jdong@google.com> |
Fix some missing checks against missing codecs
o related-to-bug: 6971073
Change-Id: Ia6d926663231f9a9ef31c82c85c70595c4a30ebe
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 100a88984baa1b29ab3ac4dd662887767be9e4c2 |
11-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| a14be59340219c47639ec77a352d2af362551a6f |
11-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Don't error out of startPreview when already recording.
Bug: 7327474
Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 7e2c0a15bb8086460070811a152029726479a297 |
11-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Support querying active record sources" into jb-mr1-dev
|
| 907e5651c18d0e25073743a49a685fe1a385939a |
11-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Don't let unlocks happen during recording.
Bug: 7309020
Change-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17
ervices/camera/libcameraservice/Camera2Client.cpp
|
| a71766561fb4b411dc977377f73283e6ab410d07 |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 55f6c9dfd713776e251655b3ddd496b17df0926e |
09-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Do not set auto-white-balance regions from metering regions.
Per API documentation, metering regions are only for AE, not also for AWB.
Bug: 7312720
Change-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| d7086030fcf731e4bcef6c033cc6418cd04e6b91 |
10-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Support querying active record sources
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug 7314859
Change-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| c03792041b9dd6f7f54abd6c82bd6c755a336cd8 |
10-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera: Limit valid caller PIDs for camera clients.
Narrow down on PID checks to avoid cases where service can access the
camera even though it shouldn't be able to, per API semantics.
Bug: 6970469
Change-Id: Ic468a31949c28ef978b6ed48a70e4601c7ced684
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/CameraClient.cpp
|
| ed79d162614413cf42521cab798d4be8c4339c53 |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2b0db6aea3be519334f340ca97581db902196690 |
10-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
|
| 73125afc0333c9aba37749e605537342caca11cd |
10-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Switch audio mode based on dongle's capabilities" into jb-mr1-dev
|
| da2c89248e25e6ec299499b7da6bc156cf17af67 |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| d243c04534d1b74bd66625c5c96a9b918d8838bf |
10-Oct-2012 |
Andreas Huber <andih@google.com> |
Switch audio mode based on dongle's capabilities
properly parse rtp port and use it to setup session.
Change-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e
related-to-bug: 7318719
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| 9bd8a1de2af91c29f327f34503649f8d8a715575 |
10-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| dca0ac2193e87c57d871dd208073107408c13c0a |
10-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
|
| 44f120fa169cb3131ec853c638ea9c88a9b33b97 |
09-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera: Clear Hardware device pointer when initialization fails
When disconnecting, don't try to call device functions if the initialization
fails since this can lead to internal HAL segfaults.
Bug: 7317107
Change-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff
ervices/camera/libcameraservice/CameraClient.cpp
|
| 3d84d38e7ac02b47d17f4bb272f18f8b0e873104 |
09-Oct-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
|
| a3ee047fd8e2a63253f70346925c3ffd069dfc99 |
09-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix uninitialized parameters.
Some parameters were not being set to default values, causing strange
flakiness in any app that wasn't calling setParameters. This includes
many CTS tests.
Bug: 6970468
Change-Id: If91635afc000e23862e7b039292a55349274c5ee
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| d016cf5b12cb73bd49bcecb0d5a4958df23620c3 |
09-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
|
| 350d3b686357a159fb1a962bbd41e01924d27cad |
09-Oct-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
|
| 5f0714eb039c07554bef6ec289c70ed1164fdf52 |
09-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Call onAutoFocus immediately for fixed-focus cameras
Bug: 7311578
Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee
ervices/camera/libcameraservice/Camera2Client.cpp
|
| b2187fcaa294ab43c60236a980848521cc9484b3 |
09-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2458d482c4822c6f9e6274f5bd12b6aea095a9cd |
09-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
|
| 1e6ccd5c78016ac9f9247cb8337cf263b3afb73e |
08-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Move non-ZSL shutter sound firing to be later.
Instead of firing shutter sound when capture request is submitted for
non-ZSL captures, fire it when the metadata frame is received. This
guarantees that the shutter sound fires after picture capture is
completed by the sensor.
Bug: 7259900
Change-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
|
| bac4a4a9073a440bc6df7ca2306604819aa1c342 |
09-Oct-2012 |
Eric Laurent <elaurent@google.com> |
audio policy: deprecate ro.camera.sound.forced
The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService.
Do not read ro.camera.sound.forced is not needed anymore.
Bug 7032634.
Change-Id: Ic0a6396fc4b6efb91cdb4dffe0c8eb035d0440bd
ervices/audioflinger/AudioPolicyService.cpp
|
| 036bc3e2cfc5a11c3f7ace41088c8936dae2e946 |
09-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Always disconnect in the client destructor
If Camera2Client failed to initialize, it would skip disconnect step,
and thus the camera would be forever marked as busy. By always calling
disconnect it will always call free.
It also adds a new guarantee that Client::disconnect is idempotent
Bug: 7298182
Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5
ervices/camera/libcameraservice/CameraService.cpp
|
| 82edd5431951f461058c07b73c0dbc093aa45c99 |
08-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: isSmoothZoomSupported should return FALSE
Bug: 7308024
Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| 6f854608d26d7abcce5e46396c7260ed7b250653 |
08-Oct-2012 |
Alex Ray <aray@google.com> |
Camera2: Set default flash mode to FLASH_OFF
Bug: 6970090
Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| 4c9aeb21051e908b0a0a0864a04a96a4109717a1 |
08-Oct-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
|
| b8f0090af19b95027d2e08667c662d058832f94b |
08-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev
|
| 709bc10c04a9b62875b1c7f1f69486cf275338ba |
08-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Fix Parameters#setZoom off by 1 validation error
Bug: 7298683
Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| e18c1cce29dde2054ce52b9135b152901883ca91 |
08-Oct-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
|
| d5087f91357a9218580596b466926ab750bc8ea7 |
05-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: On stopping preview, wait until captures are completed.
If preview is stopped while a still capture or a video snapshot is
underway, wait until the capture completes before stopping preview.
Also use the same behavior for disconnect - do not shut down the
camera device until captures are complete.
This works around HAL implementations which report to be done
(get_in_progress_count returns 0) even when a capture is still
outstanding.
Bug: 7276954
Change-Id: I66290acf1740cc330eadecbcded0c59fa9c5d2fd
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
|
| 7d55da3fab7090e8f8de981af7396cbc841b9837 |
08-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| c8823995d16b909fae30ff4f94217e875d3e8c8a |
01-Oct-2012 |
ty.lee <ty.lee@lge.com> |
audioflinger/resampler: add build source for libaudio-resampler
Bug: 7229644
Change-Id: I93bde36be1c3ec84174a4c98423e28f8b3d8782f
Signed-off-by: ty.lee <ty.lee@lge.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/audioflinger/Android.mk
|
| 16cd9950a486d2ae8f4ea7a0eb3610fffce93868 |
07-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 4d410ede659448557398c84552eb0bf50ef09cbc |
06-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix off-by-one error in ZSL selection.
Bug: 7258126
Change-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| 7d2a4aaaf5691ee523fc0d03c286620f392ed16f |
06-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
Bug: 7298805
Change-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| f6e09d200c3e043737adcdadd52310ebbd1b19da |
05-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Unconditionally shut down streams on disconnect.
stopPreviewL may do nothing in certain states. Stop streams directly
to avoid those failures, so that we always maintain the HAL interface
invariant that streams referenced by in-flight requests are never
deleted.
Bug: 7276954
Change-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 7373cbe85e617345f7002256a4be389fe62af913 |
29-Sep-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Fix metering regions to take into account the current zoom/crop region
Also adds a quirk to disable this fix to work around for incompliant HALs
Bug: 7246065
Change-Id: I80bad25e56ba59149270238e5639bb33cae495ae
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| ef33212df1b937e187cca4ffcb9269775e1a4dd8 |
05-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Don't promote weak IBinder ptrs to strong ones
The Binder driver does not support promoting weak pointers into strong
pointers. Occassionally the system would lock up when trying to do this
(when closing the camera app).
Bug: 7289040
Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| af3d28870f7890370d6acb21d20cf1ccab4b9e08 |
04-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Change policy for calculating previewFpsRange from previewFps
Bug: 7259959
Change-Id: I759a559d7115201264f88db1f23edc2d6aef6c43
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| becb0bc4b620dcd88b559d821e40a9ca7ced5604 |
05-Oct-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev
|
| 294d0eca9eabfaa3ef0ee8bee7ccf3eaaa925e41 |
05-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Don't promote weak IBinder ptrs to strong ones
The Binder driver does not support promoting weak pointers into strong
pointers. Occassionally the system would lock up when trying to do this
(when closing the camera app).
Bug: 7289040
Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 38f1a2cb3c0f6fd3a4b9659e1761f3ff4128b1c3 |
05-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| c10ea778f589283d67ede3a0e1c10ab960962e77 |
04-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Fix deadlock while zooming during record
Acquired SharedParameters before mMutex in StreamingProcessor,
this avoids any potential deadlocks since Camera2Client code would
always acquire SharedParameters first before invoking StreamingProcessor.
Bug: 7275259
Change-Id: Ia741162c455300378bee049f063590ece5328b95
ervices/camera/libcameraservice/camera2/StreamingProcessor.cpp
|
| 95069fefbdf54d87a624c2ac73727fce1c38545e |
04-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use the triggerAfWithAuto quirk
When this quirk is set, and a scene mode is enabled, do AF calls with
AF mode AUTO instead of whatever the scene more override AF mode is.
Bug: 7159577
Change-Id: I3ea6b8386abc0968047fc9bba3a35c5db5bdcfd3
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| 4865c526e681366481b0ab242ffa1ead57bb02cc |
02-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Synchronize mode changes and triggers
Make sure that changes to various parameters have reached the HAL
before triggering asynchronous events like autofocus or precapture
metering.
Bug: 7107220
Change-Id: I3c50038de1671968eb32004ce538435121934e7e
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
ervices/camera/libcameraservice/camera2/FrameProcessor.cpp
ervices/camera/libcameraservice/camera2/FrameProcessor.h
ervices/camera/libcameraservice/camera2/StreamingProcessor.cpp
ervices/camera/libcameraservice/camera2/StreamingProcessor.h
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.h
|
| 9942f62d6a5ee0a65da751b681217d3c4243cd89 |
05-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev
|
| 1f915a85fedc14757c91e59a62ea6d612ce548bf |
04-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev
|
| ec7710898208162576c3242f5a590651ab42aa2d |
04-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Include JPEG settings in ZSL requests.
Bug: 7287743
Change-Id: I1aba81b228451c3df712ce1f42b7aab79cac575f
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.h
|
| e7bd24af08ef0722fb124a550662bcec48c56f86 |
04-Oct-2012 |
Andreas Huber <andih@google.com> |
Optionally emit LPCM audio instead of using AAC in wifi display code
related-to-bug: 7248248
May decrease power usage at the cost of significantly increasing audio bitrate.
Use "adb shell setprop media.wfd.use-pcm-audio true"
to turn it on (must be done before connecting).
Change-Id: I7ebeadf3209e01522a2644948287b23d7c383c7e
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/TSPacketizer.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| 7ffab2933bfc50ee0b64ea586b663dcb9275d593 |
04-Oct-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Integrate improved coefficient sinc resampler: VHQ" into jb-mr1-dev
|
| f66cc52cc5a075b86b585cf72c4a41f6907b2142 |
04-Oct-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev
|
| ac6020508acedd316391dee42329040bf45f8d90 |
01-Oct-2012 |
Glenn Kasten <gkasten@google.com> |
Integrate improved coefficient sinc resampler: VHQ
Summary:
Very high quality is enabled only for 44.1 -> 48 or 48 -> 44.1,
and uses low quality for all other use cases.
Track estimated CPU load and throttles the quality based on load;
as currently configured it should allow up to 2 instances of very high quality.
Medium quality and high quality are currently disabled unless explicitly requested.
Details:
Only load .so the first time it is needed.
Cleanup code style: formatting, indentation, whitespace.
Restore medium quality resampler, but it is not used (see next line).
Fix memory leak for sinc resampler.
Check sample rate in resampler constructor.
Add logs for debugging.
Rename DEFAULT to DEFAULT_QUALITY for consistency with other quality levels.
Renumber VERY_HIGH_QUALITY from 255 to 4.
Use enum src_quality consistently.
Improve parsing of property af.resampler.quality.
Fix reentrancy bug - allow an instance of high quality and an instance
of very high quality to both be active concurrently.
Bug: 7229644
Change-Id: I0ce6b913b05038889f50462a38830b61a602a9f7
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/vss/src/VideoEditorResampler.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.h
ervices/audioflinger/AudioResamplerSinc.cpp
ervices/audioflinger/AudioResamplerSinc.h
|
| 8f0e26366934d6acc8fa0fce21e95425f16f7650 |
04-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| d69fd4d2567f9fce02252ce10d7ae3a28fc79e04 |
04-Oct-2012 |
James Dong <jdong@google.com> |
Merge "Enable hdcp for WiFi display" into jb-mr1-dev
|
| 04273cb14d2326e85bb047ea6ef75294c8b3d561 |
04-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Fix deadlock while zooming during record
Acquired SharedParameters before mMutex in StreamingProcessor,
this avoids any potential deadlocks since Camera2Client code would
always acquire SharedParameters first before invoking StreamingProcessor.
Bug: 7275259
Change-Id: Ia741162c455300378bee049f063590ece5328b95
ervices/camera/libcameraservice/camera2/StreamingProcessor.cpp
|
| d6cc864079212a384692204a4c0183e8bf145121 |
03-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Properly update FPS range when FPS is set.
Otherwise a getParameters followed by setParameters will trigger an
incorrect reversion in FPS parameters.
Bug: 7279267
Change-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| 0c978a82784ce90c95e17040033f292d562680f4 |
03-Oct-2012 |
Dave Burke <daveburke@google.com> |
Drop video bitrate to 2.5mbps.
We have too much corruption/loss at higher bitrates. Reviewed quality
trade-off with jdong@. We can increase in the future if we have a
better packet loss concealment solution.
Bug: 7241844
Change-Id: I3b500a9c3a4429e834fb4c5ca04164d4e106fa9e
edia/libstagefright/wifi-display/source/Converter.cpp
|
| ab99f0450dc5743415a2817b539c9e757ede4836 |
03-Oct-2012 |
Andreas Huber <andih@google.com> |
Better power savings with wifi display code.
No more polling the encoder for work to do, the encoder instead notifies
if there's activity.
Change-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778
related-to-bug: 7248248
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
|
| 0c1916460b8adbfe402778aa247e98573c5849e8 |
03-Oct-2012 |
Andreas Huber <andih@google.com> |
Increase polling frequency again temporarily to fix A/V issues
Fixes a bug in the silence detection and increases the timeout after which
we enter "silent mode" to 10 secs.
Change-Id: I802b058f054becd5c377186664437f7b3970193f
related-to-bug: 7248248
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| ce953ce4d698155c50356df093712df1dea76051 |
04-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev
|
| 260f267288502b73d1920a3701be2038753125b5 |
03-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Properly update FPS range when FPS is set.
Otherwise a getParameters followed by setParameters will trigger an
incorrect reversion in FPS parameters.
Bug: 7279267
Change-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| c20630569431234db23b6182dd17102023dee68e |
03-Oct-2012 |
Alex Ray <aray@google.com> |
Camera2: Fix prematurely clearing stream request
Zsl handling was clearing the stream request before a capture request
was ready to be sent to the HAL, which would cause capture delays and
timeouts in certain conditions.
Bug: 7259520
Change-Id: Idde8bc4fc58b8b426c6985feac87759740e338ea
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| 16c090555adf9f37bad0f061fd2651b91a34ae41 |
03-Oct-2012 |
James Dong <jdong@google.com> |
Enable hdcp for WiFi display
o related-to-bug: 7055369
Change-Id: Ie1ddd1e961f9ff60fe32b57cf7f8de4f4ecf5aa0
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| b3e97b347dceb882983427ac872b772e25f3f166 |
03-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Fix trying to release HAL stream twice
When we fail to disconnect the native window, StreamAdapter::release
would fail and remain in the old (ALLOCATED) state, thus it thinks that
we haven't released the HAL stream yet.
With this change, ignore DEAD_OBJECT native window disconnect failures,
so the state transitions to RELEASED and we don't double release HAL
streams.
Bug: 7258314
Change-Id: I524893e4b4d6463d7b0a7ce32fb6f658afba8e11
ervices/camera/libcameraservice/Camera2Device.cpp
|
| ecf17e82505fdb60d59e00b6dd59036df93de655 |
03-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Handle client processes dying by closing camera resources
CameraService now subscribes to binder death notifications
for each client, and disconnects the client if the death happened
without cleanly shutting down the client first.
Bug: 7258314
Change-Id: I7803836b589fd8f0dfe00f6c28a707b82012e751
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/CameraClient.cpp
ervices/camera/libcameraservice/CameraClient.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
ervices/camera/libcameraservice/camera2/CallbackProcessor.cpp
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
ervices/camera/libcameraservice/camera2/StreamingProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| 22d58d37db6b5f48a10b3a19f69ffda09943c125 |
03-Oct-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Don't change state when reconnect is called
Bug: 7252802
Change-Id: Ibed4f59a96bef75bf84b1aaf1235fb87e94102ef
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/StreamingProcessor.cpp
|
| 9f9d7de77beb65ab51e73e55eea6f0b3a4e75bd2 |
03-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Drop video bitrate to 2.5mbps." into jb-mr1-dev
|
| 1bac89725021fee46f953d7d5f35690ff01e91f2 |
03-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Use ZSL format quirk." into jb-mr1-dev
|
| 9f71aed36f7bb58fd8b077a5c6e414fc4af1805c |
03-Oct-2012 |
Dave Burke <daveburke@google.com> |
Drop video bitrate to 2.5mbps.
We have too much corruption/loss at higher bitrates. Reviewed quality
trade-off with jdong@. We can increase in the future if we have a
better packet loss concealment solution.
Bug: 7241844
Change-Id: I3b500a9c3a4429e834fb4c5ca04164d4e106fa9e
edia/libstagefright/wifi-display/source/Converter.cpp
|
| 4401091bc89fc69b7fc7df58cf6b403776f2698a |
03-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Better power savings with wifi display code." into jb-mr1-dev
|
| 575a5361fc970476cd7979638ee3ac00cc6e5024 |
03-Oct-2012 |
Andreas Huber <andih@google.com> |
Better power savings with wifi display code.
No more polling the encoder for work to do, the encoder instead notifies
if there's activity.
Change-Id: Ia707211b4f5c5a6e6b70d750233d204a2d6bb778
related-to-bug: 7248248
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
|
| 3a555c19dbd6ae7bf0d63cb9879befb22773770d |
03-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Increase polling frequency again temporarily to fix A/V issues" into jb-mr1-dev
|
| 8d16bbc5a354d302abfd912b8d88d9c7feb3948f |
03-Oct-2012 |
Andreas Huber <andih@google.com> |
Increase polling frequency again temporarily to fix A/V issues
Fixes a bug in the silence detection and increases the timeout after which
we enter "silent mode" to 10 secs.
Change-Id: I802b058f054becd5c377186664437f7b3970193f
related-to-bug: 7248248
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| 9e46cc01a439bfee3f4efc889840db0f23770f0c |
03-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| e382ee28709b83264a46b09e8f766c5ef42efa35 |
03-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use ZSL format quirk.
Switch service to using HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED,
unless ZSL quirk is set.
This is important for compatibility across multiple implementations.
Bug: 6243944
Change-Id: Iea74671cbb44890a07e4f99cd757b0a5423d447a
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| ee40d832e55847182412b0f56da652af054d7c06 |
03-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Use scene mode override parameter" into jb-mr1-dev
|
| 2808b5902a4dd70be231fcb2e3131eb1944807da |
03-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Bug 7170947 Configure AAC decoder for mobile DRC settings" into jb-mr1-dev
|
| 4213e9db1cc57ab593bb63432b4e0cf477c3f835 |
02-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 7170947 Configure AAC decoder for mobile DRC settings
Configure the AAC decoder to use the modile DRC settings when
decoding streams with DRC metadata.
Settings are:
- target reference level of -12dB
- DRC compression factor (attenuation) at max
These settings can be overridden by platform properties if the
default values are to be modified.
Change-Id: If329fe566497685b735abe4e4b9a5e01697c063b
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 8a42dd8cd1a245d844f96cfd67dc342d7937e353 |
02-Oct-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use scene mode override parameter
- Read in SCENE_MODE_OVERRIDES static parameter if available.
Use it to select AF/AE/AWB modes when a scene mode is set.
- Add quirks structure to parameters; not yet used
- Fix desynchronization between range and single FPS value.
Still need to sort out best way to convert from one to another.
Bug: 7259959
Bug: 7159577
Bug: 7172543
Change-Id: I0d07c31d5f21fbc4b0ec2fa23f7f778073d2d6e0
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/BurstCapture.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| 47aa9c47a0796bb695d09aa307b2d1c2c913f0eb |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Enable silence detection and don't driver the audio encoder" into jb-mr1-dev
|
| 805b3ae300ea414ce5973e60a9b544169da0ac44 |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Now back to 30fps, suspend updates if surface flinger didn't send us" into jb-mr1-dev
|
| f5aa7aa94465e774ccdb07039690a5f42de1518a |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
|
| 16461dca0ba8ac1850463db6245d20dc1699279d |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Increase converter polling interval." into jb-mr1-dev
|
| f1b9504587b04d8a7067aca90b1f0575ccf74bb9 |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Take advantage of the hardware encoder's ability to prepend SPS/PPS" into jb-mr1-dev
|
| cf2604f8940093e249ed7e5382c12ba544a48545 |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Enable silence detection and don't driver the audio encoder
or send any audio out over the network if we've seen at least one second
of silence.
Change-Id: Ic2bca4ce7d55bd246283dc669f5f5cb6106d88ea
related-to-bug: 7248248
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
|
| 4a8b9a2363b7b7b4f98022e6d9aae8b8aa8e35e5 |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Now back to 30fps, suspend updates if surface flinger didn't send us
any new frames for one second or longer.
Change-Id: I1c2ec349b0a4b7c4eb9dcdde483362ec87dd69fa
related-to-bug: 7248248
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/RepeaterSource.cpp
edia/libstagefright/wifi-display/source/RepeaterSource.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 887070dbe6b6258ba04f988fd90c3ac856d2e5bf |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
More power savings: No need to keep a history of outgoing packets
if we're not enabling retransmission anyway.
Change-Id: I361120607974a2fab758c28b5033716213aef88e
related-to-bug: 7248248
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
|
| 0389cc09f7b90f155a8942a0d2e1925cad1dbe2d |
02-Oct-2012 |
Marco Nelissen <marcone@google.com> |
Fix video continuity
Fixes "pixelation" seen after seeking in Netflix.
b/7211673
Change-Id: Id675acaef1e5fd7151fdfa7bd79e2f25990e1ecd
edia/libstagefright/mpeg2ts/ATSParser.cpp
|
| 21daec5798f7e13c5ab6b513d27b3f79d4779bca |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Increase converter polling interval.
Change-Id: I455005086a63c70883a71e189753a117b195f22f
related-to-bug: 7248248
edia/libstagefright/wifi-display/source/Converter.cpp
|
| c6920dfdca378a168a2168f4a64d21af4d37d539 |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Take advantage of the hardware encoder's ability to prepend SPS/PPS
to IDR frames instead of doing it manually.
Change-Id: I994cfbd6539013406dd610393ba1f0b9a0dbf4d5
related-to-bug: 7245308
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/TSPacketizer.cpp
edia/libstagefright/wifi-display/source/TSPacketizer.h
|
| ad9ffe6fe833d06b15e15b558b224f9f583ff0d1 |
02-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| bd710197a47e3772763c48bfb5d6be21df173a7f |
02-Oct-2012 |
Jeff Tinker <jtinker@google.com> |
Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev
|
| ee178668818eb4f43ff40735405f8fc42372620f |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Use incremental updates sent by surface flinger
instead of running at a fixed framerate.
Change-Id: Ia3f36aa449e2e952bf3263ffbb709a9b79b09c26
related-to-bug: 7266398
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 1c730d33da2fa861000b3990b5e6c9ff69291387 |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
|
| 1a0d1670b4304f294530f4ca9ce68defad6445dc |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
|
| 32ca2bfbe8b74a9d22d012c3df57983a661b8088 |
01-Oct-2012 |
Andreas Huber <andih@google.com> |
Perform an orderly shutdown if possible, force disconnect if necessary
wait for up to 2 secs for the dongle to send us a "TEARDOWN", after that
forcibly shutdown the connection.
Change-Id: Ie049857cd468b7af6986d6305f725c54571b2276
related-to-bug: 7258622
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| 27f706e4db4fc53f63e60d80c19a435fb8bf78b9 |
01-Oct-2012 |
Andreas Huber <andih@google.com> |
Remove double negatives from SurfaceMediaSource
ensure mStarted actually reflects the state of SurfaceMediaSource
Change-Id: I92557896993ad8da23fe6940e997402ad63b8cbc
related-to-bug: 7258622
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 7352fca8d879f0d65807ed03221bf5c4fd4027b6 |
01-Oct-2012 |
Andreas Huber <andih@google.com> |
Make sure we still handle shutdown-related message even if we're
in error-state.
Change-Id: Ie12dd1a63306b4020b9de9eae007f6d768f02df6
related-to-bug: 7262673
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| af5dd7753e62353411cf0daf3b513c38818e9662 |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
Change-Id: Ia31eb0940b02581327a8bf51af6df135f9ab6de3
related-to-bug: 7266324
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/TimeSource.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/ThrottledSource.cpp
edia/libstagefright/TimeSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/foundation/ALooper.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
edia/libstagefright/rtsp/ARTPAssembler.cpp
edia/libstagefright/wifi-display/source/MediaPuller.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| 0868deae404604b577892413c128d55a2bafc56e |
02-Oct-2012 |
Andreas Huber <andih@google.com> |
Optionally have SurfaceMediaSource return absolute timestamps
based on systemTime().
Change-Id: I2eff15dd149a4b737d6e7473d1907cf0c80b6b38
related-to-bug: 7266706
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 0cb47712a4fc0e01ad8680ee6ac3a5d72eafe0ba |
01-Oct-2012 |
Andreas Huber <andih@google.com> |
Inform DisplayManager that we're running over a secure channel (HDCP)
if that's the case.
Change-Id: I5f16cad04a6937a3fb65600a971866a77e0ae9fc
related-to-bug: 7265406
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| a3fafcb4ee6d6344f2b5b602d095a4ffebc8dbb7 |
01-Oct-2012 |
Jeff Tinker <jtinker@google.com> |
[WVDRM] Fix for stuttering on low bandwidth
Reintroduces the play/pause rebuffering logic we eliminated
in JB zero day to fix double spins and slow startup - but
activates that logic only based on a comparison of the
current bandwidth measurement and the lowest bitrate track
in the movie.
Needs to be submitted with related changes in /vendor/widevine
bug: 7230071
Change-Id: If4f5ecda36c4858ce8bf5c4abb722f90a329ecdb
edia/libstagefright/AwesomePlayer.cpp
|
| ad0d97c7cf620e96a0b088dd9461645a3f8900b7 |
01-Oct-2012 |
Andreas Huber <andih@google.com> |
Perform an orderly shutdown if possible, force disconnect if necessary
wait for up to 2 secs for the dongle to send us a "TEARDOWN", after that
forcibly shutdown the connection.
Change-Id: Ie049857cd468b7af6986d6305f725c54571b2276
related-to-bug: 7258622
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| 0e1d71641624c641a0a1abe4098943f5a42c6f94 |
01-Oct-2012 |
Andreas Huber <andih@google.com> |
Remove double negatives from SurfaceMediaSource
ensure mStarted actually reflects the state of SurfaceMediaSource
Change-Id: I92557896993ad8da23fe6940e997402ad63b8cbc
related-to-bug: 7258622
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 6360758ce2d171169d2a21e30266547ee4ac0fec |
01-Oct-2012 |
Andreas Huber <andih@google.com> |
Make sure we still handle shutdown-related message even if we're
in error-state.
Change-Id: Ie12dd1a63306b4020b9de9eae007f6d768f02df6
related-to-bug: 7262673
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| 458923c1225977d8c5b596deffcb70fcabe9b139 |
01-Oct-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 087dd8e7232e4c009e9121ab7e8c37985522c9ad |
27-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Disable audio watchdog
It's not critical, and is wasting power
Bug: 7241714
Change-Id: I6ad4375f0000c92529688723dbe0ff0caa809c5d
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
|
| 4769f0b873030bbaa6977fe18696961d1d1b26ba |
30-Sep-2012 |
Dave Burke <daveburke@google.com> |
Merge "Even cleaner shutdown." into jb-mr1-dev
|
| 7165491b8fe140609ab987b510ad1a55715856e9 |
30-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "bug 7253033 clean up before closing an output" into jb-mr1-dev
|
| d13df2463bd09d8c1fc5b20050d3262a4e89512d |
30-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Enable write side of MonoPipe to be shutdown" into jb-mr1-dev
|
| 2bfc6b42b3733c12485dd51ed95191956abc3e4e |
28-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
bug 7253033 clean up before closing an output
An output can only be closed if there is no lock contention that
prevents ThreadBase::exit() from being blocked. If an output
device is waiting for an operation to complete (here a write
in the remote_submix module, because the pipe is full), signal
the module that it's entering the "exiting" state.
Change-Id: I8248add60da543e90c25a4c809866cdb26255651
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| a317c9d3c3aed59d5b136768b1707bdd0d73ea09 |
30-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 73bbd1f1c493835f191ea2b0b72439292496b40a |
26-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Refactor preview/recording management to separate class.
Untangle preview/recording management from main class to simplify
callpaths; in preparation for fixing several HAL/app interactions
bugs.
Bug: 7172543
Bug: 7159577
Bug: 7107220
Change-Id: Iab5503f66b35d88a1524111536a484c9e33fd934
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
ervices/camera/libcameraservice/camera2/JpegProcessor.h
ervices/camera/libcameraservice/camera2/StreamingProcessor.cpp
ervices/camera/libcameraservice/camera2/StreamingProcessor.h
|
| 0517e304d0cce25653a033e3cb00172d54ba251d |
28-Sep-2012 |
James Painter <jpainter@google.com> |
DO NOT MERGE: Remove experimental parameters for burst mode
Bug: 7248756
Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| 77245813007cf903b4b73f5d0cd20313fbf0e510 |
29-Sep-2012 |
Andreas Huber <andih@google.com> |
Even cleaner shutdown.
Change-Id: I5a76f83db3a5e43f55eb4e04269d890c2015bae7
related-to-bug: 7247918
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/RepeaterSource.cpp
edia/libstagefright/wifi-display/source/RepeaterSource.h
|
| 003d9f71937070791418bf7efc1f7fe1e4c6b821 |
28-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Enable write side of MonoPipe to be shutdown
Bug: 7253033
Change-Id: Iea8390763b59ffa7a8e2a6b77dd04ea23442698f
nclude/media/nbaio/MonoPipe.h
edia/libnbaio/MonoPipe.cpp
|
| bbe96f0f05a1f1a1b3cfec0d124cb0d63c1ebf2a |
29-Sep-2012 |
Andreas Huber <andih@google.com> |
Fix shutdown if HDCP was never instantiated.
Change-Id: Icdf6785880180f417c5432dff54c7e0fb12ef84d
related-to-bug: 7247918
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 23f74017a2c457a25382677b6e696c4cfa06cef5 |
28-Sep-2012 |
Alex Ray <aray@google.com> |
Merge "Camera2: Use new JPEG transport header" into jb-mr1-dev
|
| 3a0ef0dc71f3776d115f30d87f1d8867daefea88 |
28-Sep-2012 |
Andreas Huber <andih@google.com> |
Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.
Change-Id: Ic40e09b66784dd2e370d30b688d50561a47ab85a
related-to-bug: 7245308
edia/libstagefright/ACodec.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| e646b2d26459ca30667097e9600ee3f57ebfd228 |
28-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev
|
| 24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b |
28-Sep-2012 |
Alex Ray <aray@google.com> |
Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
|
| 96fc6cc65ca93009a759a3a874b82a35771b9714 |
28-Sep-2012 |
Andreas Huber <andih@google.com> |
Various improvements to a cleaner shutdown of the wifi display connection.
Change-Id: Id029a89939e53c2bd1d20e572d3975ec2795c239
related-to-bug: 7247918
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/wifi-display/ANetworkSession.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
edia/libstagefright/wifi-display/source/MediaPuller.cpp
edia/libstagefright/wifi-display/source/MediaPuller.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/RepeaterSource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| a7c4c30766f47814ed889b09f5d2f507cca6517b |
28-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 0fa1e760f7093d025c977e5813e8d3a04c863ce3 |
28-Sep-2012 |
Alex Ray <aray@google.com> |
Camera2: Use new JPEG transport header
Check for new JPEG transport header at the end of the stream buffer
instead of at the beginning.
Bug: 7108816
Change-Id: I26c52267cb406dae50c9d0ee01e6c26359ba84aa
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
ervices/camera/libcameraservice/camera2/JpegProcessor.h
|
| d0cec0cb574a3d629afb7c32883bc986d7a65535 |
28-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Only _some_ FPS values in the old API are scaled.
The (deprecated) single-FPS parameter is not scaled by 1000.
Bug: 7230239
Change-Id: I5664cce90f9cb01e57e39f1a1f7c8eb730501da3
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| 12d3e887c6cefcd5ae0abce528ea576950ce6b9f |
28-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev
|
| de799a74064a363d26f4c1bbc5a59d1b7127f49f |
27-Sep-2012 |
Andreas Huber <andih@google.com> |
wfd_presentation_url should not include the port number according to wfd specs
Change-Id: I9c0e0174f6ab4cb24c6eafcaae853e432b3dffb9
related-to-bug: 7247490
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| ecc8db5ee83d648532be1392f53277aa3a25284e |
27-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
|
| 5cfd237fd70572796b86f977ff4fdfe29cab888d |
27-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
|
| ef7d3793fa9bbfb25253626ede9a020ee9280a17 |
27-Sep-2012 |
Andreas Huber <andih@google.com> |
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
Change-Id: Ie54ee3edd672ec629360b4ecc5df2f85ecbaa45f
related-to-bug: 7247584
edia/libmediaplayerservice/HDCP.cpp
edia/libmediaplayerservice/HDCP.h
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| c9d7e4da3f963dadbea19e9b520fb7a7e28e614a |
27-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix FPS value scaling between HAL2 and API
API assumes FPS values are in fixed-point with LSB 0.001; HAL2 just
uses ints with no fractional part.
HAL should probably use floats or something similar, but for now, fix
scaling so the two agree on FPS values.
Bug: 7230239
Change-Id: Ie18a4f11fc9d17d9ae2d04781511a273213eda55
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| f58cac48e5732dbc4a5f33eed9cd39f109146ca4 |
27-Sep-2012 |
Dave Burke <daveburke@google.com> |
Tune WFD audio bitrate (did some listening tests).
Bug: 7241844
Change-Id: I5243f7a771871e650c6c2f380e0e81e7671c7bac
edia/libstagefright/wifi-display/source/Converter.cpp
|
| e399acc9d9f3b7af72106c4209e4bb40de37aa6a |
27-Sep-2012 |
Andreas Huber <andih@google.com> |
Prepend SPS/PPS manually before encryption in HDCP mode. This is
a temporary change that will go away once the encoder can take care
of this.
Change-Id: Id65218f8a250d8c8fe3e8987b522065b5f5d7dca
related-to-bug: 7245308
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/TSPacketizer.cpp
edia/libstagefright/wifi-display/source/TSPacketizer.h
|
| e3c7774fc608fdaa8f8810affa8111d6072bc0ed |
27-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 77449ada4b5ca73a948aa4fef9aafe3079a66d61 |
27-Sep-2012 |
Alex Ray <aray@google.com> |
Camera2: Re-entering preview state on v2 Device
Bug: 7240891
Change-Id: I6a01b27197b4ee89a68f06f4375d315a716b67ae
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 6d6a4d3f37b332284b8b976bd5bb21d29007a97e |
27-Sep-2012 |
Iliyan Malchev <malchev@google.com> |
Merge changes Ia4414241,I34f5d36a into jb-mr1-dev
* changes:
audioflinger: use resample coefficients from audio-resampler library.
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
|
| 76b111685010e1fea7c0a865c038aee35507fde4 |
17-Jan-2012 |
SathishKumar Mani <smani@codeaurora.org> |
audioflinger: use resample coefficients from audio-resampler library.
-Add a separate quality VERY_HIGH_QUALITY in resampler
-Use resample coefficients audio-resampler library for
quality VERY_HIGH_QUALITY.
-This improves the quality of resampled output.
Bug: 7024293
Change-Id: Ia44142413bed5f5963d7eab7846eec877a2415e4
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerSinc.cpp
ervices/audioflinger/AudioResamplerSinc.h
|
| 12bff5dd87e6b863482e6bfd9f4561078ebcf3f0 |
24-Sep-2012 |
SathishKumar Mani <smani@codeaurora.org> |
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
Change-Id: I34f5d36ae60010ec64222d6660d10a84da3bf566
Bug: 7024293
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/audioflinger/audio-resampler/Android.mk
ervices/audioflinger/audio-resampler/AudioResamplerCoefficients.cpp
ervices/audioflinger/audio-resampler/dnsampler_filter_coefficients_x128_10112011.h
ervices/audioflinger/audio-resampler/resampler_filter_coefficients_10042011.h
|
| ee93c8c0f65cc1965ca09c9e33ae672f8bc9b88c |
27-Sep-2012 |
Dave Burke <daveburke@google.com> |
Tune iframe interval to 1sec.
Bug: 7241844
Change-Id: Iae0d73ecc680f6fa69d82ee2e8fac18ebece7782
edia/libstagefright/wifi-display/source/Converter.cpp
|
| 72ff5903df5f409ea83f74c363a52f0745ced8b8 |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
720p24 i-frames every 2 secs.
related-to-bug: 7239971
Change-Id: I4cbf7e9b878b180b0683656e9e8c0a6bb18e06dc
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 5895c5db5caa6b1e3e415716269947755506859e |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Make sure we only release the HDCP module once shutdown has completed." into jb-mr1-dev
|
| eb11600a248cfe5b95ddd3e5aaae02bd2ab65276 |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Make sure we only release the HDCP module once shutdown has completed.
Change-Id: I4b614afe2b55ac53b4aa63311e5bea8fd6c4462e
related-to-bug: 7223555
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| eb8a42b934f20a15f40d656e2bc90f384f1ccb10 |
25-Sep-2012 |
Alex Ray <aray@google.com> |
Camera2: Fix JPEG Transport Header offset
Use offset into start of buffer after transport header
Bug: 7108816
Change-Id: I6f9778db313856eaeee31f6999e4e55678b09b26
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
|
| 44b175c31a96804d8f981c43145967473491540f |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." into jb-mr1-dev
|
| 6283af5f0a99bc7cba43bb9d09bd920b438f47c8 |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Logic to include HDCP specific PES extra header data was backwards." into jb-mr1-dev
|
| 019aabab44e396d9a68c8126c9e0745162a4603a |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Logic to include HDCP specific PES extra header data was backwards.
Change-Id: I85ab02f0c3ab945093b27210da1e36a31c022da5
related-to-bug: 7237850
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| df4ddebe61ac84c7773da1f774d13e4d4bbe9f72 |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Fix shutdown and eliminate those annoying "failed to post..." logs.
Change-Id: I963e0712f59070f83a26946c494fdeb3558aa0e3
related-to-bug: 7230886
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 842c5d9553f3f8e97d04ed1bd0d37e4851240654 |
26-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Revert "Don't wait for presentation complete if terminated"
This reverts commit 44cda3a4e7ca3de0db9cb49145def3803b03ebb4
Change-Id: I7fd29b77690dab057ac966a42fb198b2772f092c
ervices/audioflinger/AudioFlinger.cpp
|
| 49aa4936290e8fc01625be046d9b99cdd53cd0fc |
26-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| cc0f1cfb69ce8b8985fc2c0984847a06a13ad22d |
24-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Implement android.media.AudioManager.getProperty()
Bug: 6635041
Change-Id: I3386a4a6c226bc4eceaf65556119e4fb15f73224
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| d9aa7b4db46bea5966401f9fcfbecb3269ec55c7 |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Better transport stream timestamp handling." into jb-mr1-dev
|
| c910b7accbed385ce5905e800c16d92290ccd997 |
26-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-dev
|
| 28e17ed7e2fbb254fb99481b74db85e427c905ee |
25-Sep-2012 |
Andreas Huber <andih@google.com> |
Better transport stream timestamp handling.
Properly emit PCR and PMT/PAT updates every 0.1 secs.
Don't stream RTCP unless requested by the dongle.
related-to-bug: 7232540
Change-Id: Ie9a6949a074d86ab022adfab5d2811294ba746aa
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/TSPacketizer.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| c7d9afdc7d2181aef7688638fff52859bcdabd65 |
24-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Make sure to clean out reprocess streams on shutdown as well.
Otherwise, streams may persist past expected lifetime.
Bug: 6243944
Change-Id: I901971b78baf9d577ea3812588dec3885232e7ef
ervices/camera/libcameraservice/Camera2Device.cpp
|
| 0659dba50fdeb8f1537e8ecb375e8c210c75467d |
25-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 4bb8118816874c696d9f1adab48490df1da365f7 |
24-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Debug and logging fixes.
- Fix LOG_TAGs to work with standard logcat filtering.
- Add ATRACE to Camera2Device
- Shorten thread names to fit in 16 characters
- Remove some ATRACEs to avoid flooding trace unnecessarily
Bug: 7220520
Change-Id: Ief8d677b5c8bb35d94e0f21b11b86505e83169ea
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/camera2/BurstCapture.cpp
ervices/camera/libcameraservice/camera2/CallbackProcessor.cpp
ervices/camera/libcameraservice/camera2/CameraMetadata.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/FrameProcessor.cpp
ervices/camera/libcameraservice/camera2/JpegCompressor.cpp
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| b6ba2fd0d61a4844c153e17843fbe2c841c4bf57 |
25-Sep-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: improve record start and thread exit
Use broadcast() instead of signal() on the
thread wake up condition when starting record or requesting thread
exit to make sure that if another thread is waiting for the same
condition (e.g binder thread calling setParameters()) the mixer
thread will be woken up.
Bug 7184317.
Change-Id: I3154a4509ca7af6ffae5236e522b0fab8e75ed06
ervices/audioflinger/AudioFlinger.cpp
|
| 92f655fe351a5f2eb7d36123d2b687d6e7e3e913 |
24-Sep-2012 |
Andreas Huber <andih@google.com> |
Add some more logging, reduce startup delay to 1 sec.
Change-Id: Ic24a3d9e3e645288411efb46f7004d89e7a0a4b7
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| 4968246a1fb70fcea422331effa4f446378dbdb8 |
25-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2a865ad8d45940bc824c02a8a8558cbcb97acc88 |
25-Sep-2012 |
Dave Burke <daveburke@google.com> |
Tune video bitrate to 5 mbps.
Change-Id: Ieb7ab1675db6fb21087a1258465f866ecdc5475b
edia/libstagefright/wifi-display/source/Converter.cpp
|
| 9a2e4fa60c843df54f35923898975fdbd04bed56 |
25-Sep-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Emit ShutterCallback/RawCallback events after takePicture" into jb-mr1-dev
|
| aae1de9eaba5aa3e2bce68b59aa78f918020f5a8 |
25-Sep-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Fix cropRegion sometimes exceeding the sensor array size" into jb-mr1-dev
|
| 8d452f1c61aa70c4a86c4114532f2c0983120ef8 |
24-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Check clock_gettime(CLOCK_MONOTONIC) for failure" into jb-mr1-dev
|
| 1b65ae9b7bcb4302f80ddc1464f1aa2c7483efb8 |
21-Sep-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Emit ShutterCallback/RawCallback events after takePicture
Bug: 7176692
Change-Id: I50e8f9511f1770d97a42d1fa208c04b1bbcfba6b
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
|
| 018d228ac43a8da7d5f36e45fd105c9baf2490a0 |
19-Sep-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Fix cropRegion sometimes exceeding the sensor array size
Bug: 7155264
Bug: 7120431
Change-Id: I92a9c695b97ec40acf26dbdaa877964e41a9fd4c
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| 80b3273cea8660fe8a5868d024d2788a1e083ffc |
24-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Check clock_gettime(CLOCK_MONOTONIC) for failure
Bug: 7100774
Change-Id: I15a84a19bb6d6ef1d9dac4beaa03587638196404
edia/libnbaio/MonoPipe.cpp
ervices/audioflinger/FastMixer.cpp
|
| c0c3b298cbcf47feeeaa597a7621a0dd45f5a99e |
24-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "fix end of track presentation on suspended output" into jb-mr1-dev
|
| 53787020d2706a1ab04972213b586acaf757bd57 |
24-Sep-2012 |
Alex Ray <aray@google.com> |
Merge "Camera2: Truncate JPEG images" into jb-mr1-dev
|
| ea4bbfdcad9478ea19257fb19a32de68a2dfd958 |
22-Sep-2012 |
Andreas Huber <andih@google.com> |
Attempt an orderly shutdown of the wifi display connection if possible.
Shutdown the session if the encoder signals an error.
related-to-bug:7207481
Change-Id: Id78000a336f8bb8904e7d2102f8f81a4139cdd61
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| a6b4c40e70eafc5aba16163999de6d3e26667b89 |
21-Sep-2012 |
Alex Ray <aray@google.com> |
Camera2: Truncate JPEG images
Check for JPEG size hint from HAL, use if applicable. Otherwise
read until end of JPEG image to find appropriate file size.
Bug: 7108816
Change-Id: Idfd194133eb6c293ab08c9466f59606e62ba56b6
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
ervices/camera/libcameraservice/camera2/JpegProcessor.h
|
| 46323541d634c881826040dece9e4891fdf0ae52 |
24-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 1afc26db11b71c43f63a0f72a45a803f1a7910dd |
24-Sep-2012 |
Eric Laurent <elaurent@google.com> |
fix end of track presentation on suspended output
The code detecting the end of an audio track presentation before
removing it from the active track list is based on the
count of audio frames sent to audio HAL. When an output stream
is suspended (e.g. A2DP when SCO is active), this count does not
change and a track in stopped state will never be removed from
active track list causing the mixer thread to never release
the wake lock.
The fix consists in incrementing the audio HAL frame count even
if the output is suspended.
Also fix a problem in getRenderPosition() when the output is suspended.
Bug 7167534.
Change-Id: I3be836cbbea29b65dc087199cac6a1cd84c0a41d
ervices/audioflinger/AudioFlinger.cpp
|
| 94a68ecf2b56bd56994d0352cbaad56e58dcf0dc |
23-Sep-2012 |
James Dong <jdong@google.com> |
Merge "Bug fix: MediaPlayer's deselectTrack() for subtitle." into jb-mr1-dev
|
| a2161f8bb01815c30c57bdd604a5389c33269e2a |
22-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| df2bc29664d3bf80bed0012970608e5605acf7af |
22-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-dev
|
| 6b367f2a2bddfed60d63fa4da5e19ca13352a454 |
22-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Don't use ZSL when flash is on force fire mode.
Bug: 7213907
Change-Id: I120b187c1886d85f4b2b5d3a6f28a28936424e8e
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
|
| 75dce94aca6203ada887b6c2d6a8a8130cdbfaca |
22-Sep-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Emit FaceDetection events for all except repeating 0-face frames" into jb-mr1-dev
|
| e7f256a4b1d2037a67ab139fc8131a6ca97bd405 |
21-Sep-2012 |
Igor Murashkin <iam@google.com> |
Camera2: Emit FaceDetection events for all except repeating 0-face frames
Bug: 7205311
Change-Id: I570209445acf3a26f2246c3fe886d56bb63bd2f8
ervices/camera/libcameraservice/camera2/FrameProcessor.cpp
ervices/camera/libcameraservice/camera2/FrameProcessor.h
|
| 207e18540fefbaf530a4fdf506d266f34ddec84f |
21-Sep-2012 |
Andreas Huber <andih@google.com> |
Remove legacy code and APIs in wifi display related code.
Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
nclude/media/IMediaPlayerService.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/wifi-display/Android.mk
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/Serializer.cpp
edia/libstagefright/wifi-display/source/Serializer.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/wfd.cpp
|
| 9565d8642490b8f222dcf56e80377602e105cd82 |
21-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 086f958a7e539acffb637b42f5a6998184544179 |
21-Sep-2012 |
Dave Burke <daveburke@google.com> |
Tune video bitrate to 2.5 MBPS.
Temporary workaround for buggy firmware (desired is 5 MBPS).
Change-Id: I9fb0af31ca07c9bfdc6f790b7c98ca546eaf2985
edia/libstagefright/wifi-display/source/Converter.cpp
|
| 6cdbe6639b21d5e7bbcba295d167c33a6c376c9e |
20-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Clean up startup/shutdown sequences.
- Close camera device on startup errors
- Make sure all threads are shut down and the device is closed before
returning from ICamera::disconnect.
Bug: 7172680
Change-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| 437aa4c55fc010d738e7c3572778a2073590f30d |
21-Sep-2012 |
Jeff Tinker <jtinker@google.com> |
Merge "Allow DRM client to pass the FD of an open file to the DRM server." into jb-mr1-dev
|
| 8a6f0b1f6d91bbe9d2b2f732d731e5ccc741041e |
21-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Code to support RTP retransmission according to rfc4585, rfc4588" into jb-mr1-dev
|
| 75041228626439668b64c93eb7bb866b3f63c3fd |
21-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Clean up startup/shutdown sequences." into jb-mr1-dev
|
| 4386b7c4b0f24aa634c0e33f69565bbaa1b2e072 |
21-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Erase ZSL queue after each use." into jb-mr1-dev
|
| 98bb82d1bf7c94240956426812de6593801faad4 |
20-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Clean up startup/shutdown sequences.
- Close camera device on startup errors
- Make sure all threads are shut down and the device is closed before
returning from ICamera::disconnect.
Bug: 7172680
Change-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| efd9c63dc846dd3dea2c979fe2a9d6770e73f9ac |
20-Sep-2012 |
Andreas Huber <andih@google.com> |
Code to support RTP retransmission according to rfc4585, rfc4588
Change-Id: Idfb3c0935f28e4cbc2141f0903f0d3c4e95818a6
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 0abeaca9d1b53ee40ce9c9d2ef543dd83b5a4cc2 |
14-Sep-2012 |
Gene Morgan <gmorgan@google.com> |
Allow DRM client to pass the FD of an open file to the DRM server.
Part of CL https://googleplex-android-review.googlesource.com/#/c/222797/
This modifies the marshall/unmarshall of IDrmManagerService::
acquireDrmInfo() to watch for DrmInfoRequest tag "FileDescriptorKey".
If tag is present convert string to binary FD, then back to string
after passage through the interface's Binder.
Relevant bug reports:
bug: 6426185
Change-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2
rm/common/IDrmManagerService.cpp
|
| aa05a277e317ff224229c741bb97a6351d3c17db |
20-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: State must be STOPPED before JPEG callback is fired." into jb-mr1-dev
|
| 768cf093dade9085e0ad6305d9f7c16ae9ad9e26 |
20-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Erase ZSL queue after each use.
Since preview stops after a capture is submitted, need to clear out
the ZSL queue to avoid using stale buffers when the preview starts up
again.
Bug: 7189765
Change-Id: I9ae2382d0af132208aca5ccba49b5464d18a263e
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.h
|
| 2761d21cf6ce4c0de63f5d9cbd920c57c7b2b213 |
20-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Instantiate HDCP module, add PES_private_data for encrypted streams." into jb-mr1-dev
|
| b88516c4c0695c4b9ea2feccd3aafef654da62bd |
20-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "HDCP module binderized" into jb-mr1-dev
|
| fe580e57081885dd6059e0d407a6cd96a1be7e51 |
20-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: State must be STOPPED before JPEG callback is fired.
Move handling of JPEG callback to CaptureSequencer instead of
JpegProcessor, so that we can be sure the camera state is updated to
STOPPED before the JPEG callback is sent to the application layer.
Bug: 7172743
Change-Id: Ie8752d946d3eb8254230c77f10e5c38a83dc5371
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
|
| 23580bb8d6cafbc2b65dd0a4ce1acb52562d1b05 |
20-Sep-2012 |
Insun Kang <insun@google.com> |
Bug fix: MediaPlayer's deselectTrack() for subtitle.
o Previously, deselectTrack() actually doesn't work properly in
TimedTextDriver / TimedTextPlayer.
o Ignores select track operation when the same track is selected in a
row.
Bug: 7200096
TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest
Change-Id: If7feac294cf9b358f616be45574bc2e26001c887
edia/libstagefright/timedtext/TimedTextDriver.cpp
edia/libstagefright/timedtext/TimedTextPlayer.cpp
|
| da1c5c15c2483cd41035e1a492c5963ac86bbcf5 |
20-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: ZSL captures should also make some noise.
Change-Id: If7aff7223db41b4b7edeeb4c32e40ef3197b180b
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
|
| c55311869f1853c6814c9bcda8a4b60e43091c1a |
20-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Increase max timeout for the precapture sequence.
Increase maximum duration of the precapture sequence (final metering +
preflash + redeye reduction) to 2 seconds before timing out.
Change-Id: Ie1de4e96d46599eb53e1def9052b211e684f1fbc
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
|
| b8c7bd418f0ee5b88923b0e0817e3a4acc53cf8d |
18-Sep-2012 |
Andreas Huber <andih@google.com> |
Instantiate HDCP module, add PES_private_data for encrypted streams.
Change-Id: I970f561a56a1d489a392c3480dec13f4ed7b43bd
edia/libstagefright/wifi-display/Android.mk
edia/libstagefright/wifi-display/Parameters.cpp
edia/libstagefright/wifi-display/Parameters.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/TSPacketizer.cpp
edia/libstagefright/wifi-display/source/TSPacketizer.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| efbb781c15abf8e085f5ab8d39710bd58ea0b6e4 |
18-Sep-2012 |
Andreas Huber <andih@google.com> |
HDCP module binderized
Change-Id: I866768b1e3f3b232f1934a35b65f66befc12f3f6
nclude/media/IMediaPlayerService.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/HDCP.cpp
edia/libmediaplayerservice/HDCP.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 6e81efd20830cab31c64a9679d380254d9ad65f1 |
19-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 74e58c55bc5259b957a51f1bb44a5911ad1f8400 |
19-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Increase capture timeout." into jb-mr1-dev
|
| 1f266efe8ce2976b6531fab8698716354b2247f8 |
19-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Increase capture timeout.
Low-light modes may take longer to capture a picture, so increase the
timeouts.
Change-Id: Id50b1e4fd3186da4e75b2cc1c226ced2f8d394ac
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
|
| 2f93127de30bbe17707ca8923c486d4494ffda37 |
18-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Enable ZSL by default.
Bug: 6910087
Change-Id: Ie774f28fbb943b2ac2c856872fd4cae68b40430c
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| 9c6ec8213d8da486a61659b9c37b7a57a2c4bb1a |
18-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: ZSL: Do regular capture if AE is not satisfied." into jb-mr1-dev
|
| fe5054c9cba7471c8580fe485ec5aaf12df459e8 |
18-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Fix THD with max user EQ preset volume again" into jb-mr1-dev
|
| 97b38a81ac989ccba02d726011a82541f14166df |
18-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: ZSL: Do regular capture if AE is not satisfied.
- Check the AE state of the selected ZSL buffer; if it's not reporting
as CONVERGED or LOCKED, fall back to normal capture sequence
- Add more debugging for the ZSL queue.
Bug: 6910087
Change-Id: I77a4287580aa9ddbd58438477c40ce829555d0ca
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.h
|
| 0d61a78845d716411e7b94914ae29639a5710fd2 |
18-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-dev
* changes:
Camera2: Don't be bothered by lack of faces.
Camera2: Filter out faces with 0 confidence.
Camera2: Change face detect/scene mode priority.
|
| 1c2b8d98a98ac02296fbd34ae7015f8ba9baf3f2 |
18-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| c5cd686a83c6ea65a68d98023d5527fe4373d4e4 |
17-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Fix THD with max user EQ preset volume again
There was a problem with previous fix in 1b6c677c where
the THD was good for max volume but bad for intermediate
high volume values.
This fix does not limit the band gains but apply a correction
to the effect bundle volume to take into account not only the
maximum band gain but also the average band gains weighted
by the proximity of each band to the max gain band.
Change-Id: Ibedd8da7fce1e163117f29b3da332da0e4fe8889
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
|
| 663c2cd909cb9c0699b4d58c1db7c6252afd77ea |
18-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Don't be bothered by lack of faces.
Sometimes, people might want to photograph scenes with no faces. And
not have their log fill with errors when they do.
Bug: 7078231
Change-Id: Ibe5c08d51b49a3ea14203416fe7803a58de08dda
ervices/camera/libcameraservice/camera2/FrameProcessor.cpp
|
| a9f8d040146533a9c214473fd79cbd9dff44428d |
18-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Filter out faces with 0 confidence.
Bug: 7078231
Change-Id: I559f1281359835e0489456091a5409ebc8f73479
ervices/camera/libcameraservice/camera2/FrameProcessor.cpp
|
| d14de47262340d70fc11fe56159462b9b981067f |
18-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Change face detect/scene mode priority.
Explicit scene modes should override the implicit face priority scene
mode from enabling face detection, to match application/API
expectations.
Change-Id: I6f0f44fadeacfdc0594dd2fdc280e294d2d87df6
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| c92bed3a73c06e90217f8f199ca0b517aa7595d2 |
18-Sep-2012 |
Andreas Huber <andih@google.com> |
Now we only support a single client connection
and it cannot be initiated from the local interface address for security
reasons.
Also, there's at most one playback session active at any time, and when
it dies we shutdown the client connection altogether and signal an error
to the listener.
related-to-bug: 7139784
Change-Id: Ia8d02bc994ce9986936947ddda1f2a3dddbf5714
nclude/media/IRemoteDisplayClient.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| bd08e2f93bafd02abf2c25d740e9fb8bce455a99 |
13-Sep-2012 |
Andreas Huber <andih@google.com> |
Support for RTP/RTCP traffic over TCP sockets in wifi display code.
This is opt-in through
adb shell setprop media.wfd.enable-tcp true
Change-Id: I49ab22a8c8d62690065631e781a7f0057e5ce557
edia/libstagefright/wifi-display/ANetworkSession.cpp
edia/libstagefright/wifi-display/ANetworkSession.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/Serializer.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| 874a4618b645ab5c1faaa738a871f52492f28de3 |
17-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Don't play shutter sound when doing a video snapshot" into jb-mr1-dev
|
| 0856beda56855af2472f4eeddbb386ea3707007d |
17-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| efb039e07c688c21122c938b008457bd4f555898 |
15-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Don't play shutter sound when doing a video snapshot
Bug: 7171820
Change-Id: I11ec0900aff3cdf4b57ae1bfc75f7acfecf95098
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
|
| 376074ed1c3c368aeb336954a07632cd806288e2 |
15-Sep-2012 |
James Dong <jdong@google.com> |
Fixed a native crash due to deref of a NULL pointer
We only checked the mNativeWindow against NULL, but did not check the native window object itself against NULL.
o related-to-bug: 7153683
Change-Id: I430d344dc09a2fc337bf51001551627056713773
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
|
| aaf9de4181e1ada862deac1d82c68cbfd984ff76 |
14-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| b845c6b0c3066d6791973be830f0953477461a65 |
14-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""" into jb-mr1-dev
|
| beb1416afd1d331b8e7e93d626f39267acce289a |
14-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""
The changes this commit depends on are now submitted.
This reverts commit f54b1459cda7f585b4896671643b33bab8290964
Change-Id: If7f146ab7968d50fffd2174c2c5792bdc9d7724c
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| e44e90c82d75b806e89f751a61dc7e54d0144338 |
14-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."" into jb-mr1-dev
|
| f54b1459cda7f585b4896671643b33bab8290964 |
14-Sep-2012 |
Igor Murashkin <iam@google.com> |
Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."
This reverts commit 8a3016613dc684a6be11fdf643f9cc5cad817e8f
Change-Id: I3f1d4e9c13df838b8b6aa5696a6494140eac3e04
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| dcd76da55f1f8a77dec07bb7e080ed3488f2ae83 |
14-Sep-2012 |
James Dong <jdong@google.com> |
Merge "Make a small correction in terms of GOP structure in the recorded video" into jb-mr1-dev
|
| cb66d22f2e3727ca858bb578c1d18956da1a9c2b |
14-Sep-2012 |
Igor Murashkin <iam@google.com> |
Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme." into jb-mr1-dev
|
| 08654f9d7157f6d6ca0928cb438bbbed53fb0fd1 |
14-Sep-2012 |
James Dong <jdong@google.com> |
Make a small correction in terms of GOP structure in the recorded video
When we have a 30 fps frame rate, and one second key-frame or I-frame interval,
we really would like to have for each second, 29 P-frames + 1 I-frame. Thus,
we should calculate the number of P frames so that it is equal to
frame_rate * I_frame_interval - 1
Change-Id: I5b9be6e4c101e7a6b718015aa4041496961c0f19
edia/libstagefright/OMXCodec.cpp
|
| 2637cb172105939052d8a02f4eea693a90549518 |
14-Sep-2012 |
James Dong <jdong@google.com> |
Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
|
| 830ed8ba5f978b067a271407e2995110c9f728aa |
14-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| d8421c54dc00d637e41689004edcb06caaa40b62 |
14-Sep-2012 |
Dave Burke <daveburke@google.com> |
Merge "Support IDR requests in wifi display, MediaCodec and ACodec." into jb-mr1-dev
|
| 896adcd3ae6a1c7010e526327eff54e16179987b |
13-Sep-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: send priority request from a thread
When creating a fast AudioTrack, a request is sent to SchedulingPolicyService
to elevate the requesting thread priority. This generates a binder
call into system_server process and to a JAVA service via JNI.
If the thread from which the track was created is in the system_server
process and does not have the "can call java" attribute, a crash occurs because
the binder optimization reuses the same thread to process the returning binder
call and no JNI env is present.
The fix consists in sending the priority change request from the AudioFlinger
mixer thread, not from the binder thread.
This also reverts the workaround in commit 73431968
Bug 7126707.
Change-Id: I3347adf71ffbb56ed8436506d4357eab693078a3
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 496238cc7551d414067dcbbb4fe3bd801f205f95 |
14-Sep-2012 |
Andreas Huber <andih@google.com> |
Support IDR requests in wifi display, MediaCodec and ACodec.
Change-Id: I596cf8dd61b63465437f78413186fad2be287244
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 8a3016613dc684a6be11fdf643f9cc5cad817e8f |
14-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.
Until all HAL implementations move to the new format negotiation
scheme, use CAMERA2_HAL_PIXEL_FORMAT_ZSL to indicate ZSL mode.
Bug: 6243944
Change-Id: Idf5d9f42e203903ba906d5df156100646b27404c
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| ae254b02c5c325f7a9a8d0310c6949b0bc594588 |
13-Sep-2012 |
Andreas Huber <andih@google.com> |
Better video bandwidth utilization by not lying about the frame rate.
log network bandwidth used (for data traffic).
Change-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
|
| 999e8efefd954697202ab5ffaa4fa39bc251890f |
13-Sep-2012 |
Andreas Huber <andih@google.com> |
Various improvements to cleanly shutdown a wfd session.
Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/MediaPuller.cpp
edia/libstagefright/wifi-display/source/MediaPuller.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 4d41238ec1ad73ae4c8cb6d9dc87672639fc3854 |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Audio and video bitrate are now configurable through system properties
adb shell setprop media.wfd.audio-bitrate 64000
adb shell setprop media.wfd.video-bitrate 10000000
are the defaults.
Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
edia/libstagefright/wifi-display/source/Converter.cpp
|
| 5960ae0bc5269d6102e29f981ff3b3f598385083 |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Use proper number of video buffers to be acquired simultaneously from
SurfaceMediaSource, this should match the number of encoder input buffers.
Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| be29bbb22a9046be6838709ea12966fe4b6dfaeb |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Throttle SurfaceMediaSource.
Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 4362f5300162ed55f56cf167eccf7f2e5b89d435 |
13-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Handle audio HAL returning 0 bytes in record thread
Enter standby when HAL returns an error, but also consider 0 bytes
returned as NOT_ENOUGH_DATA.
Change-Id: Ica83142310e9c176f936e0440571a6034cbc575f
ervices/audioflinger/AudioFlinger.cpp
|
| 66466087f464b641c8c09b195891a9713a554900 |
13-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Workaround for track recreation bug" into jb-mr1-dev
|
| f4bca03d996b584030a80268f58cdb29dc7b7cde |
13-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Don't deadlock on AudioRecord start when reads return 0" into jb-mr1-dev
|
| dca352880e210e0ca0ff39de074540d3640ecfab |
13-Sep-2012 |
Andreas Huber <andih@google.com> |
Better video bandwidth utilization by not lying about the frame rate.
log network bandwidth used (for data traffic).
Change-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
|
| a438123bd96c7faf145683876702387efe5628d9 |
13-Sep-2012 |
Andreas Huber <andih@google.com> |
Various improvements to cleanly shutdown a wfd session.
Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/MediaPuller.cpp
edia/libstagefright/wifi-display/source/MediaPuller.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| 6701a4492350169aa41f66c9c79ece0ba0b280b7 |
13-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Audio and video bitrate are now configurable through system properties" into jb-mr1-dev
|
| d168b19bc716bf04a35c380af250e1974d0aecd2 |
13-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Use proper number of video buffers to be acquired simultaneously from" into jb-mr1-dev
|
| 44b59fd9326026d3f82dec25cde48c589b0438e7 |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Audio and video bitrate are now configurable through system properties
adb shell setprop media.wfd.audio-bitrate 64000
adb shell setprop media.wfd.video-bitrate 10000000
are the defaults.
Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
edia/libstagefright/wifi-display/source/Converter.cpp
|
| 5a832f87b680ead3606c4448a0a82c0e556d1b93 |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Use proper number of video buffers to be acquired simultaneously from
SurfaceMediaSource, this should match the number of encoder input buffers.
Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| 00f41327264fa2e59cc05abaa5c554b2a32938e1 |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Throttle SurfaceMediaSource.
Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 7f8e0e0ae82316c12d2a054217fd3c9de3a2eae1 |
13-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 73431968e3c5cf420b5d63c54cf72d10ff7ee7bc |
13-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Workaround for track recreation bug
Ignore thread can call Java parameter to work around bug where
AudioTrack instance gets recreated when key clicks are enabled
and WFD gets turned on, with the wrong parameters.
Change-Id: Ia42c8704b46fe3ffea560b05b60939fa2e4b29e1
edia/libmedia/AudioTrack.cpp
|
| 52762410dbc9189cd92a4094a1dbd4cfe8e71cb6 |
13-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Don't deadlock on AudioRecord start when reads return 0
When calling start() on an AudioRecord with a HAL that
returns 0 on a read() operation, the start blocking
condition was never unblocked.
Add a boolean to track the first read operation so the returned
number of bytes (mBytesRead) is only evaluated after that
first read.
Change-Id: I8c735a00d48cd6a0da467ccdf75d3616b38f6afa
ervices/audioflinger/AudioFlinger.cpp
|
| bdde5f884eaf270ab4b806849f3122a46cd872ce |
12-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix ZSL bugs.
The ZSL processor was discarding buffers too often, and waiting for
new buffers with mutexes held.
Also adds basic fallback to regular capture in case the ZSL queue
doesn't contain a suitable buffer.
Bug: 7147043
Change-Id: I5721267ef08dbc87ef9d8ec47f333db5f67e41c1
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.h
|
| 359cf1cac2a7851a59dfe4960a1a5992ac6fdb84 |
13-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
|
| a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d |
13-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit '1b0ae9e47273357e19a9beb22466319753e8242d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
|
| 1b0ae9e47273357e19a9beb22466319753e8242d |
12-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
|
| e891a7888141fcd3e7956bf80425c885992fa2bf |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Various improvements to the wifi display implementation." into jb-mr1-dev
|
| e1957358f11031a554c57d4fb46988dd6044acc1 |
12-Sep-2012 |
Andreas Huber <andih@google.com> |
Various improvements to the wifi display implementation.
Using a MediaPuller now, audio and video on their separate threads.
No more flushing the RTP stream on audio tracks, since it wastes too much
of a full size UDP packet.
Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
edia/libmediaplayerservice/RemoteDisplay.cpp
edia/libstagefright/wifi-display/Android.mk
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/MediaPuller.cpp
edia/libstagefright/wifi-display/source/MediaPuller.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/RepeaterSource.cpp
edia/libstagefright/wifi-display/source/Serializer.cpp
|
| 02f7a7847bbad970885ec52d9629fe21689e1a46 |
12-Sep-2012 |
Elliott Hughes <enh@google.com> |
am fd07d616: am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
* commit 'fd07d61614e4b358349d1d46a32f9477784404c4':
Don't include <linux/socket.h> directly.
|
| fd07d61614e4b358349d1d46a32f9477784404c4 |
12-Sep-2012 |
Elliott Hughes <enh@google.com> |
am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
* commit 'fbe1cc92d9e8930700c15f68717dd66fc1523177':
Don't include <linux/socket.h> directly.
|
| fbe1cc92d9e8930700c15f68717dd66fc1523177 |
12-Sep-2012 |
Elliott Hughes <enh@google.com> |
Merge "Don't include <linux/socket.h> directly."
|
| 7bb813e69c9b6f2cf788d89ad616690de3665f09 |
12-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| e5167f88f3734a048dc44199f3fff0432589db43 |
12-Sep-2012 |
Elliott Hughes <enh@google.com> |
Don't include <linux/socket.h> directly.
In newer versions of Linux, stuff you need isn't in that file any more.
Change-Id: I62923ed2d92a75ff3182ba2ae27578ce7bde8356
edia/common_time/ICommonClock.cpp
edia/common_time/ICommonTimeConfig.cpp
|
| d067489a23640a107e0a86f6de9b467d509deb36 |
12-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-dev
|
| 2552036ac67472411082d894eb6e11623799d277 |
12-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Configure ZSL at the right time." into jb-mr1-dev
|
| 64d6c687e75b93c0c8372ed3807e1bb68c1f09ed |
12-Sep-2012 |
Edwin Wong <edwinwong@google.com> |
Merge "Add getError and setError to propagate error code from WVMMediaExtractor up to player." into jb-mr1-dev
|
| 6e4db898bac9499a8abe7e6b6fbf729b78f6bd68 |
12-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use full pixel array for ZSL stream
For efficiency, use full pixel array size for the ZSL output/input
streams, instead of the final picture size.
Bug: 7139362
Change-Id: I98ad4f5a1ca283efe87ae60bf0cf39573e22d2f3
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| b075252349a4b40ddda791f2e1221ae0ce7e4cd1 |
12-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Configure ZSL at the right time.
ZSL enable was too early in the camera startup sequence, resulting it
being turned off most of the time.
Bug: 7148012
Change-Id: Ie144dd960d018a34b0bc77c88208ca22b7112772
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| b063cb62ab371cced17a6288ebf54e7e6ca58982 |
11-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera1: Fix enable shutter sound command error handling." into jb-mr1-dev
|
| c5268e825d4a513ad857b7944a9f85dc478c1dc6 |
11-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera1: Fix enable shutter sound command error handling.
Return the error codes from calls to enableShutterSound to the caller,
and don't call the HAL with the enable shutter sound command.
Change-Id: Ibe4943bd1cd0fcd1832fd904f12dd2f78fec06a5
ervices/camera/libcameraservice/CameraClient.cpp
|
| 831c7139c9c697fa9d537979f35dad6bf414202c |
11-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev
|
| 8a74c9b8e2627560ae5a92d4261f0de4464490ad |
06-Sep-2012 |
Edwin Wong <edwinwong@google.com> |
Add getError and setError to propagate error code from WVMMediaExtractor up to player.
The two virtual functions provides a path for the player(AwesomePlayer) to retrieve
the last error from WVMMediaExtractor container.
Change-Id: Iee8d4a3eccf82af95eb3d4d465f069daced4aa1a
related-to-bug: 7073630
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 498a274c188f18049053ef5424b52cc4d9314c80 |
11-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Communicate audio session ID to downmixer" into jb-mr1-dev
|
| 37171b9d1532a7ce26ac02b707bee2fb6f25d0f3 |
11-Sep-2012 |
Elliott Hughes <enh@google.com> |
am ed757e97: am 290ac693: Merge "Stop building the unused host libmtp static library."
* commit 'ed757e9729b325f00e70f506ad6e217910563d0a':
Stop building the unused host libmtp static library.
|
| ed757e9729b325f00e70f506ad6e217910563d0a |
11-Sep-2012 |
Elliott Hughes <enh@google.com> |
am 290ac693: Merge "Stop building the unused host libmtp static library."
* commit '290ac69379e649a2fed1d9441a17e39c6a912d8c':
Stop building the unused host libmtp static library.
|
| 290ac69379e649a2fed1d9441a17e39c6a912d8c |
11-Sep-2012 |
Elliott Hughes <enh@google.com> |
Merge "Stop building the unused host libmtp static library."
|
| e0e2e98674caa7f6285eda122ebabee40528374b |
11-Sep-2012 |
Elliott Hughes <enh@google.com> |
Stop building the unused host libmtp static library.
This removes the need to support the bionic mktime_tz and localtime_tz
extensions on glibc, which makes my life easier.
Bug: 7012465
Change-Id: Ibfa187f2857dda7bd1536348e314a80abacb9d1e
edia/mtp/Android.mk
|
| 8a9e791c0642084c1c6e758b7887b274392f5bb0 |
11-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Limit maximum equalizer gain." into jb-mr1-dev
|
| c690f5c6d76926e01522d990cfc4c51525f6c4e6 |
11-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| fe3156ec6fd9fa57dde913fd8567530d095a6550 |
11-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Communicate audio session ID to downmixer
The audio downmixer effect might need the audio session Id, pass it
from the track creation in AudioFlinger to the downmix effect
creation in AudioMixer.
Change-Id: I5e29540542ae89cf4a0cdb537b3e67f04442a20a
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/FastMixer.cpp
|
| ac19caca75e7268c0a87bfcb2db73df1dd964616 |
11-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Temporarily stop pre-allocation of recording stream." into jb-mr1-dev
|
| ba5e65057f061f27a58fbb7c5249200910a88033 |
11-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Clean up the right streams." into jb-mr1-dev
|
| 1b6c677c4bad5c1aea4f01277cf5aa234ad4cab4 |
11-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Limit maximum equalizer gain.
Limit maximum gain in all EQ bands according to current volume so that
total gain (current volume + band gain) does not exceed a certain limit.
The gain difference between bands is preserved.
Change-Id: Ice5a9705a0b3353e8778b4c539a29ca9cdf60390
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
|
| 17471306f758496166cdc1b8197b4fc7f225816b |
11-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audio effects: no audio preprocessing by default" into jb-mr1-dev
|
| 199862ef95e4d768fbf2cc5518fe43e9ed5aa5a2 |
08-Sep-2012 |
Eric Laurent <elaurent@google.com> |
audio effects: no audio preprocessing by default
The audio preprocessings are not included in the default
audio_effect.conf file anymore as the audio HAL has to provide
support for them.
Each product implementing one or more audio pre processing must
provide a specific audio_effects.conf file.
Change-Id: I3b2f636f7a8748829798d4b9057d269db9424d62
edia/libeffects/data/audio_effects.conf
|
| 8fa80e3be63ffde5ef029afa713877440856b663 |
08-Sep-2012 |
James Dong <jdong@google.com> |
Allow OMXCodec to specify an output color format for OMX decoder component
The output color format is specified via the meta argument in OMXCodec::Create()
o related-to-bug: 7122195
Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 14fe42d8d8d622f6fcdbd83df5f3932e24cd896e |
11-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Temporarily stop pre-allocation of recording stream.
When recordingHint is set, don't pre-allocate recording stream on
preview start.
Bug: 7137947
Change-Id: I06b5f6d7dbb21d4d0747974ba001b0c8929a0b02
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 130c2556038d774f4728dd54f583df55c628fe85 |
10-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Sanity check inputs better.
Bug: 7132141
Change-Id: I866a65dfe47464070a6ef4ac60be4801cb68327b
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| 47512a7da600ababdfd052b574488b9e499c22f6 |
10-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Clean up the right streams.
Change-Id: I780c3e8e255f6a185e0edf1d76f35afdc74dff48
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| c61b2aaab1846dea4b53555696739a3ba704f0ec |
10-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera: Add HDR scene mode constants.
Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 66765846726c02db16a0f024f2217990a90802c0 |
10-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev
|
| e0f8517eac5dbd4e25aa61fff66c76a42d8fbefc |
10-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am f755a506: am d81be6d6: Merge "aacenc: Mark some global arrays const"
* commit 'f755a506335df3bfb32c062096deceaf045044ed':
aacenc: Mark some global arrays const
|
| 1646a0fed94c30a44128b3c379736def4b332033 |
10-Sep-2012 |
Andreas Huber <andih@google.com> |
Enable audio streaming to a wifi display. Remove startup delay hack.
Change-Id: I2e163db1595bb504de3a2e99cace191aa90708ca
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/Serializer.cpp
|
| f755a506335df3bfb32c062096deceaf045044ed |
10-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am d81be6d6: Merge "aacenc: Mark some global arrays const"
* commit 'd81be6d670f0d89aa6048a82fbbff82c584e9922':
aacenc: Mark some global arrays const
|
| d81be6d670f0d89aa6048a82fbbff82c584e9922 |
10-Sep-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "aacenc: Mark some global arrays const"
|
| 61c0cc6af2c64d280bcfc1fcca3e3589172a5817 |
07-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use face priority scene mode when face detect is enabled.
Per API specs, enabled face detection implies that metering, etc is
done based on faces.
Bug: 6243944
Change-Id: Ie35162226d70cc0f437e92e37be138e71e45e738
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| 4a02cc818607c0c145f91c3acb9181868a108f26 |
10-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Sanity check inputs better.
Bug: 7132141
Change-Id: I866a65dfe47464070a6ef4ac60be4801cb68327b
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| e242098c1af57e70a0b094dd380e743ea635f24a |
10-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| fd48021dfc3278b048ba99ecffe7f996751fb440 |
10-Sep-2012 |
Elliott Hughes <enh@google.com> |
am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3':
Fix libmedia and libstagefright to get expat header files from the approved location.
|
| e7c992c675e0075cd60b0b11c06d5956e3ddd7a3 |
10-Sep-2012 |
Elliott Hughes <enh@google.com> |
am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit '5abc91d61718e334e05c6d4858bd868bd5a5769c':
Fix libmedia and libstagefright to get expat header files from the approved location.
|
| 5abc91d61718e334e05c6d4858bd868bd5a5769c |
10-Sep-2012 |
Elliott Hughes <enh@google.com> |
Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
|
| e8057dd8208f0a185109992339a995c518b12780 |
09-Sep-2012 |
Elliott Hughes <enh@google.com> |
Fix libmedia and libstagefright to get expat header files from the approved location.
Found during a libexpat upgrade.
Change-Id: I9e5abd502a884975d898486edde374fb2519164e
edia/libmedia/Android.mk
edia/libmedia/MediaProfiles.cpp
edia/libstagefright/Android.mk
edia/libstagefright/MediaCodecList.cpp
|
| 6ce3d19cd35a49add6893298f70b87917fc60d52 |
09-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Add outlier statistics for fast mixer cycle times" into jb-mr1-dev
|
| 888f63bcde37347061de1aabb1b7febb2eca0875 |
09-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix buffer size issue for multichannel HE-AAC
Decoding of HE-AAC fails due to output buffer size being too small.
Size output buffer size according to maximum number of channels.
Change-Id: I6b10842cf7ba3da1f4b4075b1f7f5404bf76be41
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 85b7ec67b0cd2831c5a07c74b0147df7118e591b |
09-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 9538ab83ed3917e643fc88f63ed83736d5a22d19 |
09-Sep-2012 |
Martin Storsjo <martin@martin.st> |
aacenc: Mark some global arrays const
This gets rid of initialized writeable data in the library.
Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
edia/libstagefright/codecs/aacenc/inc/aac_rom.h
edia/libstagefright/codecs/aacenc/src/aac_rom.c
edia/libstagefright/codecs/aacenc/src/block_switch.c
|
| ef49e2fdb1f776229a4be05aa9952a1107e94f51 |
09-Sep-2012 |
Jeff Brown <jeffbrown@google.com> |
Revert max buffers change.
Attempting to use 31 buffers crashes on Prime.
Bug: 7131413
Change-Id: Ib85aef9b1da01f7243bd781a0efa47de2970412d
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| b019250df516e094b0cb648851f9a132b045378a |
08-Sep-2012 |
Jeff Brown <jeffbrown@google.com> |
Add a permission for controlling wifi display.
Change-Id: I321b6c1a0223e0c3d5df04fde7a13ab91c08c7bc
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 5e54e0898a0110642df126238227eca150f2654a |
08-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Fix headroom management in equalizer" into jb-mr1-dev
|
| 10894e509f777c6bd7e408a57f5cf21ee2b36a96 |
08-Sep-2012 |
James Painter <jpainter@google.com> |
Fix build
Change-Id: Ia4bebc4ecc850b42ebd4edd1ffed07e9bc2ec300
ervices/camera/libcameraservice/Camera2Client.cpp
|
| e538206d15282afbc5b168d60b1026a5dfcd13c0 |
06-Sep-2012 |
James Painter <jpainter@google.com> |
Camera2: Add a burst mode skeleton.
Bug: 6243944
Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/BurstCapture.cpp
ervices/camera/libcameraservice/camera2/BurstCapture.h
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
ervices/camera/libcameraservice/camera2/JpegCompressor.cpp
ervices/camera/libcameraservice/camera2/JpegCompressor.h
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| 7ac783252ef682abddd083104ab06619d82ac52f |
08-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Less verbose logging, lots of references." into jb-mr1-dev
|
| 72f6aea5afba3ff8ab7e8eab49552d65ee3bb97b |
08-Sep-2012 |
Andreas Huber <andih@google.com> |
Less verbose logging, lots of references.
Change-Id: Idcb76848883b113e956d7e6266da882771a053b8
edia/libstagefright/wifi-display/ANetworkSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
|
| f6c7a40f8cbbd2fa1a4131ef91b30cf7c5c2d0d7 |
08-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Fix headroom management in equalizer
Fix a bug resetting the headroom parameters when
calling the bundle process function for the first time.
Change-Id: Ie05f97606f415954340ff2a4e48cd7b0a97a063b
edia/libeffects/lvm/lib/Bundle/src/LVM_Init.c
|
| 525098dd5442c66e9aa43ef15563fdae6d47ec9e |
08-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Make wfd code work with both old and new dongles." into jb-mr1-dev
|
| 7977e85f7287f2b0e7a5de94e853e6073736e03b |
08-Sep-2012 |
Andreas Huber <andih@google.com> |
Make wfd code work with both old and new dongles.
Change-Id: Idc750dc334c47a171791587dd7e7281d565ff566
edia/libstagefright/wifi-display/ANetworkSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| 85396642425b94ec33aa26f27e109353e3516ec4 |
07-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: changes for new audio devices enums" into jb-mr1-dev
|
| 1adbb8c35b721e1a29f8e2e2a5341ae0b1f067ba |
07-Sep-2012 |
John Grossman <johngro@google.com> |
Merge "Fix iTunSMPB parsing for AAC tracks encoded with Nero" into jb-mr1-dev
|
| 8c7d147cca17961a71209c105a2676a552d3d69f |
07-Sep-2012 |
John Grossman <johngro@google.com> |
Fix iTunSMPB parsing for AAC tracks encoded with Nero
Make sure to clear out the mean/name/data state when parsing
apple-style metadata from tracks every time we have a full set, not
just when we find an iTunSMPB set.
AAC tracks encoded from WAV by Nero tend to put in an additional apple
style metadata tag (cdec) before the iTunSMPB tag. The sequence in
the file goes something like
mean : "com.apple.iTunes"
name : "cdec"
data : "ndaudio 1.5.4.0 / -2pass -br 320000"
mean : "com.apple.iTunes"
name : "iTunSMPB"
data : " 00000000 00000A40 000000B8 <etc...>"
If the internal state was not cleared after the first set, then when
the second instance of "name" is encountered, an attempt is made to
parse the previous data entry as an iTunSMPB tag when it is actually a
cdec tag. Afterwards, mean, name and data are all cleared, and when
the second data is encountered there is no current mean or name
present, so the gapless metadata gets skipped. By clearing the
metadata state every time we have a full set of mean/name/data, we
make sure that we are always interpreting the data field as the proper
type.
Change-Id: I196e2e3f83e434f15d5ee55ae40a74a92d5a1845
edia/libstagefright/MPEG4Extractor.cpp
|
| 1ab212cf5cfa5b88c801840e11e3191cd10f48e4 |
07-Sep-2012 |
Glenn Kasten <gkasten@google.com> |
Add outlier statistics for fast mixer cycle times
Change-Id: I31c964caeb8b5d9ae0a426224f030cdcb01114a0
ervices/audioflinger/FastMixer.cpp
|
| 1c7ff022a91e4f966c23dcf11f6859c69c08841a |
07-Sep-2012 |
Alexander Ray <aray@google.com> |
Merge "Camera2: Increase zoom steps." into jb-mr1-dev
|
| 5a4f93eaaab7518fd734fdc9f0f686d632f31a59 |
30-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use the recordingHint parameter.
Use recordingHint to create recording and still capture streams up
front, and to use the recording template when doing preview.
Bug: 6243944
Change-Id: Ifeb624794849f734784b53a1a10ff2bfe8f1a357
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| cf70d3469332445dc3ffd09729da3538612b1bb2 |
06-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Delete all streams and stop all threads during shutdown.
Bug: 6243944
Change-Id: If13a1f91e8a07c1ec4f91183d1a4b261ec4f6d52
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/camera2/CallbackProcessor.cpp
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
|
| 2d1ef1371db8b202b693f1657f56824f9af8d565 |
07-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Play shutter and recording sounds." into jb-mr1-dev
|
| f1c04f952916cf70407051c9f824ab84fb2b6e09 |
28-Aug-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: changes for new audio devices enums
The ThreadBase class now has a separate member for input
and output devices (mInDevice, mOutDevice).
Only query get_supported_devices() from audio HAL if the function
is exposed and if the audio policy manager did not specify the
audio module to open.
Also fixed bug in AEC preprocessing that would reset
to default output device when an input device was given.
Change-Id: I19d4d06aeb920b068e3ef31e6e6be6345ce5d67a
edia/libeffects/preprocessing/PreProcessing.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 261fd2119c70fda3af64453881a6346dd48eb956 |
07-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "AudioRecord: Fix minimum frame count calculation." into jb-mr1-dev
|
| 609acc0c96bc2aedd42246862b537e045f5184b6 |
07-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Play shutter and recording sounds.
Bug: 6987540
Change-Id: Icd441a757c4b68fc4988b3bfbef428adb8d1ba28
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
|
| 161fac83b369f4873859a101b6a71efeb596bd4a |
07-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Increase zoom steps.
10 is too low for smooth zoom; increase number to improve smoothness.
Bug: 7120794
Change-Id: I178cd3890ef37beeff97cadb9e92ceab6d2cad06
ervices/camera/libcameraservice/camera2/Parameters.h
|
| d06ab147394b0b49679c924a51d77c91dea04d82 |
07-Sep-2012 |
Eric Laurent <elaurent@google.com> |
Merge "AudioFlinger: send audio source to audio effects" into jb-mr1-dev
|
| 2e5f22e85d177b34e790f832789d03aee438a7db |
24-Aug-2012 |
John Grossman <johngro@google.com> |
Add a small hook to support gapless in AAH.
Change-Id: Ie07eca6b45142bdd83412ee0e38d732a4c355630
nclude/media/MediaPlayerInterface.h
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| c56857b4cd12cd4bc3361e375f5b7554277ce9d7 |
06-Sep-2012 |
John Grossman <johngro@google.com> |
Merge "Fix calculations for an obscure combo of MPEG audio options." into jb-mr1-dev
|
| 6f744d75d3439f7984245e3c489cc7cf91cea41c |
06-Sep-2012 |
Eric Laurent <elaurent@google.com> |
AudioRecord: Fix minimum frame count calculation.
AudioRecord::set() was calling getMinFrameCount() with
a channel count instead of a channel mask.
Change-Id: Iabace7686426430fd53deac0c71b0c36aa64171c
edia/libmedia/AudioRecord.cpp
|
| 96150cfc6b9ae93b6c4b60b5c7889a7a90af5def |
03-Sep-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Move locked states out of AE/AWB mode
Bug: 6243944
Change-Id: I7b609cc6c04c957d1f48c1a996263fa9c7b94000
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| da6665cbd06ca58d3357c3002b7366d13e23f152 |
30-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Basic ZSL and precapture trigger support.
- Add capture sequencer to control still image capture process
- Use precapture trigger for standard capture in sequencer
- Add infrastructure for reprocessing streams
- Add ZSL processor to maintain ZSL queue
- Add ZSL capture sequence to sequencer
This patch sets up ZSL mode and precapture triggers.
For now, to enable zsl mode, set the system property camera.zsl_mode
to 1.
Bug: 6243944
Change-Id: Icf8cb1a83a7c11a152a11007c8f3c54f8ea1c70c
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
ervices/camera/libcameraservice/camera2/CallbackProcessor.cpp
ervices/camera/libcameraservice/camera2/CallbackProcessor.h
ervices/camera/libcameraservice/camera2/CameraMetadata.cpp
ervices/camera/libcameraservice/camera2/CameraMetadata.h
ervices/camera/libcameraservice/camera2/CaptureProcessor.cpp
ervices/camera/libcameraservice/camera2/CaptureProcessor.h
ervices/camera/libcameraservice/camera2/CaptureSequencer.cpp
ervices/camera/libcameraservice/camera2/CaptureSequencer.h
ervices/camera/libcameraservice/camera2/FrameProcessor.cpp
ervices/camera/libcameraservice/camera2/FrameProcessor.h
ervices/camera/libcameraservice/camera2/JpegProcessor.cpp
ervices/camera/libcameraservice/camera2/JpegProcessor.h
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
ervices/camera/libcameraservice/camera2/ZslProcessor.cpp
ervices/camera/libcameraservice/camera2/ZslProcessor.h
|
| a39ad61a1c9c69c2cc60f5d14243dd56040f8571 |
29-Aug-2012 |
John Grossman <johngro@google.com> |
Fix calculations for an obscure combo of MPEG audio options.
MPEGv2 and MPEGv2.5 Layer 2 audio payloads should 1152 samples per
access unit, not 576. Adjust the frame size and samples out
calculations accordingly.
Also, adjust the max frame size in the MP3Extractor's MediaSource to
be closer to the theoretical worst case max frame size. The
theoretical worst case for MPEG audio is 2881 bytes per frame, but the
max frame size being used was 32kB. It has been changed to be 4kB in
order to remain a power of 2 allocation, but to be the power of 2
closest to the worst case.
Change-Id: If11f5a843b06e70151bbe8298cc54f954938d9d7
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/avc_utils.cpp
|
| 49c74da132fe42dd4d2066131f8f0e2df301c1dd |
06-Sep-2012 |
Jeff Brown <jeffbrown@google.com> |
Merge "Update remote display API." into jb-mr1-dev
|
| d047ef66c128bc415dd56961a567dabc79c041c0 |
06-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| e148910dfb3f69cdf1a078066724cb32b18e7b8a |
06-Sep-2012 |
James Dong <jdong@google.com> |
Merge "Fix an issue where the "mFrameCount" field was accessed without its containing object" into jb-mr1-dev
|
| 3a6b97eba61b280bf81407ad6d6fb210ef93f9c4 |
06-Sep-2012 |
Marco Nelissen <marcone@google.com> |
Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-dev
|
| 74262b573c3d87c323c41d364af12f206ae46642 |
06-Sep-2012 |
Marco Nelissen <marcone@google.com> |
Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev
|
| 455d02eca342d8159637af317a5d83219d267812 |
06-Sep-2012 |
Jeff Brown <jeffbrown@google.com> |
Update remote display API.
Renamed disconnect() to dispose() to emphasize the fact that
this method is intended to clean up the IRemoteDisplay
completely, not just temporarily disconnect the current client
(which might be useful someday).
Other minor tweaks.
Change-Id: I1209639eb0cd8af09c724206642d7e52aab48257
nclude/media/IRemoteDisplay.h
nclude/media/IRemoteDisplayClient.h
edia/libmedia/IRemoteDisplay.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/RemoteDisplay.cpp
edia/libmediaplayerservice/RemoteDisplay.h
|
| 6638f3bd61df1e5d012bc600b7af4c1b4dd4a06b |
06-Sep-2012 |
James Dong <jdong@google.com> |
Fix an issue where the "mFrameCount" field was accessed without its containing object
Change-Id: I6077b61b3e718b9b44ff86ca669a59f96b0b256f
ervices/camera/libcameraservice/Camera2Device.cpp
|
| 9c6cb7a896f41cb8ad2f2ad63f8f6edfbb56ed4f |
06-Sep-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Fragmented mp4 extractor" into jb-mr1-dev
|
| 56997121c5031598fbbba7b7c53980b7fd529c2d |
29-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Fragmented mp4 extractor
Still experimental. Set property "media.stagefright.use-fragmp4" to true to
enable.
Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
nclude/media/stagefright/Utils.h
edia/libmediaplayerservice/nuplayer/mp4/MP4Source.cpp
edia/libstagefright/Android.mk
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/FragmentedMP4Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MetaData.cpp
edia/libstagefright/Utils.cpp
edia/libstagefright/include/FragmentedMP4Extractor.h
edia/libstagefright/include/FragmentedMP4Parser.h
edia/libstagefright/mp4/FragmentedMP4Parser.cpp
|
| 0b73d4730202fcad53aefc4314a06e7b95f442f0 |
05-Sep-2012 |
Andreas Huber <andih@google.com> |
Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.
Change-Id: I7602cda0e38073c9f0e63fa4de238ca0d4b4ce8e
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/RemoteDisplay.cpp
edia/libmediaplayerservice/RemoteDisplay.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| e104596061b219e9bce6d4db49a9d15242f8d2e5 |
05-Sep-2012 |
Jeff Brown <jeffbrown@google.com> |
Implement remote display service stubs.
Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
nclude/media/IMediaPlayerService.h
nclude/media/IRemoteDisplay.h
nclude/media/IRemoteDisplayClient.h
edia/libmedia/Android.mk
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IRemoteDisplay.cpp
edia/libmedia/IRemoteDisplayClient.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 6c75ad21705cde0a11f78c755dc70bdec76890e6 |
05-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Configure the SurfaceMediaSource to emit the same number of buffers" into jb-mr1-dev
|
| f0807b3f361bc0f814e9a0d7e122cda016e923b4 |
05-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 06096f955d486e229e19956052925f43f2f3f7c4 |
05-Sep-2012 |
Dongwon Kang <dwkang@google.com> |
To make mimetype for WAV file consistent over SF.
(audio/x-wav is chosen because it was also used in MediaFile.java.)
Tested: checked wav files plays well on Music app.
Change-Id: Ifc07bcbed681e509176b1c144626f6f1009e69be
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/WAVExtractor.cpp
|
| 5c5f8d93667ec36fbcd01ecb113ccae78322c85b |
05-Sep-2012 |
Dongwon Kang <dwkang@google.com> |
To support .mxmf which is specified in Android CDD.
Bug: 7082658
Change-Id: I21269d72d1d21627c6adb2e6fbcb078d0eda6020
Tested: checked MediaScanner scans .mxmf and Music app plays .mxmf file.
edia/libmediaplayerservice/MediaPlayerFactory.cpp
|
| 0d268a3cae145afb2720c88ae38fb81550be5584 |
31-Aug-2012 |
James Dong <jdong@google.com> |
Add setVideoScalingMode support to NuPlayer
o related-to-bug: 7089195
Change-Id: Ic30d9312673f2d5837c779e023ac64468ecd4951
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
|
| 66e72bc85fb762876baff60ef29de729da93cf26 |
05-Sep-2012 |
Andreas Huber <andih@google.com> |
Configure the SurfaceMediaSource to emit the same number of buffers
as the video encoder allocates for its input. Do this before connecting
the bufferqueue through surface flinger.
Change-Id: Ibc81db1359afe2d88fdb75b23fadae65c8a6f7cc
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| fbe9d81ff5fbdc5aecdcdd13e4a5d7f019824f96 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Support for acting as a wifi display sink.
Change-Id: I0beac87025b93c60164daa865c89f16b72197a47
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/wifi-display/Android.mk
edia/libstagefright/wifi-display/sink/LinearRegression.cpp
edia/libstagefright/wifi-display/sink/LinearRegression.h
edia/libstagefright/wifi-display/sink/RTPSink.cpp
edia/libstagefright/wifi-display/sink/RTPSink.h
edia/libstagefright/wifi-display/sink/TunnelRenderer.cpp
edia/libstagefright/wifi-display/sink/TunnelRenderer.h
edia/libstagefright/wifi-display/sink/WifiDisplaySink.cpp
edia/libstagefright/wifi-display/sink/WifiDisplaySink.h
edia/libstagefright/wifi-display/wfd.cpp
|
| 7323115c6e55f2da73317d7ff6a69b808d74264e |
04-Sep-2012 |
Andreas Huber <andih@google.com> |
Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-dev
|
| dafd2944cd0eb8c8ad82ebddf3a2b669970dfc47 |
03-Sep-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 57b2dd1e78af53115985f18d31ec5421c9da947e |
01-Sep-2012 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: send audio source to audio effects
Added support for EFFECT_CMD_SET_AUDIO_SOURCE audio effect
command to inform preprocessings of current audio source
selection for capture.
Change-Id: Ib2418a9aa8114e8457fe828ecd43b230ed86cdd6
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 312380331e28b7e5693a4b1646caf2d19aba1b2a |
31-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-dev
|
| cb1f88c684140ce0eb407049a78f889bc7d51be1 |
31-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Move fragmented mp4 parser to libstagefright
and rename it from Parser to FragmentedMP4Parser
Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/mp4/MP4Source.cpp
edia/libmediaplayerservice/nuplayer/mp4/MP4Source.h
edia/libmediaplayerservice/nuplayer/mp4/Parser.cpp
edia/libmediaplayerservice/nuplayer/mp4/Parser.h
edia/libmediaplayerservice/nuplayer/mp4/TrackFragment.cpp
edia/libmediaplayerservice/nuplayer/mp4/TrackFragment.h
edia/libstagefright/Android.mk
edia/libstagefright/include/FragmentedMP4Parser.h
edia/libstagefright/mp4/FragmentedMP4Parser.cpp
edia/libstagefright/mp4/TrackFragment.cpp
edia/libstagefright/mp4/TrackFragment.h
|
| cd89e8014368af1bbdfa08406d5d2eb0bbbfcca1 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Added an additional virtual method IStreamSource::flags()." into jb-mr1-dev
|
| 892020e46b97adfa012be7a9dd688a2d6d528de4 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Special mode for ESQueue that allows for earlier dequeuing of access units" into jb-mr1-dev
|
| 87f2a558dd12043631e12c361abef301bf603140 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Improvements to our MPEG2 Transport Stream parser
Verifies the continuity counter
Parses and associates PCR time with streams
Allows for a absolute time anchor to be signalled via discontinuity.
Change-Id: I4bc88c78382c9cc6380f28df584cc6c254e0a8f9
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
|
| f56afa4878694803a44d1b0e9a54762d1d5ab652 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Special mode for ESQueue that allows for earlier dequeuing of access units
if it's know beforehand that each PES packet contains exactly one access unit.
Currently this optimization is only supported for H.264 video.
Change-Id: I0888027cc7e9850307484b11dba1191cf6bfac83
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
|
| da7ff5321539ac07ec76d0d03bd1b9b09a1823bf |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Added an additional virtual method IStreamSource::flags().
Change-Id: I89e62d84328e12f08c8f73cbfd53cfb42569de97
nclude/media/IStreamSource.h
edia/libmedia/IStreamSource.cpp
|
| 6135667138a47f9139274833e49bf580633dd8f0 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Add support for mpeg2 transport streams to the RTSP implementation." into jb-mr1-dev
|
| 092fe44abd787fcb4377d90c63f2aa7120a4d267 |
31-Aug-2012 |
Shuzhen Wang <shuzhenw@quicinc.com> |
Camera: set vendor_ops on camera metadata.
This makes sure that vendor specific metadata can propogate through
the framework.
Change-Id: I3bd0ae4b889eb907caf7b305dbcb16abbbef0ea3
ervices/camera/libcameraservice/Camera2Device.cpp
|
| 6bcdca035d4e9f7b2aee2d3febd8e2df5f57ae6f |
31-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 371e1217: (-s ours) am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
* commit '371e121745c2e43e3c26fd1a854eaf6d3324f057':
OMXCodec: enhance error handling of OMX IL client
|
| 371e121745c2e43e3c26fd1a854eaf6d3324f057 |
31-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"
* commit '8b1525663322685ff34d9c09176feebd102e1c3d':
OMXCodec: enhance error handling of OMX IL client
|
| 8b1525663322685ff34d9c09176feebd102e1c3d |
31-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "OMXCodec: enhance error handling of OMX IL client"
|
| cfaeeec0900014d97e15829e0fa52f865ee4c786 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Add support for mpeg2 transport streams to the RTSP implementation.
Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
edia/libstagefright/rtsp/AMPEG2TSAssembler.cpp
edia/libstagefright/rtsp/AMPEG2TSAssembler.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/Android.mk
|
| 9ed644af05addc13be50e90bdc85e999885b0d58 |
31-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Documentation on pipes" into jb-mr1-dev
|
| b3428f7f8ebd9b08a631889dda48bf5951ab21b6 |
31-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Update audio comments" into jb-mr1-dev
|
| dc91c885f267005e06f439a3bd592b3d8706bb50 |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." into jb-mr1-dev
|
| 520c3c74d701532759e12c3b54d43b415afcb6d2 |
27-Jul-2012 |
Weian Chen <weian.chen@intel.com> |
OMXCodec: enhance error handling of OMX IL client
Original design doesn't handle event EMPTY_BUFFER_DONE and
FILL_BUFFER_DONE which leads to buffer status mess issue,
and in turn leads to mediaserver crash.
Here we will handle those 2 events anyway to fix this.
Change-Id: Ia90b46ea7ec6026d6fda5d33fef6773435788b04
Author: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Tianmi Chen<tianmi.chen@intel.com>
Signed-off-by: Weian Chen <weian.chen@intel.com>
Signed-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: 49066, 27054
edia/libstagefright/OMXCodec.cpp
|
| 64d7b68fc25bbb2fc5558c645138eb625ca64674 |
31-Aug-2012 |
Jamie Gennis <jgennis@google.com> |
Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev
|
| b6777017a68ed473d61cc9d6e77c34fd5cd301cc |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Implement the source->sink(!) keep alive the wfd specs mandate...
Change-Id: I388d9911ebd243aa9c13a13ec3683e76898470a6
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
|
| c3ae93f21280859086ae371428ffd32f39e76d50 |
30-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Update audio comments
Change-Id: Ie7504d0ddb252f7e4d4f99ed0b44cfc7b1049816
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| ba8da29bb615bd507c4d182f8f7b3b6743edd1c8 |
29-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Documentation on pipes
Change-Id: I3de496c7db026c50dcb6bc577741bb65d08e7c9d
edia/libnbaio/README.txt
|
| c9936c72c128a4a9288424fb082d7e7fe4b9b91f |
31-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead code" into jb-mr1-dev
|
| 7aa25591769685ae0e8349b3ca3534c724484375 |
03-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead code
RecordThread::isValidSyncEvent() returns false, so most of
RecordThread::setSyncEvent() is never executed.
Change-Id: I0cf848beb46a367a45126d2df3073c5afa2ca59c
ervices/audioflinger/AudioFlinger.cpp
|
| 5dcc2c988eefba1049fe64172bc5fc7e6ee27c8b |
31-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Only run the wifi display RTSP server on demand, and only on the wifi direct" into jb-mr1-dev
|
| b9cba9b731195d4387ee21b7e9ba1137a3cfda68 |
31-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Move libnbaio out of AudioFlinger" into jb-mr1-dev
|
| bcf09f8c995221e75c7cd328f25c7cc6d2b5f7c9 |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Only run the wifi display RTSP server on demand, and only on the wifi direct
interface.
Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
nclude/media/IMediaPlayerService.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/RemoteDisplay.cpp
edia/libmediaplayerservice/RemoteDisplay.h
edia/libstagefright/wifi-display/ANetworkSession.cpp
edia/libstagefright/wifi-display/ANetworkSession.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
edia/libstagefright/wifi-display/wfd.cpp
|
| 3d26e897fc91cf6ad3576d25b4b240e9a2189970 |
23-Aug-2012 |
James Dong <jdong@google.com> |
Don't hard code the number of buffers for SurfaceMediaSource
Change-Id: I9ce17b3dc82a5d3e4a66569c76ad9745ceedacd6
edia/libstagefright/SurfaceMediaSource.cpp
|
| cba53fbdaa723322f7157a4890feab776beae13e |
30-Aug-2012 |
Eric Laurent <elaurent@google.com> |
audio effects: fix bug in sample rate control.
Fix a bug in LVM bundle wrapper preventing audio framework sample rate
from being sent to the effect bundle instance.
Change-Id: I912027f866d3beac91b977bba869ff96a92d2a62
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| 23466a95b6b66b9f9592148f4252775e16d46e5b |
30-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Require 2 JPEG thumbnail resolutions." into jb-mr1-dev
|
| 5f00501d1cf538af7be0af4ec7866bf5a9397dd4 |
30-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge changes I7bef5694,Id38e2a52 into jb-mr1-dev
* changes:
Camera2: Move preview callback processing to its own thread.
Camera2: Move still capture processing to separate thread.
|
| 86b1961a8d61086ef8d5475182f2a3cf4392b42c |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Prepare for transmitting audio through AudioSource." into jb-mr1-dev
|
| 082830f92373a1b9e512dbbfb940187ffa1c2c6f |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Prepare for transmitting audio through AudioSource.
AudioSource can now be configured to output buffers timestamped based
on looper time (absolute) instead of based on systemTime() relative to
start time.
Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| 546436a4569ec76ddfba78783851440edf990fbc |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Transmit frames at a higher frame rate for smoother updates, increase" into jb-mr1-dev
|
| 682d5593c9639090b3e08bd57570f3299df9da92 |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Optionally log the transport stream transmitted to the sink." into jb-mr1-dev
|
| 2dd4bdd715f586d4d30cf90cc6fc2bbfbce60fe0 |
29-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Move libnbaio out of AudioFlinger
libnbaio is now a separate shared library from AudioFlinger, rather
than a static library used only by AudioFlinger.
AudioBufferProvider interface is now also independent of AudioFlinger,
moved to include/media/
Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
nclude/media/AudioBufferProvider.h
nclude/media/ExtendedAudioBufferProvider.h
nclude/media/nbaio/AudioBufferProviderSource.h
nclude/media/nbaio/AudioStreamInSource.h
nclude/media/nbaio/AudioStreamOutSink.h
nclude/media/nbaio/LibsndfileSink.h
nclude/media/nbaio/LibsndfileSource.h
nclude/media/nbaio/MonoPipe.h
nclude/media/nbaio/MonoPipeReader.h
nclude/media/nbaio/NBAIO.h
nclude/media/nbaio/Pipe.h
nclude/media/nbaio/PipeReader.h
nclude/media/nbaio/SourceAudioBufferProvider.h
nclude/media/nbaio/roundup.h
ibvideoeditor/lvpp/VideoEditorSRC.h
edia/libnbaio/Android.mk
edia/libnbaio/AudioBufferProviderSource.cpp
edia/libnbaio/AudioStreamInSource.cpp
edia/libnbaio/AudioStreamOutSink.cpp
edia/libnbaio/LibsndfileSink.cpp
edia/libnbaio/LibsndfileSource.cpp
edia/libnbaio/MonoPipe.cpp
edia/libnbaio/MonoPipeReader.cpp
edia/libnbaio/NBAIO.cpp
edia/libnbaio/Pipe.cpp
edia/libnbaio/PipeReader.cpp
edia/libnbaio/SourceAudioBufferProvider.cpp
edia/libnbaio/roundup.c
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioBufferProviderSource.cpp
ervices/audioflinger/AudioBufferProviderSource.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioStreamInSource.cpp
ervices/audioflinger/AudioStreamInSource.h
ervices/audioflinger/AudioStreamOutSink.cpp
ervices/audioflinger/AudioStreamOutSink.h
ervices/audioflinger/ExtendedAudioBufferProvider.h
ervices/audioflinger/FastMixerState.h
ervices/audioflinger/LibsndfileSink.cpp
ervices/audioflinger/LibsndfileSink.h
ervices/audioflinger/LibsndfileSource.cpp
ervices/audioflinger/LibsndfileSource.h
ervices/audioflinger/MonoPipe.cpp
ervices/audioflinger/MonoPipe.h
ervices/audioflinger/MonoPipeReader.cpp
ervices/audioflinger/MonoPipeReader.h
ervices/audioflinger/NBAIO.cpp
ervices/audioflinger/NBAIO.h
ervices/audioflinger/Pipe.cpp
ervices/audioflinger/Pipe.h
ervices/audioflinger/PipeReader.cpp
ervices/audioflinger/PipeReader.h
ervices/audioflinger/SourceAudioBufferProvider.cpp
ervices/audioflinger/SourceAudioBufferProvider.h
ervices/audioflinger/roundup.c
ervices/audioflinger/roundup.h
|
| e05a679401c7baeb0f82ce105eb20ae1ec863cdf |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Transmit frames at a higher frame rate for smoother updates, increase
video bandwidth to 5 Mbit/sec.
Change-Id: Ieb9051b0f29d5a20004d1b3befdb745bc67769c7
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| f128dc51c81e6b831806e0de505e4edbb02b7e71 |
28-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Require 2 JPEG thumbnail resolutions.
Include (0,0) as a required thumbnail resolution, to allow turning off
thumbnails.
Change-Id: I3c4efe2d6a4f576a11ce5b75a3d573812a100b80
ervices/camera/libcameraservice/camera2/Parameters.cpp
|
| d86a6880fe86bda21a9b53b240996fc410a512a5 |
28-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Move preview callback processing to its own thread.
To reduce delays for HAL callbacks, manage preview callbacks in their
own thread.
Bug: 6243944
Change-Id: I7bef56949ac889ffce4e031bf40291a771a46f3e
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/camera2/CallbackProcessor.cpp
ervices/camera/libcameraservice/camera2/CallbackProcessor.h
|
| ea0d51b5ed0b474433b02414f9133b835f972569 |
28-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Move still capture processing to separate thread.
To avoid stalling HAL when it queues up new buffers for still capture,
process still captures in a separate thread. Also move Camera2Heap to
its own class so it can be used by the CaptureProcessor.
Bug: 6243944
Change-Id: Id38e2a52367c0985812fcd4fd9af3ef90beef43f
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/camera2/Camera2Heap.h
ervices/camera/libcameraservice/camera2/CaptureProcessor.cpp
ervices/camera/libcameraservice/camera2/CaptureProcessor.h
|
| 6524b7e1e6aae7dc1fe650119ec4bcf96b5a3f6b |
30-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Factor out FrameProcessor." into jb-mr1-dev
|
| 774df0dce0116c69b6d17f2e4a4912e06138e575 |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Optionally log the transport stream transmitted to the sink.
Change-Id: I5d392e7997d6beb09ba6eca70d6899747098d2b3
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
|
| 09f2ca67aa970bb8733cb7473fe9d357c198818c |
30-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2f9a44101f4fd372834c67150aea76a07b94b5ec |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix wifi display shutdown deadlock." into jb-mr1-dev
|
| 2dff0f6a7bf06a878ad0890d93dc9c1ef0b5a107 |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Fix wifi display shutdown deadlock.
Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
|
| d8ee4e56f92eeb44ddc0997efe280b9f28ad814d |
30-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
|
| d7bee3a9d2ad76d073d91f0ee36d5ac5f9df480c |
29-Aug-2012 |
Andreas Huber <andih@google.com> |
Initial checkin of support for acting as a wifi display source
Change-Id: I08f17efa0c7d007e17408feb7d4fbef0a19f531a
nclude/media/IMediaPlayerService.h
nclude/media/stagefright/ACodec.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/RemoteDisplay.cpp
edia/libmediaplayerservice/RemoteDisplay.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/wifi-display/ANetworkSession.h
edia/libstagefright/wifi-display/Android.mk
edia/libstagefright/wifi-display/ParsedMessage.h
edia/libstagefright/wifi-display/source/Converter.cpp
edia/libstagefright/wifi-display/source/Converter.h
edia/libstagefright/wifi-display/source/PlaybackSession.cpp
edia/libstagefright/wifi-display/source/PlaybackSession.h
edia/libstagefright/wifi-display/source/RepeaterSource.cpp
edia/libstagefright/wifi-display/source/RepeaterSource.h
edia/libstagefright/wifi-display/source/Serializer.cpp
edia/libstagefright/wifi-display/source/Serializer.h
edia/libstagefright/wifi-display/source/TSPacketizer.cpp
edia/libstagefright/wifi-display/source/TSPacketizer.h
edia/libstagefright/wifi-display/source/WifiDisplaySource.cpp
edia/libstagefright/wifi-display/source/WifiDisplaySource.h
edia/libstagefright/wifi-display/wfd.cpp
|
| f147b722ad2405c7f92ea8691f36b04a82d62bb1 |
29-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Preliminary support for HDCP as a binder service for wifi display support." into jb-mr1-dev
|
| 1b19c9d120869c3182373a9b06a1ed98898df882 |
29-Aug-2012 |
Andreas Huber <andih@google.com> |
Preliminary support for HDCP as a binder service for wifi display support.
Change-Id: Ie0de1c086c629a668d1c7863992eef56fb94157c
nclude/media/IHDCP.h
edia/libmedia/Android.mk
edia/libmedia/IHDCP.cpp
edia/libmediaplayerservice/HDCP.cpp
edia/libmediaplayerservice/HDCP.h
|
| 0a24726a64ba1c50aa6ee1610de2d80602d49fe6 |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '8836f8e0bfc64dce81963db89dfc5d0f11c29483':
MPEG2TSWriter: Read more immediately if an empty buffer is received
|
| 55fb8470278b2eb747db3f4d7c245e37abdb7f2f |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
* commit 'bf30787f2694057e775f3b527b649a9f8074237b':
avcenc: Don't erase the InputBufferInfo before reading info from it
|
| b7b8de8878a32cd62916b29cf2cbf4f7437adbea |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
* commit '0924dd88790ba9cda0d5a86df7d68b7446470fc7':
recordvideo: Add an option for choosing software encoders
|
| ac4187569c7011c2dcfb9ed1ad658b7ad8cba046 |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
* commit '3f9e843d924f220f6094241bc765cd69d8fc6d7b':
recordvideo: Sleep while waiting for the encoding to finish
|
| 8836f8e0bfc64dce81963db89dfc5d0f11c29483 |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
* commit '5b15adfe9e5ee9a92b5f0a2853246fce170d4eef':
MPEG2TSWriter: Read more immediately if an empty buffer is received
|
| bf30787f2694057e775f3b527b649a9f8074237b |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading info from it"
* commit '735d1b926fa3e057c92d74cebacca2f243ead274':
avcenc: Don't erase the InputBufferInfo before reading info from it
|
| 0924dd88790ba9cda0d5a86df7d68b7446470fc7 |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"
* commit '2aa37a7d15f5e2246b8996d2600269684904c581':
recordvideo: Add an option for choosing software encoders
|
| 3f9e843d924f220f6094241bc765cd69d8fc6d7b |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"
* commit '9ce74352d23d833f9627b7be58be964206e6ff6d':
recordvideo: Sleep while waiting for the encoding to finish
|
| 5b15adfe9e5ee9a92b5f0a2853246fce170d4eef |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"
|
| 735d1b926fa3e057c92d74cebacca2f243ead274 |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Don't erase the InputBufferInfo before reading info from it"
|
| 2aa37a7d15f5e2246b8996d2600269684904c581 |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "recordvideo: Add an option for choosing software encoders"
|
| 9ce74352d23d833f9627b7be58be964206e6ff6d |
29-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "recordvideo: Sleep while waiting for the encoding to finish"
|
| f547a36c8f0fe11c4c425168037e3ce1d1a697df |
29-Aug-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Without this, the caller might hang waiting for more output buffers.
Change-Id: Ief6be00b7600be8498a953e8e88f0582ea8fce85
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
|
| e1e1e789c3b7a674c20d4ca6c33454e668533bc7 |
29-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| e61f13d2c710918f5267b3c835fcc20447b4e4d6 |
29-Aug-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Don't erase the InputBufferInfo before reading info from it
Previously, the timestamp and flags were read from the InputBufferInfo
struct after it had been erased.
This fixes cases where the output timestamp from the avc encoder
could spuriously be garbage every now and then.
Change-Id: I21acf23cfac93bcc201a603feace6499ec6d8e76
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
|
| 02d18453d54a05c275c03b72a8290f3c9a964446 |
29-Aug-2012 |
Martin Storsjo <martin@martin.st> |
MPEG2TSWriter: Read more immediately if an empty buffer is received
If writing encoded data from an OMXCodec, the last buffer can be
an empty buffer (with the EOS flag set, which isn't propagated to
MediaBuffer). If we don't retry reading, we won't ever get the
EOS error and thus won't properly signal that the source is done.
Change-Id: Ibe01dbcd0637fbf0c2529a277e9f208c48e0e8ab
edia/libstagefright/MPEG2TSWriter.cpp
|
| 1301a437ff9f5fa6c4ed78f88add3d9bfce97935 |
29-Aug-2012 |
Martin Storsjo <martin@martin.st> |
recordvideo: Sleep while waiting for the encoding to finish
This avoids busy looping while e.g. waiting for the software encoder
to finish.
This is similar to what the 'record' and 'stagefright' test apps
do.
Change-Id: Idce55b15396ce78b621a521229603bec1e799f33
mds/stagefright/recordvideo.cpp
|
| d4483f3fd0e024d833082fce3ddbc3a2f3d89b24 |
29-Aug-2012 |
Martin Storsjo <martin@martin.st> |
recordvideo: Add an option for choosing software encoders
This is similar to the same option in the 'stagefright' test
application.
Change-Id: I2a2e5201bd93460df0911ef12865c9030c0183e5
mds/stagefright/recordvideo.cpp
|
| a16733eeb9c40db4793bec408f29b4204e5f23b1 |
28-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Factor out FrameProcessor.
Move FrameProcessor to its own file, add necessary interfaces to
Camera2Client.
Bug: 6243944
Change-Id: I8d1b8280a65d2822461ebe6b6c9de17992b34276
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/camera2/FrameProcessor.cpp
ervices/camera/libcameraservice/camera2/FrameProcessor.h
|
| eb941f9a0c8474324732a99387cc6d8cb4ab01ef |
28-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr1-dev
|
| 3a1d5240f3dcf0f3538549cc94c63fde8b216762 |
28-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix retries when server doesn't support range requests." into jb-mr1-dev
|
| a7607a7f97b3136d5e61c0bca63760bf9fc05b19 |
28-Aug-2012 |
Andreas Huber <andih@google.com> |
Fix retries when server doesn't support range requests.
Change-Id: I2d137f3e799b87af36a279473c0077d860c14477
related-to-bug: 7021436
edia/libstagefright/NuCachedSource2.cpp
|
| eccfd92954c1c79bd8e71b9d3df9314d0e93d287 |
28-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Test to measure UDP roundtrip time between two devices on the same network." into jb-mr1-dev
|
| bb197f84c4119651e5face418285688ddaf08ea3 |
28-Aug-2012 |
Andreas Huber <andih@google.com> |
Test to measure UDP roundtrip time between two devices on the same network.
Change-Id: I4c9a5190efe18da8b6be7d68bda91df878c4118c
edia/libstagefright/wifi-display/ANetworkSession.cpp
edia/libstagefright/wifi-display/ANetworkSession.h
edia/libstagefright/wifi-display/Android.mk
edia/libstagefright/wifi-display/ParsedMessage.cpp
edia/libstagefright/wifi-display/ParsedMessage.h
edia/libstagefright/wifi-display/udptest.cpp
|
| 87ffb20380f375c8906aa3ba16ebb196d4ba5274 |
28-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 2e19c3c02957208371cdd491e6342ea7ddb440d9 |
26-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Factor out Camera2Client::Parameters
Move the parameter structure and the various utility methods using it
to its own class. Rename LockedParameters to SharedParameters to match
the Mutex naming convention.
Also move CameraMetadata to camera2 directory for organization.
No functional changes.
Bug: 6243944
Change-Id: Ie60b535936ecfda9bf23361d52604abf515c83d0
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
ervices/camera/libcameraservice/CameraMetadata.cpp
ervices/camera/libcameraservice/CameraMetadata.h
ervices/camera/libcameraservice/camera2/CameraMetadata.cpp
ervices/camera/libcameraservice/camera2/CameraMetadata.h
ervices/camera/libcameraservice/camera2/Parameters.cpp
ervices/camera/libcameraservice/camera2/Parameters.h
|
| 2352a815fe99a00702dd00c5d1c6cfdfadba10fd |
28-Aug-2012 |
Jeff Brown <jeffbrown@google.com> |
Merge "Use new surface flinger API." into jb-mr1-dev
|
| 68536901073cba8d673f410ebf79d44cd6c79e39 |
27-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Fix metering/focusing region coordinates, minor bugs" into jb-mr1-dev
|
| 33ea2dffa733b41eca4290c1eaa094058040b704 |
27-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Move frame processing to its own thread." into jb-mr1-dev
|
| 928da7e276dcfc2d2f6e68c91f33d3a6df6be033 |
27-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Use CameraMetadata wrapper class." into jb-mr1-dev
|
| db7e3856c1cb7c2a25d1b01a86339596cc2c00a0 |
27-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method" into jb-mr1-dev
|
| 1c356d38527efbbee0894188c0a8f82074b0f441 |
27-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start" into jb-mr1-dev
|
| f17b6cf6aa7548ca82e7fed96d71db7821103e57 |
26-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix metering/focusing region coordinates, minor bugs
- Use active pixel array-based coordinates instead of the normalized
camera API coordinates for ae/awb/af regions
- Fix calculation of UV stride for YV12 format
Bug: 6243944
Change-Id: I80cbd989858b0a3cb75c6f536c145e16e44fdb25
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| c8474b68e435cd840ba66791fb09e3da59f1d93c |
25-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Move frame processing to its own thread.
To avoid blocking the HAL on possibly long-running binder calls,
move frame receiption and processing to its own thread.
Bug: 6243944
Change-Id: I6385be4410b2f68e2331755027afc10c342187cf
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| cab96a4a7a2900fa991ab77ae45ba8d4be97e054 |
24-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use CameraMetadata wrapper class.
Wrap the use of the camera_metadata library inside a CameraMetadata
class to avoid memory leaks, improve code clarity, and increase type
safety.
Bug: 6243944
Change-Id: I90ca592b5875e27e4c58ea1ca680582dc3c3b56a
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
ervices/camera/libcameraservice/CameraMetadata.cpp
ervices/camera/libcameraservice/CameraMetadata.h
|
| 9c410063affbb32c3a300345c2422af1d47e82d4 |
27-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 690921927f289da73556ea71c28981194af8ffcd |
27-Aug-2012 |
Jamie Gennis <jgennis@google.com> |
Merge "SurfaceMediaSource: a few fixes / cleanups" into jb-mr1-dev
|
| a0ead0a2d2ce1d114ad3a17d755dddce831abb40 |
24-Aug-2012 |
Jamie Gennis <jgennis@google.com> |
SurfaceMediaSource: a few fixes / cleanups
- Remove the setting of mStopped to true in onBuffersReleased
- Cleaned up a few function call logs
- Removed the 'reset' method.
Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| b8a9825bf0f5c74333b0e4ff5ba7677ac6fd2a25 |
27-Aug-2012 |
James Dong <jdong@google.com> |
Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method
o The mClient could be disconnected before the notify message is sent out. Use
a local reference could help resolve this issue.
o related-to-bug: 6782035
Change-Id: Ia2047bd7f2666100fed83c6e5417a3bf2e20cd2c
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| a6195decfe4f9021bbbd7deb050495c33371366b |
25-Aug-2012 |
Jeff Brown <jeffbrown@google.com> |
Use new surface flinger API.
Change-Id: I594c6e15db5f617d2feaac1a65b5316daa3812d0
mds/stagefright/codec.cpp
mds/stagefright/sf2.cpp
mds/stagefright/stagefright.cpp
mds/stagefright/stream.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 96272d57caa39566842795ba1f0605a5a5f72272 |
25-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Fix deadlock" into jb-mr1-dev
|
| fd7ec80f3d0e30c8df61b86951d926ab9c8c6d25 |
25-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Fix deadlock
I wanted to save some space, and ended up with a deadlock.
This change basically restores setDataSource(fd, offset, size) to the
way it was before I added the new setDataSource(DataSource) method,
instead of calling through to it.
Change-Id: Iacf4627c8745369fa84b467530189a9f64f8726b
edia/libstagefright/NuMediaExtractor.cpp
|
| b0c1e303913f606dca15bfb75c029f3d4a1ab04c |
24-Aug-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Reduce THD when equalizer is ON." into jb-mr1-dev
|
| e44615ff6022239850a3ea459ad6e07b44c37544 |
24-Aug-2012 |
Eric Laurent <elaurent@google.com> |
Reduce THD when equalizer is ON.
Increase headroom in LVM bundle to reduce THD when equalizer is ON
with high band gains.
Also add a workaround for a bug in headroom parameter control.
Change-Id: I1d67c9ae475f6cf852c2e0e49bacfc82a5e484fd
edia/libeffects/lvm/lib/Bundle/src/LVM_Init.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| aa8879d381918335c9d829fc279b76d53a15a550 |
24-Aug-2012 |
James Dong <jdong@google.com> |
Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start
o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able
to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder
ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in
OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to
bring the state of the encoder component back to the expected state.
o related-to-bug: 7045494
Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| ff3f75c3e827c1c1f3e3a11b1de46b19444af197 |
24-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev
|
| dbcb4c17f16230dfc6af908f176681c49f61b13e |
24-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Allow directly setting a DataSource for NuMediaExtractor
This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source),
which some new code under frameworks/av will use to let applications
provide a custom data source for extractors.
Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
nclude/media/stagefright/NuMediaExtractor.h
edia/libstagefright/NuMediaExtractor.cpp
|
| 6de95261c619d53f3e7b431fd17995e73928571e |
24-Aug-2012 |
John Grossman <johngro@google.com> |
Merge "Add a missing NULL check." into jb-mr1-dev
|
| 960e46f97e3ca22e99548841816ab77ac3a30d86 |
24-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 07315f82: am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '07315f8262f843f3624c70974642e4fb733a661c':
Fixed redefinition of 'i' with a different type error
|
| a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7 |
24-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 78015984: am 6e55a0f7: Merge "Fixed member access into incomplete type build error"
* commit '780159840d754eae8e4e3f693ea10932634053f8':
Fixed member access into incomplete type build error
|
| cb0b755efc2cd24703f400729994900bf2117f66 |
24-Aug-2012 |
John Grossman <johngro@google.com> |
Add a missing NULL check.
Don't crash if its time to start the next media player in a media
player chain, but the current player's client has a NULL mAudioOutput,
as is the case when the low level player implements
MediaPlayerHWInterface.
Change-Id: If555da3a46960cbee91ff26e5b1fd05e52c8ef28
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| d8d4d666cc323d6a30d2030f7a41f5778b9bbbd5 |
24-Aug-2012 |
Jeffrey Tinker <jtinker@google.com> |
Merge "Send current bandwidth info event when buffering occurs" into jb-mr1-dev
|
| 07315f8262f843f3624c70974642e4fb733a661c |
23-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 4b60ac04: Merge "Fixed redefinition of \'i\' with a different type error"
* commit '4b60ac04a878eaf8344b56189509ccd6925855c2':
Fixed redefinition of 'i' with a different type error
|
| 780159840d754eae8e4e3f693ea10932634053f8 |
23-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 6e55a0f7: Merge "Fixed member access into incomplete type build error"
* commit '6e55a0f71eef07c6041077e6e9e7fad8c973a752':
Fixed member access into incomplete type build error
|
| 4b60ac04a878eaf8344b56189509ccd6925855c2 |
23-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Fixed redefinition of 'i' with a different type error"
|
| 6e55a0f71eef07c6041077e6e9e7fad8c973a752 |
23-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Fixed member access into incomplete type build error"
|
| 96f8fbb9734e9a01a604a8c1ce0096dee28983f9 |
23-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| f10f36d34812bae602ff018fb503ad07eaf550b1 |
23-Aug-2012 |
Jeffrey Tinker <jtinker@google.com> |
Send current bandwidth info event when buffering occurs
There is a dependent change in vendor/widevine repo.
Change-Id: If063f4b1c8857e5bfc7be54ab0f97a4ed169b303
related-to-bug: 5883234
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 9a150640a28d3fa5507a590125a6c004681bb221 |
22-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
|
| cba4ed0039c8b8fac01b3193d19fc2364f934506 |
26-Jul-2012 |
Tareq A. Siraj <tareq.a.siraj@intel.com> |
Fixed redefinition of 'i' with a different type error
Renamed the redefinition of 'i' to 'k'.
Change-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 3677437296fd1547d762b1b227a3de83dbc960d6 |
27-Jul-2012 |
Tareq A. Siraj <tareq.a.siraj@intel.com> |
Fixed member access into incomplete type build error
Included the ARTPAssembler.h file to fix the 'member access into
incomplete type "android::ARTPAssembler"' error reported by clang.
Change-Id: I10cb1e38bf360858bb7ebdeae82ba1e64431f87d
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
Reviewed-by: Edwin Vane<edwin.vane@intel.com>
edia/libstagefright/rtsp/ARTPConnection.cpp
|
| 0c676cd04ff15cc7eacf6144b4aead6deaccf60c |
22-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Make tee sink compile OK again
Change-Id: Ie865ceeabaeb698a62c11eac9f96e303c44c28ae
ervices/audioflinger/PipeReader.cpp
ervices/audioflinger/PipeReader.h
|
| 2c26022a734ebc3eeed1a6380083e48a8b0b4361 |
22-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 30e65e7e2ec01e13e45b5e38552a34d2fbb3f866 |
21-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Replace MediaConsumer with BufferItemConsumer.
Get rid of MediaConsumer, which was largely duplicated code, and
replace it with the simpler BufferItemConsumer.
Bug: 6243944
Change-Id: I242d80c5fe39f2ee581ec8bb46f362997d994b0a
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/MediaConsumer.cpp
ervices/camera/libcameraservice/MediaConsumer.h
|
| 76dc8dacbb3e2a8c91cb526293270f9093cf8f8b |
22-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Ignore NOT_FOUND errors for face detect mode on frame receipt.
Reduce log spamming due to incomplete implementations.
Change-Id: I6eb9d657591bd5f1476dd8c96e4a00b8a03e2a5e
ervices/camera/libcameraservice/Camera2Client.cpp
|
| cd3ed11664d16939f1f5763a896d7fc75dd3642e |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"
* commit '8d4d590dcbbd2b178976d0bd024625e9d6216365':
avcenc: Update a comment about the inline assembly
|
| 562d654876c6134b1e879f56f72635dabc5535f2 |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 8a825ec0: am aa411adf: Merge "h264 streaming: make profile-level-id optional"
* commit '8a825ec079da6f2b89149c53568cb9721c10d923':
h264 streaming: make profile-level-id optional
|
| 8d4d590dcbbd2b178976d0bd024625e9d6216365 |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"
* commit '1e75e9721254ae5df05c3d88b30ed7f778406261':
avcenc: Update a comment about the inline assembly
|
| 8a825ec079da6f2b89149c53568cb9721c10d923 |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am aa411adf: Merge "h264 streaming: make profile-level-id optional"
* commit 'aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3':
h264 streaming: make profile-level-id optional
|
| 1e75e9721254ae5df05c3d88b30ed7f778406261 |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Update a comment about the inline assembly"
|
| aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3 |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "h264 streaming: make profile-level-id optional"
|
| 391348890849f99663dd46c475a1fc0737d6908d |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"
* commit '41ee747fc019eb5856454c698adf23f55073c69e':
avcenc: Fix the gcc inline assembly constraints
|
| 136e83a2987acdb7a6956934098bfc0d347c4e7d |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks"
* commit '894a7e450704b0c7858a2187a5432b479ac69c1d':
avcenc: Properly indent assembly blocks
|
| 41ee747fc019eb5856454c698adf23f55073c69e |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly constraints"
* commit '5ebce52c46360b349daa8c944ca81e3c74accec0':
avcenc: Fix the gcc inline assembly constraints
|
| 894a7e450704b0c7858a2187a5432b479ac69c1d |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 9e13e927: Merge "avcenc: Properly indent assembly blocks"
* commit '9e13e927206b7c7c15359af2b0ccc8f525e78a7d':
avcenc: Properly indent assembly blocks
|
| 5ebce52c46360b349daa8c944ca81e3c74accec0 |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Fix the gcc inline assembly constraints"
|
| 9e13e927206b7c7c15359af2b0ccc8f525e78a7d |
21-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Properly indent assembly blocks"
|
| ddc9df02da1bf33d27b4d4f2ddf606b9c42ffaba |
21-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 42d515121f11389df082dd02319904c99dd50cd6 |
21-Aug-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Update a comment about the inline assembly
Since the inline assembly was fixed in commit 3fdb405597f the
comment was no longer accurate.
Change-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519
edia/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
|
| 164c75d47081e714b1a0b537b2b509d5ba9a4dd2 |
21-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Add support for preview callbacks" into jb-mr1-dev
|
| 228a53805808a24cb19fcf13b1f0bdc2ed89bbe1 |
13-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add support for preview callbacks
- Move camera overall state enum to be part of parameters
- No longer use ICameraLock to guard access to overall state enum
- Add callback flag management
- Add callback stream and management
Bug: 6243944
Change-Id: Ideb3dc523a23c05e440e429ebf838b1900a96573
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/MediaConsumer.cpp
|
| 3fdb405597f0e062a9bb8af20199c5e67f0f764c |
13-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Fix the gcc inline assembly constraints
Use +r for registers whose value is used as input to the block.
Also switch input registers to output registers with +r, for
registers that are modified by the assembly block (SUB_SAD in
sad_inline.h).
Without this, the inline assembly fails on modern gcc versions
(tested on gcc 4.6), where the intended input value never is
loaded into the registers, causing segfaults at runtime.
Currently this assembly isn't used, but this change makes it
work properly if enabled.
Change-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05
edia/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
|
| ccde1257952d2c073e51ecba6180060570ffa41f |
13-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Properly indent assembly blocks
Also line break multiline assembly blocks - previously they were
virtually unreadable.
Change-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c
edia/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
|
| 6a8ea471a9f3b001bd0ffa3381eba12975dfc59f |
21-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Revert "Swap the order of creating IAudioTrack and thread"" into jb-mr1-dev
|
| 3411fc2f3a44b22d69a359a3eb26f756d6116e4f |
20-Aug-2012 |
Nick Kralevich <nnk@google.com> |
am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from h264"
* commit 'add7c4d329586119fb8b5501b049905004400233':
hardening: eliminate text relocations from h264
|
| add7c4d329586119fb8b5501b049905004400233 |
20-Aug-2012 |
Nick Kralevich <nnk@google.com> |
am 46b7eeb8: Merge "hardening: eliminate text relocations from h264"
* commit '46b7eeb8be7449515082ecb1a61700affb44115f':
hardening: eliminate text relocations from h264
|
| 46b7eeb8be7449515082ecb1a61700affb44115f |
20-Aug-2012 |
Nick Kralevich <nnk@google.com> |
Merge "hardening: eliminate text relocations from h264"
|
| 11623fa3eb2c25ace502fdbdf290e154ac66960e |
20-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am af5f9f05: am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit 'af5f9f05937521acb4855848d77bed1d4ed7db0a':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
|
| 07c6ddb431c784a24a70a5a91d8a454e9c1dde5d |
20-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a':
avcenc: Remove a leftover define
|
| af5f9f05937521acb4855848d77bed1d4ed7db0a |
20-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am cd622346: Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
* commit 'cd622346235829f60246a061560adf5921ba129c':
MPEG2TSWriter: Fix an off-by-one in the condition for padding
|
| 3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a |
20-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 02a4ec21: Merge "avcenc: Remove a leftover define"
* commit '02a4ec216cf5ca903e1765ca3e7ff2985436b236':
avcenc: Remove a leftover define
|
| cd622346235829f60246a061560adf5921ba129c |
20-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"
|
| 02a4ec216cf5ca903e1765ca3e7ff2985436b236 |
20-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Remove a leftover define"
|
| 9b4e856a79e2cb53d5d0b5ab31dca0682c94ea14 |
20-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| c867a50ec5317e74602798e2e8435cde313b91e9 |
20-Aug-2012 |
Martin Storsjo <martin@martin.st> |
MPEG2TSWriter: Fix an off-by-one in the condition for padding
This makes a remuxed file play without any decoding warnings,
while there still were some occasional warnings with the previous
version.
Change-Id: I31d73446ded1eeb3da10783c5ef841270563ca12
edia/libstagefright/MPEG2TSWriter.cpp
|
| 8033393a74a6872ad8d702b10da34d98dde0bf41 |
20-Aug-2012 |
Patrik2 Carlsson <patrik2.carlsson@sonymobile.com> |
h264 streaming: make profile-level-id optional
profile-level-id is made optional according to rfc3984:
"If no profile-level-id is present, the Baseline Profile without
additional constraints at Level 1 MUST be implied."
Change-Id: If868468a48917ceccb963b8ac15767583da29723
edia/libstagefright/rtsp/APacketSource.cpp
|
| 53ae1640ffbfc690962f7f94694b02680c6f66cb |
17-Aug-2012 |
James Dong <jdong@google.com> |
Don't log streaming url.
o related-to-bug: 6994761
Change-Id: I79d5549a70b3bde67ddf496cfc6283ac92b1f569
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
|
| 0a1b2aecb75b949df6b465a4e4ccc739af034443 |
17-Aug-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Remove a leftover define
This should have been removed as part of f5af6314db, but
the second __arm__ define was introduced after the original commit
was written, and not removing the second one was an oversight in
rebasing the patch on top of the new code.
Change-Id: Iccf08ffdef130446dd6e97dc1e15e6a1d4f9386f
edia/libstagefright/codecs/avc/enc/Android.mk
|
| 02d3c328d2c127c26ab787aa95e5240e6b7ff223 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"
* commit '523c09d56c78933eea7fb4f028e0bfa595ca82b1':
stagefright amrnb: Remove unused leftover source files
|
| f81ed0032f86ab0943baa1ad8a25de8e06498409 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
* commit 'f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
|
| 523c09d56c78933eea7fb4f028e0bfa595ca82b1 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"
* commit '64b3fe55f7edd16be32e07c28c2c90f84f3b9b80':
stagefright amrnb: Remove unused leftover source files
|
| f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am c1d2777c: Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
* commit 'c1d2777c8004a9491e1381cca33a6768faed50c3':
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
|
| 08ebb6b114c9a2700e88e669a6064c7c91cfea2e |
17-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Fix SCENE_MODE" into jb-mr1-dev
|
| 3cc89794d92b833feff15ca76dfa196cc886e43f |
17-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix SCENE_MODE
Now can set scene mode back to auto.
Bug: 7001465
Change-Id: Ia25ba54d13de662bef5bf79957987513a7313c18
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 64b3fe55f7edd16be32e07c28c2c90f84f3b9b80 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrnb: Remove unused leftover source files"
|
| c1d2777c8004a9491e1381cca33a6768faed50c3 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"
|
| 7df98f17a42e47d8bc49891c370786ee3d3a1379 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit '0df213babc4fb41b7daa05cb3c08071f2b60f6a5':
hardening: eliminate text relocations from mp3
|
| 1a42aee5e1e975158da4754f9bae46c945e27281 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit 'a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99':
avcenc: Clarify the ifdefs surrounding inline assembly
|
| 9bd763d1d3b7dcb30320aa70597680a53ffb5bbf |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit 'fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe':
hardening: eliminate text relocations from amrwb
|
| f365fecf8519a0a1c7e511657f79638844be02e3 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit '1191287bc438c164a89cf86704936aeddbefb136':
aacenc/amrwbenc: Remove the now unused LINUX define
|
| fa172b0d2dcd761622b61701b7c7dd4d0f19610b |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit 'eeb9fde0cb8e0ace44eb720bcac272ee70282d4d':
aacenc/amrwbenc: Remove unused and dubious typedefs
|
| 0df213babc4fb41b7daa05cb3c08071f2b60f6a5 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am dde79acf: Merge "hardening: eliminate text relocations from mp3"
* commit 'dde79acfb97083d690e3cceabff78931b10d1539':
hardening: eliminate text relocations from mp3
|
| a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
* commit 'b7ca7dc9652456181080bf28ec376bc5a36cf6a2':
avcenc: Clarify the ifdefs surrounding inline assembly
|
| fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 4f981882: Merge "hardening: eliminate text relocations from amrwb"
* commit '4f981882da8080e1d41d000bfbad92df61adcfba':
hardening: eliminate text relocations from amrwb
|
| 1191287bc438c164a89cf86704936aeddbefb136 |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
* commit 'c3bfa0260a530af3e9c091c1c9d90d1283021dd6':
aacenc/amrwbenc: Remove the now unused LINUX define
|
| eeb9fde0cb8e0ace44eb720bcac272ee70282d4d |
17-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
* commit '3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49':
aacenc/amrwbenc: Remove unused and dubious typedefs
|
| dde79acfb97083d690e3cceabff78931b10d1539 |
16-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "hardening: eliminate text relocations from mp3"
|
| b7ca7dc9652456181080bf28ec376bc5a36cf6a2 |
16-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Clarify the ifdefs surrounding inline assembly"
|
| 4f981882da8080e1d41d000bfbad92df61adcfba |
16-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "hardening: eliminate text relocations from amrwb"
|
| c3bfa0260a530af3e9c091c1c9d90d1283021dd6 |
16-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "aacenc/amrwbenc: Remove the now unused LINUX define"
|
| 3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49 |
16-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "aacenc/amrwbenc: Remove unused and dubious typedefs"
|
| 2ce25523c47a5f6cc81e67906924bfbbb3ef0f02 |
16-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| fef71ef418d8ecff6d20fbd50b7fbabf6ad58f74 |
07-Mar-2012 |
Martin Storsjo <martin@martin.st> |
aacenc/amrwbenc: Remove the now unused LINUX define
This is no longer used by the codec code (except for the
amrwbenc sample).
Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/aacenc/SampleCode/Android.mk
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/amrwbenc/SampleCode/Android.mk
edia/libstagefright/codecs/common/Android.mk
edia/libstagefright/codecs/common/Config.mk
|
| adee070820d9b038ac811b3785de618349f35293 |
23-Jun-2011 |
Martin Storsjo <martin@martin.st> |
aacenc/amrwbenc: Remove unused and dubious typedefs
These typedefs aren't used anywhere, and their description
doesn't really match their actual definition. The VO_TCHAR
type is even defined as pointer for one configuration and
as non-pointer for another configuration.
This gets rid of the last use of the LINUX define in the
VO codecs (except for the amrwbenc sample application).
Within the codecs, the use of this define is unclear - does it
indicate code specific to android but not normal linux, linux
but not other unixes, unix but not windows, or gcc but not
other compilers, etc.
Originally, prior to cleanup, the define has meant many
different of these - these uses has now been cleaned up to
use the proper feature detection macros (e.g. looking for
defines automatically set by the compiler, instead of
relying on manually setting this define).
Change-Id: I1a675d653d6d305f558aa7f74c7255858dc62758
edia/libstagefright/codecs/common/include/voType.h
|
| ce088d274b4530fb813a030216d675b0e7262711 |
15-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
* commit 'add9f820eaeb180b5e72a4420995a54062cfabd7':
MPEG2TSWriter: Correctly add padding using the adaptation field
|
| add9f820eaeb180b5e72a4420995a54062cfabd7 |
15-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
* commit '2c3d9b7b9e34c9122c0a568d6b1fb24404021f55':
MPEG2TSWriter: Correctly add padding using the adaptation field
|
| 2c3d9b7b9e34c9122c0a568d6b1fb24404021f55 |
15-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
|
| 99b99df476b1bfb49da74fda9d6960d82b5ffd10 |
23-Jan-2012 |
Paul Fariello <fariello@archos.com> |
MPEG2TSWriter: Correctly add padding using the adaptation field
Change-Id: I268cce36ada910ba168c4c9dcedab0b20f6e6ebb
edia/libstagefright/MPEG2TSWriter.cpp
|
| 5dea1cecbe6e454e22571cdd31b9db3ffc0f3261 |
15-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| f363ec5564abf4788d07e00d89c93a66a0c91b88 |
14-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Skeleton for output frame processing, plus face detect" into jb-mr1-dev
|
| 8ce89d9e2b132bf58a030acec88acf0a998926a1 |
10-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Skeleton for output frame processing, plus face detect
- Plumbing for processing output metadata frames from the HAL
- Support for passing face detection metadata from said frames
to the application.
- Switch calls on ICameraClient interface to use separate mutex to
avoid deadlock scenarios with messages being communicated from the
HAL to the camera user while calls from the user to the service are
active.
Bug: 6243944
Change-Id: Id4cf821d9c5c3c0069be4c0f669874b6ff0d1ecd
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| 1d5c225d32524a54494b65c6b619b4e4d3eed3cc |
14-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 0088e930b17228f23ddfff4840ed6172da354730 |
14-Aug-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Fix AAC DRC metadata being ignored" into jb-mr1-dev
|
| 5696a4efef79ee474ac6bcf2639c741e159bed1b |
10-Aug-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix AAC DRC metadata being ignored
The decoder will bypass all DRC processing during decode unless
any of the DRC parameters is set.
The fix consists in setting the DRC reference level to its
default value when after the decoder is initialized.
Change-Id: Ibb8355ab8c3c65020c5eef0752957040f7316c2a
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 93b68548124ec9b01b9bf4ddf010afa06a503547 |
14-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
* commit '979df012eb0588ac7f87d5f6e8bff77e2049ee46':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
|
| 979df012eb0588ac7f87d5f6e8bff77e2049ee46 |
14-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
* commit '98159acd68307bf0fcec40ae0fffc1a715517d1d':
amrnb: Restart the p_xn pointer when retraversing the array on overflow
|
| 98159acd68307bf0fcec40ae0fffc1a715517d1d |
13-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"
|
| 22e06318d04074d1a7c90caa173857abdcfd153e |
13-Aug-2012 |
Ard Biesheuvel <ard.biesheuvel@gmail.com> |
hardening: eliminate text relocations from h264
Change-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
|
| 9a2c14b2c96625d5be73e1a7627f5d2a3091c4a2 |
13-Aug-2012 |
Ard Biesheuvel <ard.biesheuvel@gmail.com> |
hardening: eliminate text relocations from mp3
Change-Id: I671ed4c8c7bb15172a8b64d513e2844319495102
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
|
| 74bc3e133bd59a65dbed70b5fc89549f04a545e2 |
13-Aug-2012 |
Ard Biesheuvel <ard.biesheuvel@gmail.com> |
hardening: eliminate text relocations from amrwb
Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
|
| 106e8a42038f9e90d5ff97f8ab6f1a42258bde9e |
02-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
const methods
Change-Id: I92e32ee16274c032c9d0ce910676be2a7fa52471
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 0dbb356050d0db9e0043dd43045c1864a933332b |
03-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Simplify AudioFlinger::PlaybackThread::isValidSyncEvent()
Change-Id: I3e4af69b929d4ca04afaac26c7e41c89fce25b9c
ervices/audioflinger/AudioFlinger.cpp
|
| d23eedca9b5a1812891c05d89850ab7ee707040d |
02-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Discard setSyncEvent() return value
setSyncEvent() returns a status_t which is sometimes ignored.
Emphasize this is intentional by casting to void.
Change-Id: Ic614988347cba36bd2504d7ad321594a355b0d9d
ervices/audioflinger/AudioFlinger.cpp
|
| a959904968f1d300fe86334bf5099ae2dc39ee28 |
13-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Replace hard-coded "2" by a constant and comment" into jb-mr1-dev
|
| bd828233d3eda966bf7145108dde74616abd97fb |
13-Aug-2012 |
Andreas Huber <andih@google.com> |
Use the correct data offset by remembering the offset of the enclosing 'moof'
container.
Change-Id: I2f0f92dabe31341a6a91d435943e4a65e34884ba
edia/libmediaplayerservice/nuplayer/mp4/Parser.cpp
edia/libmediaplayerservice/nuplayer/mp4/Parser.h
|
| 8cf9c1a8640553a146f3a7aad01b393c664a46af |
13-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '10004fe612bc38bedc258fd1c380ebccacfa0c1e':
amrnb: Fix audio distortion in an AMR-NB clip
|
| 10004fe612bc38bedc258fd1c380ebccacfa0c1e |
13-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"
* commit '5efa7bf945f53c419501b0a4f9718962f24f0df5':
amrnb: Fix audio distortion in an AMR-NB clip
|
| 5efa7bf945f53c419501b0a4f9718962f24f0df5 |
13-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "amrnb: Fix audio distortion in an AMR-NB clip"
|
| d58a68a4d6915d43d8b9d02ebfe04be62efe2eb1 |
13-Aug-2012 |
John Grossman <johngro@google.com> |
Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev
* changes:
Move the AAH RTP code out of framework and into vendor.
Add the ability to dynamicaly register MediaPlayer types.
|
| 75767ab7cc1aee315d655538322a8349faa61a64 |
13-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Signal end of stream if no more fragments are going to be available." into jb-mr1-dev
|
| 8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b |
06-Aug-2012 |
John Grossman <johngro@google.com> |
Move the AAH RTP code out of framework and into vendor.
Relocate the AAH RTP code from framework/av into
vendor/google_devices/phantasm. This change is the deletion, there
will be a separate CL which re-introduces on the vendor side of
things.
Change-Id: Ibe7e6d4b633a3886b87a615691a2692f2382af6c
Signed-off-by: John Grossman <johngro@google.com>
nclude/media/MediaPlayerInterface.h
edia/libaah_rtp/Android.mk
edia/libaah_rtp/MODULE_LICENSE_APACHE2
edia/libaah_rtp/NOTICE
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
edia/libaah_rtp/pipe_event.cpp
edia/libaah_rtp/pipe_event.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerFactory.cpp
|
| 44a7e42f0310831e6a846d1b6bb40bf3a399bf6d |
22-Jun-2012 |
John Grossman <johngro@google.com> |
Add the ability to dynamicaly register MediaPlayer types.
Add the ability to dynamically register low level MediaPlayer
factories which will be probed at setDataSource time to determine the
proper MediaPlayerBase to instantiate.
This change is in preparation for moving libaah_rtp out of
frameworks/base and into phantasm platform directory.
Change-Id: Icf8904db3ab9e3c85df6e780d5546d9988cb9076
Signed-off-by: John Grossman <johngro@google.com>
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
edia/libmedia/IMediaPlayer.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerFactory.cpp
edia/libmediaplayerservice/MediaPlayerFactory.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
|
| dce5500f2978ab705911eaecba6b3981b60acefa |
13-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| bf5b3b29e31b293313788d7464cfb258ac0da803 |
31-Jul-2012 |
James Dong <jdong@google.com> |
Let getOriginalMimeType() take a fd passed from drm java applications
This patch enables the drm framework to avoid opening files directly.
As a result, the drm framework no longer needs the sdcard read permision.
o related-to-bug: 6426185
Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
rm/common/DrmEngineBase.cpp
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.h
rm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
nclude/drm/DrmManagerClient.h
|
| b3e12a4d15a329821979bf287c49a9630486e23f |
11-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
* commit '3ca352c4cd01f6df3b691f835efc68a5771e724e':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
|
| 3ca352c4cd01f6df3b691f835efc68a5771e724e |
11-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
* commit '24893fef8e0f816a8a21749fa3eb9eed9173a0fd':
MPEG2TSWriter: Write a proper CRC in PAT and PMT
|
| 24893fef8e0f816a8a21749fa3eb9eed9173a0fd |
11-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"
|
| 751fa786aa9599c694219085601f9f5ebe96a516 |
10-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
* commit '31a593b901eeb924ae5214962c628397dd0197f2':
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
|
| fcfc61da927e98d18cdcb53da8fa0a8a32ee1422 |
10-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am ff4c64d6: am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."
* commit 'ff4c64d6b1b58494a1b15f1a664e5c421d095d15':
Fix initialization of audio mixer track resources for MIPS.
|
| 7edbacf24e60c01e2d3b10715ec8f9cc2f55c11a |
10-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Handle malformed raw AAC/AMR writer better" into jb-mr1-dev
|
| 31a593b901eeb924ae5214962c628397dd0197f2 |
10-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
* commit '2001d2ac01e36c13c1abda5f73b6404cba2648e1':
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
|
| ff4c64d6b1b58494a1b15f1a664e5c421d095d15 |
10-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."
* commit 'c64a178711bf7bb9b71d65a47156b34083311392':
Fix initialization of audio mixer track resources for MIPS.
|
| 603b12efa16e7afb4e6c75f6b353216c83e8e135 |
08-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Swap AF notification order, minor bug fix.
In continuous AF modes, when an AF trigger/cancel is received in the
middle of a passive AF scan, we want to send both an AF move stop
callback and an AF done callback. Swap the order of sending to
simplify life when the app just wants to pay attention to the AF done
callback during an active AF trigger.
Bug: 6243944
Change-Id: I127d1675bc37ef828ef89c70b8cfab75f9428a2f
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Device.cpp
|
| 174181eec57c963a2a17bd156d81c3f18b3ba75c |
03-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add trigger support, and implement autofocus
- Add skeletons for all triggering actions into Camera2Device
- Add support for AF triggers to HAL
- Add support for AF notifications from HAL
Bug: 6243944
Change-Id: I21025440849ae41f7083e1dcb72c99f8e5b2d5f7
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| a59bf2c58311dfc28f46220383d66869e8f3f57f |
10-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Update state only if calls to native window are successful" into jb-mr1-dev
|
| 2001d2ac01e36c13c1abda5f73b6404cba2648e1 |
10-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"
|
| c64a178711bf7bb9b71d65a47156b34083311392 |
10-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Fix initialization of audio mixer track resources for MIPS."
|
| fa514f007bd144eb99cdd68f2fe5302a4508db28 |
10-Aug-2012 |
James Dong <jdong@google.com> |
Handle malformed raw AAC/AMR writer better
Change-Id: I196fe196c26b83be09fcd54174ceb4e135073c2b
edia/libstagefright/AACWriter.cpp
edia/libstagefright/AMRWriter.cpp
|
| 31d377b7622279034326fbd8b9803a738a39fb30 |
10-Aug-2012 |
James Dong <jdong@google.com> |
Update state only if calls to native window are successful
Change-Id: I7a20f3ca787e11ca9c8c904b257e3c8a4e529136
ervices/camera/libcameraservice/Camera2Device.cpp
|
| c7708555ea7511aea684e00a55fb5309281540ce |
10-Aug-2012 |
Andreas Huber <andih@google.com> |
Signal end of stream if no more fragments are going to be available.
Change-Id: I16696740d3551aa8a5ba904ec757c64b0ecd1307
edia/libmediaplayerservice/nuplayer/mp4/Parser.cpp
edia/libmediaplayerservice/nuplayer/mp4/Parser.h
|
| 3ed292031dc50c56110cdadb1e3778117e3be76a |
08-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Replace hard-coded "2" by a constant and comment
Bug: 6679403
Change-Id: I6c2701f9afedc26540dfad0b4e23348bbc4cb01a
ervices/audioflinger/AudioFlinger.cpp
|
| faa88edb9df91b0e7725b0ee4c4fb5e92262b3d5 |
09-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix static sample table processing, add support for h.263 video." into jb-mr1-dev
|
| b9787142c5f5f8f47e7e35409f4f2ef7112ab72e |
09-Aug-2012 |
Andreas Huber <andih@google.com> |
Fix static sample table processing, add support for h.263 video.
Change-Id: I5628d3437b5e6f8836d78557fd07ab87e5a914e3
mds/stagefright/stream.cpp
edia/libmediaplayerservice/nuplayer/mp4/Parser.cpp
edia/libmediaplayerservice/nuplayer/mp4/TrackFragment.cpp
edia/libmediaplayerservice/nuplayer/mp4/TrackFragment.h
|
| a0f3d222a6dafd9a7011717d385291285614667e |
09-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 9352d1168c09903d4ea27b695ef683316c544ae5 |
09-Aug-2012 |
James Dong <jdong@google.com> |
Remove some unused forward lock code
Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
rm/libdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c
rm/libdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.h
|
| 0d27c65ddb5c968baa6db0c26e80f5c451bc52bc |
07-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Tune the overrun correction
The new overrun correction is: if the previous write() cycle time is <
50% of expected, then sleep enough extra to make the total cycle time =
95% of expected. This should help compensate for HAL implementations
that have uneven cycle times due to sample rate conversion.
Bug: 6881638
Change-Id: I5ab58afdfceee7ac523177f021fbf62d743d571a
ervices/audioflinger/FastMixer.cpp
|
| e983aa4ff4d80af7702888e230b9aaa93a7b7e57 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"
* commit '51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4':
Store correct time stamps in recorded mp4 files
|
| 51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"
* commit 'e28df5b996af3480b457c7a9908dbb9d52ad8d7c':
Store correct time stamps in recorded mp4 files
|
| e28df5b996af3480b457c7a9908dbb9d52ad8d7c |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Store correct time stamps in recorded mp4 files"
|
| f6a3576006f3fbe7d87ab49c1ebf292be5ddaa24 |
08-Aug-2012 |
John Grossman <johngro@google.com> |
Merge "AudioFlinger: fix timed audio" into jb-mr1-dev
|
| 6febe17ce31636d07ef6305cf1045a0b942b4f11 |
08-Aug-2012 |
John Grossman <johngro@google.com> |
Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-dev
|
| 3f0b1eaa411c15f05cc591e9de617bd41c9daad1 |
08-Aug-2012 |
John Grossman <johngro@google.com> |
Merge "Change audio flinger to user HAL master mute if available" into jb-mr1-dev
|
| 1e357f4610e788c3e5dea5dd2f01b26bb75c5e36 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."
* commit 'ef62009372d050b431939835d4e2c5ee77da8831':
Correct ID3::StringSize calculation for UCS-2 data.
|
| 4bb0e2aa1410191a8cff1f921d1b246232ed42e9 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"
* commit '662b15c377e1ebe6aed8ff5cf82c684f0c8894dc':
avcenc: Remove redundant zero-initialization of allocated memory
|
| 49e74946370e7af2378e28733ba6d8df8951b068 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
* commit '44237a8d58dc218257687f2cbe8fd33d73a713e8':
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
|
| f5a66877655695af619909db6c831f78373d733e |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"
* commit '68d44b061e92fb6832240457d4f683635bf5328f':
avcenc: Remove useless casts
|
| 76d46c5a3637d6ac9e664c449839befbbd09c0a0 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 4348cbce: am 67f694d6: Merge "Initialize pool\'s buffer pointers to null."
* commit '4348cbcec6c3aec02af722d633ebda24f94dfcc8':
Initialize pool's buffer pointers to null.
|
| 93f902d58cd287e8dd046621824b7de7aa985d36 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation"
* commit '96d18cca4546045df118660017e74ddd751dfbb4':
avcenc: Fix indentation
|
| 3269b5314f02eb3724be8d45880f15762fac09c0 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
* commit '80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4':
avcenc: Switch malloc/free callbacks to use pointers instead of ints
|
| c107387cef844aabad80ea1430bb768c2605e89f |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 17fa4ab4: am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
* commit '17fa4ab45a87e042a0503356e641fa6ff72ef572':
mediacodec: Return an error on getOutputFormat if there is no output format yet
|
| ef62009372d050b431939835d4e2c5ee77da8831 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."
* commit 'efee009528f446542d51f1ce50e2189e8a2f71dd':
Correct ID3::StringSize calculation for UCS-2 data.
|
| 662b15c377e1ebe6aed8ff5cf82c684f0c8894dc |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"
* commit 'a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f':
avcenc: Remove redundant zero-initialization of allocated memory
|
| 44237a8d58dc218257687f2cbe8fd33d73a713e8 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
* commit 'b71298eeeb16d942dd5144e550731e6e29b6436e':
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
|
| 68d44b061e92fb6832240457d4f683635bf5328f |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 0ab18f85: Merge "avcenc: Remove useless casts"
* commit '0ab18f853571149de700930fbb783ecd6b2c5582':
avcenc: Remove useless casts
|
| 4348cbcec6c3aec02af722d633ebda24f94dfcc8 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 67f694d6: Merge "Initialize pool\'s buffer pointers to null."
* commit '67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9':
Initialize pool's buffer pointers to null.
|
| 96d18cca4546045df118660017e74ddd751dfbb4 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 0822156c: Merge "avcenc: Fix indentation"
* commit '0822156cfd25c111cd33932ee9a89b3100d0350c':
avcenc: Fix indentation
|
| 80c46255bcf3d4d5a3ffe9a1ef3aefd9310c6ed4 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
* commit '874a074ad88117d9fabf178b5b4a1c885dc512f5':
avcenc: Switch malloc/free callbacks to use pointers instead of ints
|
| 17fa4ab45a87e042a0503356e641fa6ff72ef572 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
* commit 'b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92':
mediacodec: Return an error on getOutputFormat if there is no output format yet
|
| efee009528f446542d51f1ce50e2189e8a2f71dd |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Correct ID3::StringSize calculation for UCS-2 data."
|
| a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Remove redundant zero-initialization of allocated memory"
|
| b71298eeeb16d942dd5144e550731e6e29b6436e |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"
|
| 0ab18f853571149de700930fbb783ecd6b2c5582 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Remove useless casts"
|
| 67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Initialize pool's buffer pointers to null."
|
| 0822156cfd25c111cd33932ee9a89b3100d0350c |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Fix indentation"
|
| 874a074ad88117d9fabf178b5b4a1c885dc512f5 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"
|
| b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92 |
08-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"
|
| 2c3b2da3049627264b7c6b449a1622f002210f03 |
03-Aug-2012 |
John Grossman <johngro@google.com> |
AudioFlinger: fix timed audio
(cherry picked from commit e20ac92c564a2f4e8123885807abdf0a78de0dd7)
> AudioFlinger: fix timed audio
>
> Addresses Bug 6900517.
>
> Finish up support for timed audio in the new FastMixer world. Pay special
> attention to remaining lock-less and voluntary yield free on the FastMixer
> thread. This fixes audio playback for Q on JB.
>
> Change-Id: Iaf815e58a1b1d0a0190051794bec8dc5c9231785
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I9bd687acc345a05867af48e71116690fdb0ce1b5
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioBufferProviderSource.cpp
ervices/audioflinger/AudioBufferProviderSource.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioStreamOutSink.cpp
ervices/audioflinger/AudioStreamOutSink.h
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/MonoPipe.cpp
ervices/audioflinger/MonoPipe.h
ervices/audioflinger/MonoPipeReader.cpp
ervices/audioflinger/MonoPipeReader.h
ervices/audioflinger/NBAIO.cpp
ervices/audioflinger/NBAIO.h
ervices/audioflinger/SourceAudioBufferProvider.cpp
|
| ee578c0330319f04a48bccbdb26b53fea0388d04 |
24-Jul-2012 |
John Grossman <johngro@google.com> |
AudioFlinger: Better handling for master volume/mute
(cherry picked from commit 93d906837e0e89aa1d9c913ab2b531b809f9bb9e)
> AudioFlinger: Better handling for master volume/mute
>
> Changes to address bug 6842827.
>
> When a HAL is loaded, cache whether or not the HAL supports
> set_master_volume/mute in the AudioHwDevice structure. Store an
> AudioHwDevice in AudioStream(In|Out) structures instead of just an
> audio_he_device_t. This give threads (PlaybackThreads in
> particular) access to the cached capabilities.
>
> When setting master volume/mute, change the system to always set the
> setting on all HAL which support it and also to set the setting on all
> PlaybackThreads. Change PlaybackThreads to apply the setting at the
> in SW mix stage of the pipeline if its assigned HAL does not support
> the setting, or to ignore the setting of the assigned HAL does support
> it.
>
> Change-Id: Ia14137a30b4c3ee6f2d7ddcc8cba87bf5eec87f4
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: Icb6bc13764e100a2003eb1dee2231132ab287d98
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| d8f178d613821c3f61a5c5e391eb275339e526a9 |
20-Jul-2012 |
John Grossman <johngro@google.com> |
Change audio flinger to user HAL master mute if available
(cherry picked from commit 91de9b56282d126ffb36344266af5fee3cefcfdd)
> Change audio flinger to user HAL master mute if available
>
> Hand merge from ics-aah
>
> > Change audio flinger to user HAL master mute if available: DO NOT MERGE
> >
> > Replicate the pattern used for HAL master volume support to make use
> > of master mute support if the HAL supports it. This is part of the
> > change needed to address bug 6828363. Because of the divergences
> > between ICS and master, this change will need to be merged by hand.
> >
> > Signed-off-by: John Grossman <johngro@google.com>
> > Change-Id: I6d83be524021d273d093bcb117b8f2fe57c23685
>
> Change-Id: I32280582905c969aaec2bb166ec5c61df82d737a
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I5cd709187221d307fe25c5117ccaadca5f6b197b
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 3478eaa23c19dbbe473be70e8f3cc0c904d2465c |
08-Aug-2012 |
John Grossman <johngro@google.com> |
Fix a small build warning.
Change-Id: I2b228db8f11a829399cdc6efe67d7b6e0a1917ba
edia/libstagefright/timedtext/TimedTextPlayer.cpp
|
| 6fb082ae298a0c6028d540c099ae5a1838701bdd |
08-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Make sure that the trackId starts from 1" into jb-mr1-dev
|
| e2229fba1c7e98c243ea777f567fd72579d91e41 |
08-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Handle empty stsc box" into jb-mr1-dev
|
| b7e75cfd64893dde230dfc1c3b281a00ca1b4470 |
08-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Handle empty stsc box
Change-Id: I867e2499fac3045075654aaaecf44327753327fd
edia/libmediaplayerservice/nuplayer/mp4/TrackFragment.cpp
|
| ba668e07d2ab01a95a9ef941e17483199d53ffe8 |
08-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 219f195159f93d627af2b243732e3f9020511a46 |
08-Aug-2012 |
James Dong <jdong@google.com> |
Make sure that the trackId starts from 1
o this patch avoids sending incorrect track events to applications because
track events contain the trackId
Change-Id: I1cf054da8ab413d31a5b7fe8ed729486d1475c46
edia/libstagefright/MPEG4Writer.cpp
|
| a9e0ea58738a50de84a80d3b4db1936e7433dce4 |
08-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "Remove the no longer used PV software aac decoder." into jb-mr1-dev
|
| a997e7a7c5aa2fc7e95316218316f8b7b98786ba |
07-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Revert "Swap the order of creating IAudioTrack and thread"
This reverts commit 5d464eb0b8cffb994a754ff108795e858a882414.
It caused the wrong thread ID -1 to be passed to IAudioFlinger::createTrack().
Change-Id: Ic221d2bb4af572d3d2d752af19238c52f6728e3a
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| 1f8834711f23f66d528aca98cca9602fb18cab66 |
07-Aug-2012 |
Andreas Huber <andih@google.com> |
Remove the no longer used PV software aac decoder.
Change-Id: Ia260f706780b66dc16a108aaa8780f68970380bd
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.h
edia/libstagefright/codecs/aacdec/aac_mem_funcs.h
edia/libstagefright/codecs/aacdec/analysis_sub_band.cpp
edia/libstagefright/codecs/aacdec/analysis_sub_band.h
edia/libstagefright/codecs/aacdec/apply_ms_synt.cpp
edia/libstagefright/codecs/aacdec/apply_ms_synt.h
edia/libstagefright/codecs/aacdec/apply_tns.cpp
edia/libstagefright/codecs/aacdec/apply_tns.h
edia/libstagefright/codecs/aacdec/bit_reversal_swap.h
edia/libstagefright/codecs/aacdec/buf_getbits.cpp
edia/libstagefright/codecs/aacdec/buf_getbits.h
edia/libstagefright/codecs/aacdec/buffer_normalization.h
edia/libstagefright/codecs/aacdec/byte_align.cpp
edia/libstagefright/codecs/aacdec/calc_auto_corr.cpp
edia/libstagefright/codecs/aacdec/calc_auto_corr.h
edia/libstagefright/codecs/aacdec/calc_gsfb_table.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_anafilterbank.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_anafilterbank.h
edia/libstagefright/codecs/aacdec/calc_sbr_envelope.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_envelope.h
edia/libstagefright/codecs/aacdec/calc_sbr_synfilterbank.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_synfilterbank.h
edia/libstagefright/codecs/aacdec/chans.h
edia/libstagefright/codecs/aacdec/check_crc.cpp
edia/libstagefright/codecs/aacdec/check_crc.h
edia/libstagefright/codecs/aacdec/dct16.cpp
edia/libstagefright/codecs/aacdec/dct16.h
edia/libstagefright/codecs/aacdec/dct64.cpp
edia/libstagefright/codecs/aacdec/dct64.h
edia/libstagefright/codecs/aacdec/decode_huff_cw_binary.cpp
edia/libstagefright/codecs/aacdec/decode_noise_floorlevels.cpp
edia/libstagefright/codecs/aacdec/decode_noise_floorlevels.h
edia/libstagefright/codecs/aacdec/deinterleave.cpp
edia/libstagefright/codecs/aacdec/digit_reversal_tables.cpp
edia/libstagefright/codecs/aacdec/digit_reversal_tables.h
edia/libstagefright/codecs/aacdec/dst16.cpp
edia/libstagefright/codecs/aacdec/dst16.h
edia/libstagefright/codecs/aacdec/dst32.cpp
edia/libstagefright/codecs/aacdec/dst32.h
edia/libstagefright/codecs/aacdec/dst8.cpp
edia/libstagefright/codecs/aacdec/dst8.h
edia/libstagefright/codecs/aacdec/e_adif_const.h
edia/libstagefright/codecs/aacdec/e_blockswitching.h
edia/libstagefright/codecs/aacdec/e_coupling_mode.h
edia/libstagefright/codecs/aacdec/e_elementid.h
edia/libstagefright/codecs/aacdec/e_huffmanconst.h
edia/libstagefright/codecs/aacdec/e_infoinitconst.h
edia/libstagefright/codecs/aacdec/e_invf_mode.h
edia/libstagefright/codecs/aacdec/e_maskstatus.h
edia/libstagefright/codecs/aacdec/e_mp4ff_const.h
edia/libstagefright/codecs/aacdec/e_progconfigconst.h
edia/libstagefright/codecs/aacdec/e_rawbitstreamconst.h
edia/libstagefright/codecs/aacdec/e_sbr_element_id.h
edia/libstagefright/codecs/aacdec/e_sbr_error.h
edia/libstagefright/codecs/aacdec/e_sbr_header_status.h
edia/libstagefright/codecs/aacdec/e_sbr_master_status.h
edia/libstagefright/codecs/aacdec/e_sbr_sync_state.h
edia/libstagefright/codecs/aacdec/e_sr_mode.h
edia/libstagefright/codecs/aacdec/e_tmp4audioobjecttype.h
edia/libstagefright/codecs/aacdec/e_tns_const.h
edia/libstagefright/codecs/aacdec/e_window_sequence.h
edia/libstagefright/codecs/aacdec/e_window_shape.h
edia/libstagefright/codecs/aacdec/esc_iquant_scaling.cpp
edia/libstagefright/codecs/aacdec/esc_iquant_scaling.h
edia/libstagefright/codecs/aacdec/extractframeinfo.cpp
edia/libstagefright/codecs/aacdec/extractframeinfo.h
edia/libstagefright/codecs/aacdec/fft_rx4.h
edia/libstagefright/codecs/aacdec/fft_rx4_long.cpp
edia/libstagefright/codecs/aacdec/fft_rx4_short.cpp
edia/libstagefright/codecs/aacdec/fft_rx4_tables_fxp.cpp
edia/libstagefright/codecs/aacdec/find_adts_syncword.cpp
edia/libstagefright/codecs/aacdec/find_adts_syncword.h
edia/libstagefright/codecs/aacdec/fwd_long_complex_rot.cpp
edia/libstagefright/codecs/aacdec/fwd_long_complex_rot.h
edia/libstagefright/codecs/aacdec/fwd_short_complex_rot.cpp
edia/libstagefright/codecs/aacdec/fwd_short_complex_rot.h
edia/libstagefright/codecs/aacdec/fxp_mul32.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_v4.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_v4_gcc.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
edia/libstagefright/codecs/aacdec/fxp_mul32_c_equivalent.h
edia/libstagefright/codecs/aacdec/fxp_mul32_c_msc_evc.h
edia/libstagefright/codecs/aacdec/fxp_mul32_c_msc_evc_armv5.h
edia/libstagefright/codecs/aacdec/fxp_mul32_pentium.h
edia/libstagefright/codecs/aacdec/gen_rand_vector.cpp
edia/libstagefright/codecs/aacdec/gen_rand_vector.h
edia/libstagefright/codecs/aacdec/get_adif_header.cpp
edia/libstagefright/codecs/aacdec/get_adif_header.h
edia/libstagefright/codecs/aacdec/get_adts_header.cpp
edia/libstagefright/codecs/aacdec/get_adts_header.h
edia/libstagefright/codecs/aacdec/get_audio_specific_config.cpp
edia/libstagefright/codecs/aacdec/get_audio_specific_config.h
edia/libstagefright/codecs/aacdec/get_dse.cpp
edia/libstagefright/codecs/aacdec/get_dse.h
edia/libstagefright/codecs/aacdec/get_ele_list.cpp
edia/libstagefright/codecs/aacdec/get_ele_list.h
edia/libstagefright/codecs/aacdec/get_ga_specific_config.cpp
edia/libstagefright/codecs/aacdec/get_ga_specific_config.h
edia/libstagefright/codecs/aacdec/get_ics_info.cpp
edia/libstagefright/codecs/aacdec/get_ics_info.h
edia/libstagefright/codecs/aacdec/get_prog_config.cpp
edia/libstagefright/codecs/aacdec/get_prog_config.h
edia/libstagefright/codecs/aacdec/get_pulse_data.cpp
edia/libstagefright/codecs/aacdec/get_pulse_data.h
edia/libstagefright/codecs/aacdec/get_sbr_bitstream.cpp
edia/libstagefright/codecs/aacdec/get_sbr_bitstream.h
edia/libstagefright/codecs/aacdec/get_sbr_startfreq.cpp
edia/libstagefright/codecs/aacdec/get_sbr_startfreq.h
edia/libstagefright/codecs/aacdec/get_sbr_stopfreq.cpp
edia/libstagefright/codecs/aacdec/get_sbr_stopfreq.h
edia/libstagefright/codecs/aacdec/get_sign_bits.h
edia/libstagefright/codecs/aacdec/get_tns.cpp
edia/libstagefright/codecs/aacdec/get_tns.h
edia/libstagefright/codecs/aacdec/getbits.h
edia/libstagefright/codecs/aacdec/getfill.cpp
edia/libstagefright/codecs/aacdec/getfill.h
edia/libstagefright/codecs/aacdec/getgroup.cpp
edia/libstagefright/codecs/aacdec/getics.cpp
edia/libstagefright/codecs/aacdec/getmask.cpp
edia/libstagefright/codecs/aacdec/hcbtables.h
edia/libstagefright/codecs/aacdec/hcbtables_binary.cpp
edia/libstagefright/codecs/aacdec/huffcb.cpp
edia/libstagefright/codecs/aacdec/huffdecode.cpp
edia/libstagefright/codecs/aacdec/hufffac.cpp
edia/libstagefright/codecs/aacdec/huffman.h
edia/libstagefright/codecs/aacdec/huffspec_fxp.cpp
edia/libstagefright/codecs/aacdec/ibstream.h
edia/libstagefright/codecs/aacdec/idct16.cpp
edia/libstagefright/codecs/aacdec/idct16.h
edia/libstagefright/codecs/aacdec/idct32.cpp
edia/libstagefright/codecs/aacdec/idct32.h
edia/libstagefright/codecs/aacdec/idct8.cpp
edia/libstagefright/codecs/aacdec/idct8.h
edia/libstagefright/codecs/aacdec/imdct_fxp.cpp
edia/libstagefright/codecs/aacdec/imdct_fxp.h
edia/libstagefright/codecs/aacdec/infoinit.cpp
edia/libstagefright/codecs/aacdec/init_sbr_dec.cpp
edia/libstagefright/codecs/aacdec/init_sbr_dec.h
edia/libstagefright/codecs/aacdec/intensity_right.cpp
edia/libstagefright/codecs/aacdec/intensity_right.h
edia/libstagefright/codecs/aacdec/inv_long_complex_rot.cpp
edia/libstagefright/codecs/aacdec/inv_long_complex_rot.h
edia/libstagefright/codecs/aacdec/inv_short_complex_rot.cpp
edia/libstagefright/codecs/aacdec/inv_short_complex_rot.h
edia/libstagefright/codecs/aacdec/iquant_table.cpp
edia/libstagefright/codecs/aacdec/iquant_table.h
edia/libstagefright/codecs/aacdec/long_term_prediction.cpp
edia/libstagefright/codecs/aacdec/long_term_prediction.h
edia/libstagefright/codecs/aacdec/long_term_synthesis.cpp
edia/libstagefright/codecs/aacdec/long_term_synthesis.h
edia/libstagefright/codecs/aacdec/lt_decode.cpp
edia/libstagefright/codecs/aacdec/lt_decode.h
edia/libstagefright/codecs/aacdec/lt_prediction.h
edia/libstagefright/codecs/aacdec/ltp_common_internal.h
edia/libstagefright/codecs/aacdec/mdct_fxp.cpp
edia/libstagefright/codecs/aacdec/mdct_fxp.h
edia/libstagefright/codecs/aacdec/mdct_tables_fxp.cpp
edia/libstagefright/codecs/aacdec/mdst.cpp
edia/libstagefright/codecs/aacdec/mdst.h
edia/libstagefright/codecs/aacdec/mix_radix_fft.cpp
edia/libstagefright/codecs/aacdec/mix_radix_fft.h
edia/libstagefright/codecs/aacdec/ms_map_mask.h
edia/libstagefright/codecs/aacdec/ms_synt.cpp
edia/libstagefright/codecs/aacdec/ms_synt.h
edia/libstagefright/codecs/aacdec/pns_corr.cpp
edia/libstagefright/codecs/aacdec/pns_corr.h
edia/libstagefright/codecs/aacdec/pns_intensity_right.cpp
edia/libstagefright/codecs/aacdec/pns_intensity_right.h
edia/libstagefright/codecs/aacdec/pns_left.cpp
edia/libstagefright/codecs/aacdec/pns_left.h
edia/libstagefright/codecs/aacdec/ps_all_pass_filter_coeff.cpp
edia/libstagefright/codecs/aacdec/ps_all_pass_filter_coeff.h
edia/libstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.cpp
edia/libstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.h
edia/libstagefright/codecs/aacdec/ps_allocate_decoder.cpp
edia/libstagefright/codecs/aacdec/ps_allocate_decoder.h
edia/libstagefright/codecs/aacdec/ps_applied.cpp
edia/libstagefright/codecs/aacdec/ps_applied.h
edia/libstagefright/codecs/aacdec/ps_bstr_decoding.cpp
edia/libstagefright/codecs/aacdec/ps_bstr_decoding.h
edia/libstagefright/codecs/aacdec/ps_channel_filtering.cpp
edia/libstagefright/codecs/aacdec/ps_channel_filtering.h
edia/libstagefright/codecs/aacdec/ps_constants.h
edia/libstagefright/codecs/aacdec/ps_decode_bs_utils.cpp
edia/libstagefright/codecs/aacdec/ps_decode_bs_utils.h
edia/libstagefright/codecs/aacdec/ps_decorrelate.cpp
edia/libstagefright/codecs/aacdec/ps_decorrelate.h
edia/libstagefright/codecs/aacdec/ps_fft_rx8.cpp
edia/libstagefright/codecs/aacdec/ps_fft_rx8.h
edia/libstagefright/codecs/aacdec/ps_hybrid_analysis.cpp
edia/libstagefright/codecs/aacdec/ps_hybrid_analysis.h
edia/libstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.cpp
edia/libstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.h
edia/libstagefright/codecs/aacdec/ps_hybrid_synthesis.cpp
edia/libstagefright/codecs/aacdec/ps_hybrid_synthesis.h
edia/libstagefright/codecs/aacdec/ps_init_stereo_mixing.cpp
edia/libstagefright/codecs/aacdec/ps_init_stereo_mixing.h
edia/libstagefright/codecs/aacdec/ps_pwr_transient_detection.cpp
edia/libstagefright/codecs/aacdec/ps_pwr_transient_detection.h
edia/libstagefright/codecs/aacdec/ps_read_data.cpp
edia/libstagefright/codecs/aacdec/ps_read_data.h
edia/libstagefright/codecs/aacdec/ps_stereo_processing.cpp
edia/libstagefright/codecs/aacdec/ps_stereo_processing.h
edia/libstagefright/codecs/aacdec/pulse_nc.cpp
edia/libstagefright/codecs/aacdec/pulse_nc.h
edia/libstagefright/codecs/aacdec/pv_audio_type_defs.h
edia/libstagefright/codecs/aacdec/pv_div.cpp
edia/libstagefright/codecs/aacdec/pv_div.h
edia/libstagefright/codecs/aacdec/pv_log2.cpp
edia/libstagefright/codecs/aacdec/pv_log2.h
edia/libstagefright/codecs/aacdec/pv_normalize.cpp
edia/libstagefright/codecs/aacdec/pv_normalize.h
edia/libstagefright/codecs/aacdec/pv_pow2.cpp
edia/libstagefright/codecs/aacdec/pv_pow2.h
edia/libstagefright/codecs/aacdec/pv_sine.cpp
edia/libstagefright/codecs/aacdec/pv_sine.h
edia/libstagefright/codecs/aacdec/pv_sqrt.cpp
edia/libstagefright/codecs/aacdec/pv_sqrt.h
edia/libstagefright/codecs/aacdec/pvmp4audiodecoder_api.h
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderconfig.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderframe.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecodergetmemrequirements.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderinitlibrary.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderresetbuffer.cpp
edia/libstagefright/codecs/aacdec/pvmp4setaudioconfig.cpp
edia/libstagefright/codecs/aacdec/q_normalize.cpp
edia/libstagefright/codecs/aacdec/q_normalize.h
edia/libstagefright/codecs/aacdec/qmf_filterbank_coeff.cpp
edia/libstagefright/codecs/aacdec/qmf_filterbank_coeff.h
edia/libstagefright/codecs/aacdec/s_adif_header.h
edia/libstagefright/codecs/aacdec/s_bit_buffer.h
edia/libstagefright/codecs/aacdec/s_bits.h
edia/libstagefright/codecs/aacdec/s_ch_info.h
edia/libstagefright/codecs/aacdec/s_crc_buffer.h
edia/libstagefright/codecs/aacdec/s_elelist.h
edia/libstagefright/codecs/aacdec/s_frameinfo.h
edia/libstagefright/codecs/aacdec/s_hcb.h
edia/libstagefright/codecs/aacdec/s_huffman.h
edia/libstagefright/codecs/aacdec/s_hybrid.h
edia/libstagefright/codecs/aacdec/s_lt_pred_status.h
edia/libstagefright/codecs/aacdec/s_mc_info.h
edia/libstagefright/codecs/aacdec/s_mixdown.h
edia/libstagefright/codecs/aacdec/s_patch.h
edia/libstagefright/codecs/aacdec/s_progconfig.h
edia/libstagefright/codecs/aacdec/s_ps_dec.h
edia/libstagefright/codecs/aacdec/s_pulseinfo.h
edia/libstagefright/codecs/aacdec/s_sbr_channel.h
edia/libstagefright/codecs/aacdec/s_sbr_dec.h
edia/libstagefright/codecs/aacdec/s_sbr_element_stream.h
edia/libstagefright/codecs/aacdec/s_sbr_frame_data.h
edia/libstagefright/codecs/aacdec/s_sbr_header_data.h
edia/libstagefright/codecs/aacdec/s_sbrbitstream.h
edia/libstagefright/codecs/aacdec/s_sectinfo.h
edia/libstagefright/codecs/aacdec/s_sr_info.h
edia/libstagefright/codecs/aacdec/s_tdec_int_chan.h
edia/libstagefright/codecs/aacdec/s_tdec_int_file.h
edia/libstagefright/codecs/aacdec/s_tns_frame_info.h
edia/libstagefright/codecs/aacdec/s_tnsfilt.h
edia/libstagefright/codecs/aacdec/s_wnd_shape.h
edia/libstagefright/codecs/aacdec/sbr_aliasing_reduction.cpp
edia/libstagefright/codecs/aacdec/sbr_aliasing_reduction.h
edia/libstagefright/codecs/aacdec/sbr_applied.cpp
edia/libstagefright/codecs/aacdec/sbr_applied.h
edia/libstagefright/codecs/aacdec/sbr_code_book_envlevel.cpp
edia/libstagefright/codecs/aacdec/sbr_code_book_envlevel.h
edia/libstagefright/codecs/aacdec/sbr_constants.h
edia/libstagefright/codecs/aacdec/sbr_crc_check.cpp
edia/libstagefright/codecs/aacdec/sbr_crc_check.h
edia/libstagefright/codecs/aacdec/sbr_create_limiter_bands.cpp
edia/libstagefright/codecs/aacdec/sbr_create_limiter_bands.h
edia/libstagefright/codecs/aacdec/sbr_dec.cpp
edia/libstagefright/codecs/aacdec/sbr_dec.h
edia/libstagefright/codecs/aacdec/sbr_decode_envelope.cpp
edia/libstagefright/codecs/aacdec/sbr_decode_envelope.h
edia/libstagefright/codecs/aacdec/sbr_decode_huff_cw.cpp
edia/libstagefright/codecs/aacdec/sbr_decode_huff_cw.h
edia/libstagefright/codecs/aacdec/sbr_downsample_lo_res.cpp
edia/libstagefright/codecs/aacdec/sbr_downsample_lo_res.h
edia/libstagefright/codecs/aacdec/sbr_envelope_calc_tbl.cpp
edia/libstagefright/codecs/aacdec/sbr_envelope_calc_tbl.h
edia/libstagefright/codecs/aacdec/sbr_envelope_unmapping.cpp
edia/libstagefright/codecs/aacdec/sbr_envelope_unmapping.h
edia/libstagefright/codecs/aacdec/sbr_extract_extended_data.cpp
edia/libstagefright/codecs/aacdec/sbr_extract_extended_data.h
edia/libstagefright/codecs/aacdec/sbr_find_start_andstop_band.cpp
edia/libstagefright/codecs/aacdec/sbr_find_start_andstop_band.h
edia/libstagefright/codecs/aacdec/sbr_generate_high_freq.cpp
edia/libstagefright/codecs/aacdec/sbr_generate_high_freq.h
edia/libstagefright/codecs/aacdec/sbr_get_additional_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_additional_data.h
edia/libstagefright/codecs/aacdec/sbr_get_cpe.cpp
edia/libstagefright/codecs/aacdec/sbr_get_cpe.h
edia/libstagefright/codecs/aacdec/sbr_get_dir_control_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_dir_control_data.h
edia/libstagefright/codecs/aacdec/sbr_get_envelope.cpp
edia/libstagefright/codecs/aacdec/sbr_get_envelope.h
edia/libstagefright/codecs/aacdec/sbr_get_header_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_header_data.h
edia/libstagefright/codecs/aacdec/sbr_get_noise_floor_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_noise_floor_data.h
edia/libstagefright/codecs/aacdec/sbr_get_sce.cpp
edia/libstagefright/codecs/aacdec/sbr_get_sce.h
edia/libstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.cpp
edia/libstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.h
edia/libstagefright/codecs/aacdec/sbr_open.cpp
edia/libstagefright/codecs/aacdec/sbr_open.h
edia/libstagefright/codecs/aacdec/sbr_read_data.cpp
edia/libstagefright/codecs/aacdec/sbr_read_data.h
edia/libstagefright/codecs/aacdec/sbr_requantize_envelope_data.cpp
edia/libstagefright/codecs/aacdec/sbr_requantize_envelope_data.h
edia/libstagefright/codecs/aacdec/sbr_reset_dec.cpp
edia/libstagefright/codecs/aacdec/sbr_reset_dec.h
edia/libstagefright/codecs/aacdec/sbr_update_freq_scale.cpp
edia/libstagefright/codecs/aacdec/sbr_update_freq_scale.h
edia/libstagefright/codecs/aacdec/set_mc_info.cpp
edia/libstagefright/codecs/aacdec/set_mc_info.h
edia/libstagefright/codecs/aacdec/sfb.cpp
edia/libstagefright/codecs/aacdec/sfb.h
edia/libstagefright/codecs/aacdec/shellsort.cpp
edia/libstagefright/codecs/aacdec/shellsort.h
edia/libstagefright/codecs/aacdec/stereo_2_mono.h
edia/libstagefright/codecs/aacdec/synthesis_sub_band.cpp
edia/libstagefright/codecs/aacdec/synthesis_sub_band.h
edia/libstagefright/codecs/aacdec/tns_ar_filter.cpp
edia/libstagefright/codecs/aacdec/tns_ar_filter.h
edia/libstagefright/codecs/aacdec/tns_decode_coef.cpp
edia/libstagefright/codecs/aacdec/tns_decode_coef.h
edia/libstagefright/codecs/aacdec/tns_inv_filter.cpp
edia/libstagefright/codecs/aacdec/tns_inv_filter.h
edia/libstagefright/codecs/aacdec/trans4m_freq_2_time_fxp.cpp
edia/libstagefright/codecs/aacdec/trans4m_time_2_freq_fxp.cpp
edia/libstagefright/codecs/aacdec/unpack_idx.cpp
edia/libstagefright/codecs/aacdec/unpack_idx.h
edia/libstagefright/codecs/aacdec/window_block_fxp.h
edia/libstagefright/codecs/aacdec/window_tables_fxp.cpp
edia/libstagefright/codecs/aacdec/write_output.h
|
| 51d7547944967d1157b7fe18e1fb8f7ee6810412 |
07-Aug-2012 |
Andreas Huber <andih@google.com> |
Only emit padding at the end of the stream in the aac and mp3 decoders
if we actually discarded content at the beginning of the stream.
Change-Id: I1e79835bb3a02350060a137b94f85f2c90f4a12b
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| e671207115fac3914134c61b336d5fa0242c68ca |
26-Jun-2012 |
Andreas Huber <andih@google.com> |
Make sure codec names and corresponding quirks are returned together.
Previously they were returned in separate vectors and only one of them was sorted if
software codecs were preferred, leaving the quirks no longer matching the codec name
at the same index.
Change-Id: Id3f1e6f9f7f8c9cc4b6ebfb86a203b4d59de8604
related-to-bug: 6737884
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| 28620ee3e9926ef07f0b4cb3e22b156b812e2d7e |
07-Aug-2012 |
Andreas Huber <andih@google.com> |
Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet" into jb-mr1-dev
|
| 972f2321583ef4094477271e0fc6a1d05a1a0eea |
12-Jul-2012 |
Martin Storsjo <martin@martin.st> |
mediacodec: Return an error on getOutputFormat if there is no output format yet
This avoids crashing if calling the public java method
MediaCodec.getOutputFormat immediately after MediaCodec.start
(as the documentation example shows that one should do!).
Change-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58
edia/libstagefright/MediaCodec.cpp
|
| 42c5ef98bd09e7d93610d4ca1f4959b63bc3267d |
07-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Remove obsolete hack for TI specific code" into jb-mr1-dev
|
| f5043b0c0759993967c4f075a658ffe9b79cd49a |
07-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| a6ee7bc5f9524c220377e37f6525e2d46c69b75b |
07-Aug-2012 |
James Dong <jdong@google.com> |
Remove obsolete hack for TI specific code
o related-to-bug: 6566886
Change-Id: I39aad214cbf7b748a95a9d22db50cd8f421931e6
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 97197157cf619fb716710eb67915fdfa93502750 |
06-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Reduce redundant device dumpsys
Bug: 6243944
Change-Id: Ifdc15ee62156a7adfd133f0d0d8b772dd1e9d5a3
ervices/camera/libcameraservice/Camera2Device.cpp
|
| fcbb8af593db05b2041c69ea9db8bcb6b9b899d5 |
05-Aug-2012 |
James Dong <jdong@google.com> |
Fix a deadlock in commandSetVideoBufferCountL()
o The lock to be acquired in recordingEnabled() has aleady been acquired in sendCommand()
before the call to commandSetVideoBufferCountL().
Change-Id: I664d51ef449c9eb3576d5d56f73f29c98444ff3f
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 7ec57375431dba04e613610e2090130b44ee80c1 |
06-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 8da4cd7d706d9f551bf2d08cd8b61907a10cd38d |
05-Aug-2012 |
James Dong <jdong@google.com> |
Fix a deadlock in commandSetVideoBufferCountL()
o The lock to be acquired in recordingEnabled() has aleady been acquired in sendCommand()
before the call to commandSetVideoBufferCountL().
Change-Id: I664d51ef449c9eb3576d5d56f73f29c98444ff3f
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| d9f0253353db0b859c0ca2b32eddc24e3e9d4d86 |
04-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Add notification handling skeleton." into jb-mr1-dev
|
| e643ccba8b8476595ab353c9bcecc8863c53242e |
04-Aug-2012 |
Ying Wang <wangying@google.com> |
Merge "Remove circular dependency." into jb-mr1-dev
|
| 8d5ec2a336c114688e5d2950b124440e07e79ad9 |
04-Aug-2012 |
Ying Wang <wangying@google.com> |
Remove circular dependency.
libstagefright_chromium_http is added to build/target/product/core.mk
instead.
Bug: 6933259
Change-Id: I2e87037eea0f1f2a56936dd02419cde564c8670d
edia/libstagefright/Android.mk
|
| 160d4af9d933fe9461bb213e5876fc5c8c2178c2 |
03-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add notification handling skeleton.
Wire up skeleton methods for handling all currently defined
notifications.
Bug: 6243944
Change-Id: I84b3f60111416ba6fbcdb086f1310225142e2b70
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| a3b71fa5235b758d5f9ea00b9c58fbfd707fb9dd |
03-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Merge "experimental support for fragmented mp4 playback in nuplayer" into jb-mr1-dev
|
| 840667883fd09d44015716d79bc3ac4d60edc0f0 |
16-Aug-2011 |
Andreas Huber <andih@google.com> |
experimental support for fragmented mp4 playback in nuplayer
cherry picked from change 170999
Change-Id: I407775f0290154ad4961134839a15c9f296424c0
mds/stagefright/Android.mk
mds/stagefright/stream.cpp
nclude/media/stagefright/foundation/hexdump.h
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.h
edia/libmediaplayerservice/nuplayer/mp4/MP4Source.cpp
edia/libmediaplayerservice/nuplayer/mp4/MP4Source.h
edia/libmediaplayerservice/nuplayer/mp4/Parser.cpp
edia/libmediaplayerservice/nuplayer/mp4/Parser.h
edia/libmediaplayerservice/nuplayer/mp4/TrackFragment.cpp
edia/libmediaplayerservice/nuplayer/mp4/TrackFragment.h
edia/libstagefright/foundation/AMessage.cpp
edia/libstagefright/foundation/hexdump.cpp
|
| 36cdfb185877a7f573621d19ed2b2e1cac13d62e |
03-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Break out individual commands
- List all commands that need implementing in sendCommand
- Write skeleton methods for each one
- Implements playRecordingSound command
- Partially implements enableShutterSound command
Bug: 6243944
Change-Id: I7866df75adca09483f407d3a4f630e847dbc7721
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 983cf231ab2d176a14595cdae46ff1b0c239af47 |
02-Aug-2012 |
James Dong <jdong@google.com> |
Dynamically configure the number of video buffers used by camera source, if supported
o related-to-bug: 6920805
Change-Id: I413bb50954cc84e32ed40bcb713842dc7b58e2b6
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/CameraClient.cpp
|
| 15d7245ed2193e4956ea87998321cbc16a3b0a46 |
03-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Fix exposure compensation step value." into jb-mr1-dev
|
| 1bf1c000be916b5e3388ef9039beedda01fa2bdd |
03-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Minor logging updates." into jb-mr1-dev
|
| 4a76bcea7a23356185c4fa9491d5a73256b80cd0 |
03-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Check PIDs to ensure camera exclusive access." into jb-mr1-dev
|
| d6f8e08a9ca7f2fe41717acd351426a7ecb0c175 |
03-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix exposure compensation step value.
Fix floating-point divide error.
Change-Id: I61b140c1090d6773b9b530d19a2ec03cf784b85e
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 750d74b0b64470dccdb7310bf33e0d0e582f2059 |
01-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Minor logging updates.
Improve double-verbose logging, report a few more errors/startup
conditions.
Bug: 6243944
Change-Id: I2e814f786b35f57b63220d1b7c39f39cb6c3ace3
ervices/camera/libcameraservice/Camera2Device.cpp
|
| 3a609147811105d40766f8f8f5904bf71cb123cb |
31-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Check PIDs to ensure camera exclusive access.
Bug: 6243944
Change-Id: I4b36af2c92b7266a4aa896a2b048c56b6406cb9a
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| ac9b96003da5dad9ae6fc8d054d7b24ef24693fe |
02-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Allocate buffers before calling start on its source in OMXCodec::start() for encoder case" into jb-mr1-dev
|
| 0dff606f42292b8a31b9eee842877f9875279dab |
02-Aug-2012 |
James Dong <jdong@google.com> |
Allocate buffers before calling start on its source in OMXCodec::start() for encoder case
o This makes it possible to configure the source to use the same number of input buffers
as requested by the video encoder, before the source starts. As a result, hardcoded
number of video buffers for camera source, for instance, can be avoided.
o related-to-bug: 6920805
Change-Id: I13d2c308dce34967768cd407f02988e92ef10a89
nclude/media/stagefright/MetaData.h
edia/libstagefright/OMXCodec.cpp
|
| 9cb20d4a41eb84bfab7f9f0d0829393f378583f4 |
02-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am a9ab66c5: (-s ours) am ffd99cb7: Merge "Shutter sound is heard at the end of the recorded video"
* commit 'a9ab66c5fac826a765186146128158672bfac67c':
Shutter sound is heard at the end of the recorded video
|
| cda97f7435e685a2d717c40db03ece6c709578f1 |
02-Aug-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| c9729ca1cb1760da836e293e3ed7a82f769f3e07 |
24-Jul-2012 |
Insun Kang <insun@google.com> |
Unifying TimedTextDriver's resume() and start().
(cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425)
Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
nclude/media/stagefright/timedtext/TimedTextDriver.h
edia/libstagefright/timedtext/TimedTextDriver.cpp
|
| 6472badc497a9e748411f8c8c9ed5d83ef335a85 |
18-Jun-2012 |
Insun Kang <insun@google.com> |
Fix: status checking in TimedTextDriver.
o fixes seeking error when there's no enabled text track.
o clean up status checking code for deselectTrack.
o fixes a potential bug : pause->backward seek can trigger unwanted
resume.
Bug: 6682160
Change-Id: I03d8788b27fb9c0a6092be83ad3578ccf3266905
(cherry picked from commit 2dafb6071d4f14e0e208912500694912211aa26b)
edia/libstagefright/timedtext/TimedTextDriver.cpp
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
|
| bb6bc8491fe819f96e1902e56694715cb110ce94 |
10-Jul-2012 |
Insun Kang <insun@google.com> |
Adds resume() function
o Revived resume() function to fix pause/resume bug. (Bug: 6663740)
o Mannually cherry-picked from GTV change.
(commit: ad1197226d1c6745959f0e469f510ca06f99489f)
Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
nclude/media/stagefright/timedtext/TimedTextDriver.h
edia/libstagefright/timedtext/TimedTextDriver.cpp
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
|
| 2f0632f12cd02b0350918720443c888b48f4417b |
01-Jun-2012 |
Insun Kang <insun@google.com> |
Adjust fire time of a timed text message before firing it.
related-to-bug: 6501328
o When Video/Audio is stuttering, subtitle's firing time should be
adjusted.
Change-Id: I0e7e8a1796cb2b3c8a09c8fbd41690bce2689e85
(cherry picked from gtv: commit b2c3aedcb6c145e33ded39ef81e3202b2419469f)
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
|
| 3c0a0e8541846427db0587c2fffb90f60ee680b0 |
02-Aug-2012 |
Paul Lind <plind@mips.com> |
Fix initialization of audio mixer track resources for MIPS.
The value 1 << 32 (maxNumTracks defaults to 32) is surprisingly not defined
in C, and differs on MIPS than the other arch.
Therefore the track resources were not initialized properly, resulting
in failure to play any audio.
The fix allows the mConfiguredNames bitmask to be correctly set to all
1's in the 32-track case, for all arch.
Change-Id: Ied3e1305952e9567602e2cd76c5ef3acb0809ee0
Signed-off-by: Paul Lind <plind@mips.com>
ervices/audioflinger/AudioMixer.cpp
|
| a9ab66c5fac826a765186146128158672bfac67c |
02-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am ffd99cb7: Merge "Shutter sound is heard at the end of the recorded video"
* commit 'ffd99cb795c92caee7f4bd0b26af9ae37b100fc3':
Shutter sound is heard at the end of the recorded video
|
| 9007619d1f786a75dae0fff31feadbf9aed9cfb8 |
02-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Shutter sound is heard at the end of the recorded video" into jb-mr1-dev
|
| ffd99cb795c92caee7f4bd0b26af9ae37b100fc3 |
02-Aug-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Shutter sound is heard at the end of the recorded video"
|
| 35f859b338c0922094ecfc37fb8157530df6b305 |
10-Jul-2012 |
Patric Frederiksen <patric.frederiksen@sonymobile.com> |
Shutter sound is heard at the end of the recorded video
On fast hardware, which is more common, the shutter sound is
played and recorded before video recording is stopped.
Before we call play shutter sound before calling stop recording.
With this fix we call play shutter sound after calling stop recording.
Change-Id: I06a3e65fd2700f1d2457fea5ff0f64500eac436f
ervices/camera/libcameraservice/CameraClient.cpp
|
| 44cda3a4e7ca3de0db9cb49145def3803b03ebb4 |
01-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Don't wait for presentation complete if terminated
Change-Id: Ia04cf6c620693457dca87b4ffea5dd0fe71efdce
ervices/audioflinger/AudioFlinger.cpp
|
| 3788a393bbcadebf38ac01ef9b2ecc46f07db011 |
01-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Allows MediaMetadataRetriever to retrieve video rotation angle" into jb-mr1-dev
|
| 5665fde6d4520c8e6cec81a4e1e9c86f1537f689 |
01-Aug-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Start adding support for multiple record tracks" into jb-mr1-dev
|
| 510a3d6b8018a77683dac466127ffd0af34bef6e |
16-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Start adding support for multiple record tracks
Replace single mTrack by vector mTracks.
Destroy record tracks similarly to playback tracks.
Dump all record tracks, in addition to the active record track.
Change-Id: I503f10b51928b6b92698fe1c51a9ddd3215df1f4
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 428b77a2b94b74665a47375b3fdb893b98d71269 |
30-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Improve formatting of debugging dump
Bug: 6243944
Change-Id: Id8730357f3adcd96923132f9f702e296e0dfd357
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/CameraService.cpp
|
| 836b81f3c5a5bacb800f698f90ded6bd6e6bc5ce |
27-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Improve threading safety
Merge mutex lock for accessing internal parameters with the parameter
structure, forcing a lock to be held before the parameters can be accessed.
Bug: 6243944
Change-Id: I86e44f395de0d80ff7c3ff3530f25b60015512d2
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 5a81ad893eada20c32596be53dabe203b99bec3c |
31-Jul-2012 |
James Dong <jdong@google.com> |
Allows MediaMetadataRetriever to retrieve video rotation angle
o related-to-bug: 6872687
Change-Id: I34e74b0756f8269edefdf3a25d8806c76fd1e2f8
nclude/media/mediametadataretriever.h
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| ba352c87633138aae401f4cd142372097e700b0f |
31-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| 25f0d7ba1987de61c75f8c68b19de48e0ad9736c |
31-Jul-2012 |
James Dong <jdong@google.com> |
Should really compare the pos to the total number of values in get() and set() methods in ListTableEntries class
o related-to-bug: 6435176
Change-Id: Ib6f6e598304e7c9becfa6cb3fc925c55b2df2682
edia/libstagefright/MPEG4Writer.cpp
|
| c620cbd7f8dc75f6819e2b862d3c09970560bc63 |
28-Jul-2012 |
James Dong <jdong@google.com> |
Refactoring how the box table entries are stored in MPEG4Writer
o Helps drastically reduce the time writing all the box table entries for long duration video recording sessions.
Experiments showed that the time is reduced from multiple seconds to less than one second for around 2.5 hours of video recording.
Change-Id: I6a696823e2938b76fcf2c73605f51bf5e5c2d749
related-to-bug: 6435176
edia/libstagefright/MPEG4Writer.cpp
|
| 8962f35049f77011ed69f168075649a66847a0c1 |
30-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr1-release history after reset to jb-mr1-dev
|
| efcdf187baab9ec29e12adcf85e63fe3e6d5aa4d |
08-Mar-2012 |
Johannes Carlsson <johannes.carlsson.x@sonymobile.com> |
Store correct time stamps in recorded mp4 files
According to the specification (ISO_IEC_14496-12_2008 page 17, 19 and
21) the time is "in seconds since midnight, Jan. 1, 1904, in UTC time"
which is not the same as Unix epoch time. This is already correctly
handled in MPEG4Extractor.cpp when reading files.
The specification also supports 64 bit timestamps which would make
it a bit more future proof, but unfortunately it seems like support
for this in players are poor (tested both Windows media player and
Quicktime player).
Change-Id: I102d728f098b8b0a21013956f017b0c4f2d69112
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 8bdac969e500bc61320a216539e840fe8ad78bb4 |
30-Jul-2012 |
Ed Heyl <ed@google.com> |
am 9fbe9429: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev
* commit '9fbe94294ce2053d102ff5de89846a0c5015fb58':
NuPlayer: Prevents creation of Video Decoder when we use Music Player
Synchronize access to OMX class member variables
Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
libstagefright: dynamically load libstagefright_chromium_http
Process EBD and FBD messages in ERROR state
Add vendor specific output color format
|
| 9fbe94294ce2053d102ff5de89846a0c5015fb58 |
30-Jul-2012 |
Ed Heyl <ed@google.com> |
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
services/audioflinger/AudioFlinger.cpp
Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b
|
| d14639c3e817be978643d1fbcfb4fac71b7c55dc |
28-Jul-2012 |
James Dong <jdong@google.com> |
Merge "Removed a CHECK_EQ that is not needed."
|
| 3beb3ff4af08ea02da87e6548e0544d2ba47daf1 |
28-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am b3192c5a: Reconcile with jb-release
* commit 'b3192c5abf7321cb3437a3aedacd632311634bff':
|
| 5d464eb0b8cffb994a754ff108795e858a882414 |
23-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Swap the order of creating IAudioTrack and thread
Simplifies the error recovery in case IAudioTrack fails.
Change-Id: I6aee41a2ac747a5689fb4836b04174e6107bf32f
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| 0ec23ce0d1ff79566c402bc30df3074f6e25a22b |
10-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Clean up start() parameters
Document where int is used instead of AudioSystem::sync_event_t
(probably because of a header file dependency).
TrackBase::start() and RecordTrack::start() don't need default parameters.
Change-Id: I82f4a4d078be900f3aa4bd926697e32f5ed68ec8
nclude/media/IAudioRecord.h
edia/libmedia/IAudioRecord.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| b3192c5abf7321cb3437a3aedacd632311634bff |
27-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: Iab9b19384ab6706f1dfca89f21ffc142f47225a3
|
| e4e2a37dbe2a4d923232305549101f779a2e3638 |
23-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Extract methods to enter standby and standby mode
Also move initial standby from to threadLoop to avoid a race condition.
Change-Id: I65afca83c36fb41b983b3b1d3dab35d4029560e3
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 3dca4c7a5622fc6aa03397d749c4b4c1201cc4f3 |
26-Jul-2012 |
Mathias Agopian <mathias@google.com> |
update to new getDisplayInfo API
Change-Id: Ie273677e34b9e8475abfa0ae27620d98b3a15b77
mds/stagefright/codec.cpp
mds/stagefright/stream.cpp
|
| 28567defef0ba95cb38f2d80eba30b01db207a77 |
26-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Use more buffers for video encoding."
|
| 82f517ba654ca4891b82ebe604dbd004b66a7b2d |
26-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Revamp recording support to allow opaque formats."
|
| 803cbf6190f16f7b2c43cbc51d0df21ec888abdd |
26-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use more buffers for video encoding.
To avoid starvation, set the number of simultaneously available buffers
to the encoder to 8.
Bug: 6243944
Change-Id: I6d0e9f3c0426d62d374c0ae0d427bf5189141adf
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 0a7af18d0308295405491f86603e3d119450aba0 |
10-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use valueAt instead of editValueAt when possible
Change-Id: I885b169f4b176a6b5c2ca9a534214b4ffff1700e
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 58e5aa34f01d663654d8bafad65db1dda42161ff |
20-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
effect_descriptor_t const correctness
Change-Id: Iad008f20d35a18acf500f773900164552fd0c19e
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 1d491ff06f4b9c90ff24fe953b90d0843eaf1c04 |
16-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Fix races in AudioRecord stop()
Change-Id: Id0ac1915f57fef4a938c7f90989c1162a8b6c51c
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 5d246efa220a7c7b22e490576c488b3853c664dd |
09-Jul-2012 |
Haynes Mathew George <hgeorge@codeaurora.org> |
NuPlayer: Prevents creation of Video Decoder when we use Music Player
- Prevents instantion of Video Decoder when we use applications like
Music Player which do not support Video Playback
- Adds a check to prevent scanning for sources when it is either an
Audio only clip or a video only clip or an AV clip played with a
Music Player.
Change-Id: I74dd9bc53e54fd4f3682536c987289ac252690b0
Signed-off-by: Arvind Thatikonda <arvindt@codeaurora.org>
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
|
| c749dade5de67424e53f844594fdb28204bfc62b |
25-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 78822d73af1e7f6b8b297fc7f98ef7f8257cc10a |
19-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Revamp recording support to allow opaque formats.
- Avoid memcpy of buffer data by using metadata mode
- Temporarily add MediaConsumer BufferQueue class
Bug: 6243944
Change-Id: I7a8c4222b7dbd14f1b1d86fda06d38eb640e87c1
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/MediaConsumer.cpp
ervices/camera/libcameraservice/MediaConsumer.h
|
| bf5bea96f236adb5eef78c2f414ef82b3602a0f7 |
19-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Codecs: Add MetaDataMode support to software video encoders.
This support is needed to enable efficient video recording with
emulator and camera HAL 2.
- Update SoftAVCEncoder and SoftMPEG4Encoder to support MetaDataMode
extension.
- Allow CameraSource to handle opaque pixel formats, so that
MetaDataMode can be used.
- Remove hardware codec restriction for MetaDataMode
Bug: 6243944
Change-Id: I970eb3d55542a413b6d75a78f76d3a8583155601
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.h
edia/libstagefright/codecs/m4v_h263/enc/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
|
| 7aa1b72252749c990c9a5efce3d8fe399261b88e |
23-Jul-2012 |
James Dong <jdong@google.com> |
Merge "Don't make the decrypted content available to Java applications via MediaExtractor.java API"
|
| 69d799679c8c0308e42057e7b5ad63a7ae806480 |
19-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use upmix/downmix utility routines
Change-Id: I9ae2ec938fb695ec576ea008a42205325af7bbf1
ervices/audioflinger/AudioFlinger.cpp
|
| 3499e2d178960ca3392855716c963eec7403a089 |
23-Jul-2012 |
James Dong <jdong@google.com> |
Don't make the decrypted content available to Java applications via MediaExtractor.java API
Change-Id: I38df6a6be30a34ce3f2640f79784dc94c8ca1158
edia/libstagefright/NuMediaExtractor.cpp
|
| f1b3ee26cafc80900bae681bddf47446a6a3733f |
21-Jul-2012 |
James Dong <jdong@google.com> |
Merge "Added number of encoded frames and duration to the MPEG4Writer::Track::dump"
|
| 68ea6cab354a635ea848bc2b5cf172d7a215a057 |
21-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera: Add OPAQUE pixel format to CameraParameters"
|
| e78d5c7bfda1e80223436df3faeb4a9e2e719bcf |
21-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Stop preview: Wait until HAL is drained"
|
| 789e325341e73743630f45e92b77d07e31c3957e |
21-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Add more verbose logging"
|
| afa1669ef8b3cf172a695f8959d94849cb9f7195 |
21-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Fix recording bugs"
|
| 2267106c98f461b730c772a913da946c391a178c |
21-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Stop preview: Wait until HAL is drained
Once camera returns from stopPreview, all preview activity needs to
have stopped. So wait until that's true.
Bug: 6243944
Change-Id: Ifa6cf171bd69015883e26dafb1e49e5ac098025a
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 5a17fde9ce50a4e5914863326dfa5055a8bcd25f |
21-Jul-2012 |
James Dong <jdong@google.com> |
Removed a CHECK_EQ that is not needed.
'what' was just compared against Renderer::kWhatFlushComplete before entering the
if block.
Change-Id: I72c5c156f814621a24439d89e150c4e0d90edcbb
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
|
| f5545b962794b78a97cafa73d0b592f55ffe06d8 |
21-Jul-2012 |
James Dong <jdong@google.com> |
Merge "Bugfix: Seek on SRT external track"
|
| e65c89113232d070dd9153c54ca19301bca7a162 |
21-Jul-2012 |
Eric Laurent <elaurent@google.com> |
fix audio effect not destroyed when needed.
commit a5f44eba contained an error which made that audio effect
modules where not destroyed but left in the destroyed state
rendering them unuseable after being released.
Bug 6805168.
Change-Id: Ia4e683b3c970ffd01846c482fde73d799ff219de
ervices/audioflinger/AudioFlinger.cpp
|
| 76da2635edbe0e6d023c665d5c344a3b7e070d73 |
21-Jul-2012 |
James Dong <jdong@google.com> |
Merge "Added a callback in nuplayer via informational event to signal the start of video rendering"
|
| c374dae535b83d9b499dd9fe8f9dabdb8b0ac9fd |
20-Jul-2012 |
James Dong <jdong@google.com> |
Added a callback to signal when the rendering of the video frame just occurred
Change-Id: Ifbd78606ffc33483aecebf02cb18e0e52af9624d
related-to-bug: 6851811
nclude/media/mediaplayer.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| f57b4ea3e409537b1d5f9aaea93d356b1cebbc6a |
20-Jul-2012 |
James Dong <jdong@google.com> |
Added a callback in nuplayer via informational event to signal the start of video rendering
Change-Id: Id7b9b82d4e5467ad8701bfbad4dcc5070f3703cf
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
|
| 33e6e35b03a726e35203e97550f32154c91d5f13 |
17-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Miscellaneous audio record fixes
Call AudioSystem::stopInput() if exitPending() after wait() returns.
Acquire lock before clearing mActiveThread.
Change-Id: Ia55e4c4b3accc65ad5479cbdc094fd919152af9f
ervices/audioflinger/AudioFlinger.cpp
|
| cd2d61016527bf48bd2e9a920bb3fdbb875eb3e4 |
19-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use constructor to initialize instead of memcpy
Also don't check for thread parameter as it's always non-NULL
Change-Id: Id23ded1370556ef3f76f81f5f0c6fa644bcba681
ervices/audioflinger/AudioFlinger.cpp
|
| a08412711b3266d336134b16a45e98baa8d11b9d |
20-Jul-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Ensure MEDIA_INFO_BUFFERING_END is always sent"
|
| be5f05e0fdfc4e3799653702187861a2afa072ee |
19-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Internal dump methods return void not status_t
Only the IAudioFlinger::dump() needs to return a status_t.
Change-Id: Iffeb2a7db4846df850b6b2ed960276f1fd75dba0
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 9e4c3db01ba4eb1e5acbed113f78a31374900df6 |
20-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add more verbose logging
Until ATRACE works in emulator, add more verbose logs to help debugging
Bug: 6243944
Change-Id: Ic5fbf764f2717e5edd05d37e0f7d826f1d494179
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Device.cpp
|
| 898a9a9b867e5d209671feee4c92266f90a55aa3 |
20-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Fix recording bugs
- Release recording stream on shutdown
- Return recording gralloc buffers to queue when they are received by
camera service after recording has been stopped (which is normal
behavior thanks to pipeline latencies in camera pipelines)
Bug: 6243944
Change-Id: Ia13a501c726613fd1e404733456dbd10d7b00132
ervices/camera/libcameraservice/Camera2Client.cpp
|
| cf9465b83405a1ec26a164b079d9898c09d87fcd |
20-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioRecord locking"
|
| 6f434482331b55876cb09c638149c21ca40c7690 |
20-Jul-2012 |
Marco Nelissen <marcone@google.com> |
Ensure MEDIA_INFO_BUFFERING_END is always sent
b/6620761
Change-Id: Iafd2eeac7b3cbbeb42af3638628a32dc6c2bb414
edia/libstagefright/AwesomePlayer.cpp
|
| 45dfb6ae94b33eea04d74afa378c1664e884f09a |
06-Jul-2012 |
Haynes Mathew George <hgeorge@codeaurora.org> |
Synchronize access to OMX class member variables
- Protect access to mLiveNodes KeyedVector member variable in freeNode function
Change-Id: Ic86844aabc2bc897ffb7fc91cd1f54254f5e29fe
edia/libstagefright/omx/OMX.cpp
|
| a3c9d82d0f898d30982840b48d1f00fd0d831e19 |
10-Jul-2012 |
Insun Kang <insun@google.com> |
Bugfix: Seek on SRT external track
o Need to return closest upcoming subtitle when seeking time is within
gap ranges.
o Manually cherry-picked from GTV change.
(commit e026a83dc88888b42da77eca739b8f09a0cd6dae)
related-to-bug: 6796228
Change-Id: I02b7718a432d6b2f5575fa1a1a42bda6f04aa25b
edia/libstagefright/timedtext/TimedTextSRTSource.cpp
edia/libstagefright/timedtext/TimedTextSRTSource.h
edia/libstagefright/timedtext/test/Android.mk
edia/libstagefright/timedtext/test/TimedTextSRTSource_test.cpp
|
| 13210f3346462a86ce9fe3af72a0c200dba84e27 |
20-Jul-2012 |
James Dong <jdong@google.com> |
Added number of encoded frames and duration to the MPEG4Writer::Track::dump
o also removed unused varialble mMaxTimeStampUs
Change-Id: I61a47e1ec8ee96a25df668637c4d4661188a1a8c
edia/libstagefright/MPEG4Writer.cpp
|
| 4865aa8a84465108e044480c1d976677f138fca6 |
19-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Revert 94479fd5405642c67efd14cebe722feb9cbe6e77"
|
| 0dca0d2db7daf36f4f49638e120a9cf979f4d5c8 |
19-Jul-2012 |
James Dong <jdong@google.com> |
Merge "When a request max file size is relatively small, don't store moov header at the beginning of a recorded mp4 file."
|
| 77e8ae9967a078770416619e99ddb5b010def312 |
18-Jul-2012 |
James Dong <jdong@google.com> |
When a request max file size is relatively small, don't store moov header at the
beginning of a recorded mp4 file.
Trying to put the 'moov' box at the beginning of an mp4 file requires to reserve
some estimated space for 'moov'. The estimate can be larger or smaller than the
actual 'moov' size. When the estimate is larger, we could meet the file
size limit, although some space is wasted; but when the estimate is smaller than
the actual 'moov' size, we not only waste the reserved space but also have to
use extra space to write 'moov' space at the end of the file. In this case, often
the requested file size limit could be exceeded by a large margin.
This patch avoids putting the 'moov' box at the beginning when a file size limit
is explicitly requested.
Change-Id: I838443d08b5589f33f3c486c662195600e3edb9b
related-to-bug: 6697505
edia/libstagefright/MPEG4Writer.cpp
|
| 5ad92f620fbbb6a8281f10169a23d38e3601e07a |
19-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Revert 94479fd5405642c67efd14cebe722feb9cbe6e77
Change-Id: I5ca78d5462badf541868785b2ba2e3f6d0cf492a
ervices/audioflinger/AudioFlinger.cpp
|
| bb4350d3b9e9485ae59e084de270f86aecef8066 |
04-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_devices_t more places
Change-Id: Id0ace02ca6f480a6c46e11880acf6cdc66d83184
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| cb4184c917f88a3c8d70c8bc6b99fc951b11cc37 |
19-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ec4147ed: Reconcile with jb-mr0-release
* commit 'ec4147ed136546f0be29a68d8edbdafbcf656e58':
|
| ec4147ed136546f0be29a68d8edbdafbcf656e58 |
19-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-mr0-release
Change-Id: I783dd9fbd723bb284932123dfa9e06fb7c7ab879
|
| 70b3c7b6f3fe22d3fdd5e8926291701432d6f4e8 |
19-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| f6d9696bf1db133d16dd8981380e1bfbd2e0bc70 |
19-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera: Add OPAQUE pixel format to CameraParameters
This is only used to support recording with HAL 2 in the
KEY_VIDEO_FRAME_FORMAT parameter, and is not exposed to applications.
Bug: 6243944
Change-Id: I5976a748d199ae98189bd03af5bbd9e18cbd6bf0
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 1f1493ce72a3e823daac1b9cd94b2535e27ec8e0 |
18-Jul-2012 |
Edwin Wong <edwinwong@google.com> |
am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit '65e8d62a5b243518795cdafa498df4a49baf6940':
Fixed sample video corrupted in MediaCodec mode.
Revert input buffer count for the SoftAAC* decoders back to 4.
Reduce underruns in screen off, esp. with EQ
Added some informational log messages to track down ANR related issues
audioflinger: change session check in createTrack.
Fix static track activity ref counting
Don't allow AudioTrack frameCount to decrease
Fix race in AudioTrack destruction
AudioFlinger: fix tracks ready for mixing logic.
Fix regression in AudioTrack::pause()
Fix ToneGenerator regression
|
| 955e78180ac6111c54f50930b0c4c12395e86cf7 |
21-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
AudioRecord locking
Fix race conditions for EVENT_MARKER and EVENT_NEW_POS callbacks.
Marker and new position update fields are protected by lock.
getSampleRate() doesn't need a lock because it reads from shared memory
control block.
Enforce that the parameter passed with EVENT_MARKER and EVENT_NEW_POS
cannot not be changed by the callback handler, and will not change during
the call by another thread.
Session ID should never change; log if it does.
Change-Id: Ia2c63cf1a71b10bb06c37981bd76437f83fffa91
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2 |
18-Jul-2012 |
Edwin Wong <edwinwong@google.com> |
Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36
Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d
related-to-bug: 6732061
nclude/media/ICrypto.h
edia/libmedia/ICrypto.cpp
edia/libmediaplayerservice/Crypto.cpp
edia/libmediaplayerservice/Crypto.h
edia/libstagefright/MediaCodec.cpp
|
| ea682976030a3930f6ee49b33b7e21abfc68174a |
17-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "CameraService: Add more information to service dump."
|
| f5926136ad328e95a79336b051d6f853443eaab9 |
17-Jul-2012 |
Eino-Ville Talvala <etalvala@google.com> |
CameraService: Add more information to service dump.
Add dumpsys information even when there's no active client. Including:
- Camera module version / name / author
- Number of camera devices
- Static information for each device
Change-Id: Ib97e325f6be5f989b342d24f1ae17aa9e796f8ed
ervices/camera/libcameraservice/CameraService.cpp
|
| fc938e092ecd91d877a8c86ca1027337a71f682e |
17-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-mr0-release history after reset to jb-dev
|
| a189a6883ee55cf62da1d7bf5bf5a8ab501938a4 |
20-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Use struct assignment instead of explicit memcpy
for POD structs effect_descriptor_t and effect_config_t
Change-Id: Ib2fc47f85fb65ed91b0abb1f87217c49b5eb571d
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 28b76b334f92a15a2be3cc9e2f7d229a3275d1ac |
04-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_channel_mask_t for channel mask
Change-Id: I1c1896da48983aa9f1462a4b471f910498816f60
nclude/media/AudioTrack.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
|
| fd4e20c226eca185fc789de761beae64855bfbbb |
04-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Run audio at priorities 2 and 3 above kernel 1
Also run the watchdog at same priority as the fast mixer.
requestPriority() originally used only the caller's pid to decide which
cgroup to assign, but in the future it might look at the priority also.
So it's safer to use same priority as the fast mixer to be sure we
run in the same cgroup.
Bug: 6461925
Change-Id: Ia59c93e4b22dacbb6746bfa6ad491be7b72f2b8d
ervices/audioflinger/AudioFlinger.cpp
|
| d96c5724818fb47917bb5e7abe37799735e1ec0e |
25-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Don't call virtual methods in destructor
The result of calling virtual methods from a destructor is undefined.
Change-Id: I0fd4a19626e5ae564a60b753315b5f6c4b8d1f2c
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| dcda3b325f465aa6ec2be11db1c56c8a5e867f33 |
16-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioRecord::stop() return void"
|
| 2bdb2f25861f3a3ac9cf3b7af561975fc9b9eead |
14-Jul-2012 |
Edwin Wong <edwinwong@google.com> |
am 190313ec: am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit '190313ec68e81c10d200ff3c20ac152cf90760d6':
Fixed sample video corrupted in MediaCodec mode.
|
| 1ea6d23396118a9cfe912b7b8a4e6f231e318ea2 |
09-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use atomic ops for thread suspend count
There was a theoretical but unlikely race if two binder threads
executed suspend() or restore() concurrently. Also added comments.
Change-Id: I0908acc810b83bdd66455b27ca3429de1662a2cd
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| d64cd233eef39430561c1e1df423336a199cc5d7 |
21-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
AudioRecord::stop() return void
like AudioTrack::stop()
Change-Id: Iab62f4665151345f1ad5874c97a21d1a331f0154
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| 190313ec68e81c10d200ff3c20ac152cf90760d6 |
14-Jul-2012 |
Edwin Wong <edwinwong@google.com> |
am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit '65e8d62a5b243518795cdafa498df4a49baf6940':
Fixed sample video corrupted in MediaCodec mode.
|
| 65e8d62a5b243518795cdafa498df4a49baf6940 |
14-Jul-2012 |
Edwin Wong <edwinwong@google.com> |
Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
|
| 68337edf595a0c345ba4b8adcd4f1e541a1d7eb7 |
12-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
AudioRecord client threading cleanup
Rename ClientRecordThread to AudioRecordThread to be more similar to
AudioTrack naming.
Only create the thread once, and use resume() and pause() for start()
and stop(). This will allow us to have a known client callback thread
tid that we can pass to AudioFlinger before start().
mActive:
Made mActive a bool not int.
mActive is protected by mLock; volatile is meaningless.
Fixed a few places where mActive was accessed without a lock:
- stopped()
- processAudioBuffer()
These aren't used internally, so no need for _l() versions.
Change-Id: I4b8a5c90f3a22d3894b344564cb1c5aef4f1fda2
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| fa2b8f243eb048fb2b8e5a14356190f69eb31a36 |
11-Jul-2012 |
Edwin Wong <edwinwong@google.com> |
Fixed sample video corrupted in MediaCodec mode.
Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a
related-to-bug: 6732061
nclude/media/ICrypto.h
edia/libmedia/ICrypto.cpp
edia/libmediaplayerservice/Crypto.cpp
edia/libmediaplayerservice/Crypto.h
edia/libstagefright/MediaCodec.cpp
|
| 9cca4c6d976d2d4127286e9eaa54d1b99880c25c |
16-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add recording support
- Support startRecording/stopRecording
- Support lock/unlock/connect
- Some rearrangement of class definitions for clarity/consistency
Bug: 6243944
Change-Id: I00c600a798572d2f69bb3f2bab3d79e4bd9a91e5
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| 04cd0186305e2b59d23c9147787046c6662029cc |
25-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
getMinFrameCount error handling
Convention is for "get" APIs that directly return status_t and indirectly
return a value via a pointer, to return BAD_VALUE if the pointer is NULL.
Also indirectly return 0 for other errors.
Change-Id: I1599f20ecb26e9723f9fb384ffbf911ff3a2ce1c
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| 5f0033d27b75fead593ed7ca2b86f5b6f5adf6cc |
13-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead code in libmedia"
|
| 5c63a648f943b0ec91c3262ced77d1598ff32093 |
12-Jul-2012 |
Martin Storsjo <martin@martin.st> |
mediacodec: Return an error on getOutputFormat if there is no output format yet
This avoids crashing if calling the public java method
MediaCodec.getOutputFormat immediately after MediaCodec.start
(as the documentation example shows that one should do!).
Change-Id: Icd3dd7ab9ae9e8f2a67cef171ff176735de95f58
edia/libstagefright/MediaCodec.cpp
|
| 1879fff068422852c1483dcf8365c2ff0e2fadfc |
12-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Add tid parameter to IAudioFlinger::openRecord
Not yet implemented
Change-Id: I35523fb15ad71727ecc9f4bb870f07e4b7397dc4
nclude/media/IAudioFlinger.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| d4070955e28ae62aa4be1657f9d32acde104bb86 |
12-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead code in libmedia
Change-Id: I7d8201590cda29c9fa99662a4fdba222091febfe
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/Visualizer.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/Visualizer.cpp
|
| bf04a5d7f287fc712e0ed91849dc85c90c1e182d |
12-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Simplify AudioRecord::getInputFramesLost()
This also fixes a benign race in reading mActive without a lock.
Change-Id: I19e953d4f275e5c266ca1ca3fece7b6c02ad1707
nclude/media/AudioSystem.h
edia/libmedia/AudioRecord.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 21dc4b6a99f0427cc1c0b10d3dcdb34c7571d10f |
16-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Remove redundant zero-initialization of allocated memory
The allocation callback is now supposed to always return initialized
memory.
Change-Id: I7a4d036e498c9f87c730dda3aab5057eb764a1e7
edia/libstagefright/codecs/avc/enc/src/avcenc_api.cpp
edia/libstagefright/codecs/avc/enc/src/rate_control.cpp
|
| 359d8fcd30ff0a8390e4c5560d53ec55a4cc5bcd |
16-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
Valgrind reported use of uninitialized memory in AVCEncodeSlice,
which this fixes.
Change-Id: Ia09ad3e50d05b2b0487a4d588d9b00fc0828c816
edia/libstagefright/codecs/avc/common/include/avcapi_common.h
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
|
| 39c54f68804c1ce5c85ec588f3c2c63447a807b4 |
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead code
Change-Id: If22a6c4e572b0734eba0c5a7ce29a2c61c581e5d
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 4fe1ec4f40b58abff6cec147aa786cb65698161a |
28-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Fix check for invalid channel count
Change-Id: Id9e3dce0e3d5971786212d3f70e17a17e32ce92b
ervices/audioflinger/AudioFlinger.cpp
|
| 9d8e55cd2705a6ab43ea4aca6f94feb7bef87938 |
11-Jul-2012 |
Truls Bengtsson <truls.bengtsson@sonymobile.com> |
Initialize pool's buffer pointers to null.
If these pointers are not properly initialized to null and
allocation of one of the buffers subsequently fail, the freePool
mechanism might erroneously free uninitialized pointers.
Change-Id: I2101bdb2cc576e5f50b5a1440e6fc0c54dc4e81b
ibvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
|
| be5016bac5c1b422d850e299d3cb11fecf0ac19d |
11-Jul-2012 |
Jesper Tragardh <jesper.tragardh@sonyericsson.com> |
Correct ID3::StringSize calculation for UCS-2 data.
Album art was not displayed when albums were transferred via MediaGo
because the length of the description in the APIC tag was not
correctly calculated.
The method StringSize used to calculate the length of the tag
does not add the size of the null termination in UCS-2 case.
Change-Id: I5409d42f5e87d315e6e03c4d7e6cbd8a378a160d
edia/libstagefright/id3/ID3.cpp
|
| 04270daf50f0c602d7c57a257a693e68246cbeb7 |
10-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Record overflow cleanup
Add comments and rename one method for clarity
Change-Id: I04a9147e46e88a072256c0211b112d52202419e2
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 254af180475346b6186b49c297f340c9c4817511 |
03-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_channel_mask_t more places
Use it in AudioSystem::getOutput(), AudioSystem::getInput(),
IAudioPolicyService::getOutput(), IAudioPolicyService::getInput(),
and various other places in AudioFlinger.
Not done: AudioTrack and OutputDescriptor.
Change-Id: I70e83455820bd8f05dafd30c63d636c6a47cd172
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 4d2132c866228eaef563e8141ebf06aa25ee9ff7 |
10-Jul-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audio policy: fix delayed command insertion"
|
| 2df8f55055fe431a508148cf525df1ba40f03113 |
10-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Add comments on use of volatile for track count
and add acquire load at the read
Change-Id: Ib41a58f5b1f6af87a8bd63d3f77d2ec0e48cb479
ervices/audioflinger/AudioFlinger.h
|
| a34f8ec169986c5a28600c0decaa4e2db70df8e4 |
21-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Remove 'volatile' from mMute and add comments
Change-Id: I386ba27b2305a397aba70331c6bf0d35ea727cf6
ervices/audioflinger/AudioFlinger.h
|
| 9f34a36d9cdb9595c288e50ffe00da038bc8abb9 |
21-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Whitespace and indentation
Change-Id: I424052b4ff9218147a5cfc8e6dcd67fe8105d229
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 7d6c35bf132a46c0a8a9826491882495fc98bd8c |
02-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Move constant initializations from onFirstRef() to constructor
Change-Id: I57f55b0bd1edee105c58c3a055f95f1e4a2c9646
ervices/audioflinger/AudioFlinger.cpp
|
| a51b4acf038ecd7728a98b85749eefc165aa358a |
10-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioFlinger::getBuffer() always returns non-NULL"
|
| f89a0deef1ecafcba164045b76d4d6c7bf8eb24d |
10-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Move declarations of local variables to first use"
|
| 955585cca11173b07e2e7db3d636ee97b69b053b |
13-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Fix indentation
Change-Id: I4fcdf619e3b75387a7909272f3164b8d608b6cc2
edia/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
|
| a21795c5d1d4ca9a6361e4b2db3e1f053e67b1c9 |
10-Jul-2012 |
Patric Frederiksen <patric.frederiksen@sonymobile.com> |
Shutter sound is heard at the end of the recorded video
On fast hardware, which is more common, the shutter sound is
played and recorded before video recording is stopped.
Before we call play shutter sound before calling stop recording.
With this fix we call play shutter sound after calling stop recording.
Change-Id: I06a3e65fd2700f1d2457fea5ff0f64500eac436f
ervices/camera/libcameraservice/CameraService.cpp
|
| f5af6314db25ff3bef9bd2eeba201bc6cc60805d |
13-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Clarify the ifdefs surrounding inline assembly
Previously, the code was structured like this:
#if defined(__GNUC__) && defined(__arm__)
/* Generic C implementation */
#elif defined(__CC_ARM)
/* RVCT version */
#elif defined(__GNUC__) && defined(__arm__)
/* GCC arm assembly version */
#endif
This had two implications - the gcc arm version never was used
in practice, and the code required -D__arm__ to build at all for
other architectures.
The inline assembly constraints are buggy (requires changes so as
to not crash), and if fixed, the optimizations still aren't faster
than the generic C code on modern gcc versions. Therefore, just
ignore them and use the generic C code.
Due to the peculiar code block ordering and preprocessor conditions,
the generic C code is what has been used before anyway, but it
did require -D__arm__ to build, which can cause problems if building
for other architectures, if the system headers have ifdefs for this
define. This change makes it build without that define.
Change-Id: Ib3fcf5651ee720310b7dff10fd04279b5f90759c
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
|
| 2f3152dee8e763fd7eae9d7b71078d5c6aec5881 |
13-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Remove useless casts
Change-Id: I73a6f74268bcf6ca22d489d13936be8fd1b3fc92
edia/libstagefright/codecs/avc/enc/src/bitstream_io.cpp
|
| 23da4cf305b9bfff07954711a8a2d9ec040865af |
13-Apr-2012 |
Martin Storsjo <martin@martin.st> |
avcenc: Switch malloc/free callbacks to use pointers instead of ints
There is no reason for casting the pointers to ints. This fixes
building the code on platforms where pointers are larger than ints,
e.g. 64 bit platforms.
Change-Id: I910cd207d0908287931c9a96eb270139967e029b
edia/libstagefright/codecs/avc/common/include/avcapi_common.h
edia/libstagefright/codecs/avc/common/src/dpb.cpp
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
edia/libstagefright/codecs/avc/enc/src/avcenc_api.cpp
edia/libstagefright/codecs/avc/enc/src/bitstream_io.cpp
edia/libstagefright/codecs/avc/enc/src/motion_est.cpp
edia/libstagefright/codecs/avc/enc/src/rate_control.cpp
|
| 223933e8e7419d0d4431d01e8980592fcafd2404 |
23-Jun-2011 |
Martin Storsjo <martin@martin.st> |
stagefright amrnb: Remove unused leftover source files
This allows getting rid of adding the plain common directory
(not common/include) to the include paths in projects that use
this code, too.
Change-Id: Ifb1fe4fc1f5c6f1264cb2b64f7b78e42b1e7833a
edia/libstagefright/codecs/amrnb/common/include/pvgsmamr.h
edia/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/amrnb/dec/include/pvamrnbdecoder_api.h
edia/libstagefright/codecs/amrnb/dec/src/pvgsmamrdecoder.cpp
edia/libstagefright/codecs/amrnb/enc/Android.mk
|
| 448239b929de32621e26504b86482ab4d436a5e3 |
01-Mar-2012 |
Martin Storsjo <martin@martin.st> |
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
Change-Id: I6d6f9dc5799750394a853325466ffa2ebec44625
edia/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
edia/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h
edia/libstagefright/codecs/amrnb/dec/src/amrdecode.h
edia/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
|
| 8d5a687f4f4c50f4fc8c1a29ab7a0cd618bcf9d1 |
17-May-2011 |
PacketVideo CM <engbuild@pv.com> |
amrnb: Fix audio distortion in an AMR-NB clip
This fix had the PacketVideo internal tracking number
RIO-9190.
This was committed on the master branch of the opencore
repository in commit 7d6ccc907d3a15ca2ff74b9c76f122ab87d0ffbe.
Change-Id: Icbd7d6fe94e02cae360946cfb6f3b8dc90c8b518
edia/libstagefright/codecs/amrnb/dec/src/post_pro.cpp
|
| 6d72a807dc3910ddd0b7c4f85130951dd189e8f5 |
17-May-2011 |
Martin Storsjo <martin@martin.st> |
amrnb: Restart the p_xn pointer when retraversing the array on overflow
This is a safeguard to avoid issues in a rare codepath.
This was committed on the master branch of the opencore
repository in commit f532d145194e474cb30d8644b8eee83873ad24cc,
based on AOSP contribution 10905.
Change-Id: I9688b009bcbe63d88ee5040e883a021aefa30664
edia/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp
|
| 983995747ed3adaf25035c433df1ccbaa056a898 |
23-Jan-2012 |
Paul Fariello <fariello@archos.com> |
MPEG2TSWriter: Write a proper CRC in PAT and PMT
Change-Id: I6ec8039b176878da6f02691194d96b0a1e894055
nclude/media/stagefright/MPEG2TSWriter.h
edia/libstagefright/MPEG2TSWriter.cpp
|
| d4e5af6bc0a012e8d43975ca8b5627631333920d |
23-Jan-2012 |
Paul Fariello <fariello@archos.com> |
MPEG2TSWriter: Write proper continuity counters for PAT and PMT
Change-Id: If94e31e51c563867db6d2376ad771f9751416084
nclude/media/stagefright/MPEG2TSWriter.h
edia/libstagefright/MPEG2TSWriter.cpp
|
| 6648821933dc06c0b09ab2c8b32135edddcd4291 |
21-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger::getBuffer() always returns non-NULL
Change-Id: I543d3db507597cacbfdad5d9ea71732137fe54fb
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 94479fd5405642c67efd14cebe722feb9cbe6e77 |
10-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Fix build
Revert after system/core audio_devices_t is submitted
Change-Id: I5a8ee1a7b711e834501e927f41c62efa6a6600b6
ervices/audioflinger/AudioFlinger.cpp
|
| cec4abb2a39eafa75cf6894170a200322aa7226e |
03-Jul-2012 |
Eric Laurent <elaurent@google.com> |
audio policy: fix delayed command insertion
When inserting a delayed command in the audio policy service
command thread queue, later similar commands are filtered out.
In case of volume commands and delayed unmuting, this can cause
a problem where a new volume command can cause the timing of a
delayed unmuting command to not be honored.
This change makes that a volume command gets the time stamp of
any delayed command it replaces.
Bug 6720482.
Change-Id: I216f85ac0ea46e4a046d3483e9e9b7ffe6c34a08
ervices/audioflinger/AudioPolicyService.cpp
|
| 01542f2704f39956da09ae2840e192dab760091f |
02-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Only write to mDevice once
This fixes a bug where readers might see intermediate values.
Also add comments about how mStandby and mDevice are used.
Change-Id: Idc84e56c21381a45137a2ca5ff9c57d437201869
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| c1dae24a08b67b98e18e4239d4f3a74d600d353c |
03-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Remove debug code HAVE_REQUEST_PRIORITY and SOAKER
Change-Id: I73a2afe72d8acb53e57e6b4e6fb5133e22b7875a
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/Soaker.h
|
| 2c75ef40330522fb50bbd7a0aa105573355b323c |
03-Jul-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: fix effect disconnect deadlock"
|
| 3795ec28d725446996e399135979144d947f4fdc |
03-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ffb82943: Reconcile with jb-release
* commit 'ffb829430ff20ccd6c13e6ed894f2373b2d93939':
|
| ffb829430ff20ccd6c13e6ed894f2373b2d93939 |
03-Jul-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: I7c52b8e82465f28b32e8ebf6df56c258458f2cd3
|
| a5f44ebaf58911805b4fb7fb479b19fd89d2e39b |
25-Jun-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix effect disconnect deadlock
Fix possible deadlock when several EffectHandles on the same
EffectModule are destroyed simultaneously:
A wp on an EffectHandle should not be promoted to a local sp
with ThreadBase mutex held as the EffectHandle destructor can be
called when the sp gets out of scope which will call
ThreadBase::disconnectEffect() and try to acquire the mutex.
Use raw pointers instead of weak pointers for the list of handles
on an EffectModule.
Bug 6679606.
Change-Id: Ice8b602fb03a7d363c44ce3dced8a53540d96270
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| dd8104cc5367262f0e5f13df4e79f131e8d560bb |
02-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_channel_mask_t more consistently
In IAudioFlinger::createTrack() and IAudioFlinger::openRecord(),
declare input parameter to use correct type audio_channel_mask_t.
In IAudioFlinger::getInputBufferSize(), input parameter is now channel mask
instead of channel count.
Remove unused IAudioFlinger::channelCount(audio_io_handle_t).
In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(),
input parameter is channel mask instead of channel count.
Change-Id: Ib2f1c29bea70f016b3cfce83942ba292190ac965
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libstagefright/AudioSource.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| f1da96d8cf60842538e00a9c950cc451f7da2c10 |
03-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Remove longStandbyExit
It was never set (the assignment was within an "if" that was never true).
Change-Id: I01cc68e9df6b190eece621b2aa9858b4361880ce
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 415fa7599f48494f99206b8d6e1974abb52c5923 |
03-Jul-2012 |
Glenn Kasten <gkasten@google.com> |
Fix uninitialized field EffectModule::mPinned
Also mark EffectModule::mId and EffectModule::mSessionId const, and
document the initialization of other fields in EffectModule.
Change-Id: Ic1ca008e75e9b5924743ffc35bef80057f3a0669
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| faa5bdd1efff301962537a7b271bd31c78ec13dc |
15-Jun-2012 |
Colin Cross <ccross@android.com> |
libstagefright: dynamically load libstagefright_chromium_http
dlopen libstagefright_chromium_http to allow it to be on the platform
side of the pdk without getting overwritten during a pdk fusion build.
Bug: 6772533
Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/chromium_http/chromium_http_stub.cpp
edia/libstagefright/chromium_http_stub.cpp
edia/libstagefright/include/chromium_http_stub.h
|
| d5903ec1332630f2992a6f0d5ca69d13a185c665 |
18-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Compare sp<> to 0 and raw pointers to NULL
Change-Id: I50ff8a010d349d1d7e3dffa04a6331814c2128b0
ervices/audioflinger/AudioFlinger.cpp
|
| 524f4386465fe9911cc067c0c2a4fa3eadad211d |
02-Jul-2012 |
James Dong <jdong@google.com> |
Merge "Fixed a video editor crash due to "divided by 0""
|
| 2df63ad6bbf0ad0fd066592b44f2e15123513112 |
02-Jul-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| a01992a0675a06df7d0bbe7b977207dd0c33fdc7 |
02-Jul-2012 |
Eric Laurent <elaurent@google.com> |
am dbbd5b86: am 109347d4: audioflinger: fix regression in attachAuxEffect().
* commit 'dbbd5b860a3a26bea3376410f75f27530d9cd10b':
audioflinger: fix regression in attachAuxEffect().
|
| dbbd5b860a3a26bea3376410f75f27530d9cd10b |
02-Jul-2012 |
Eric Laurent <elaurent@google.com> |
am 109347d4: audioflinger: fix regression in attachAuxEffect().
* commit '109347d421413303eb1678dd9e2aa9d40acf89d2':
audioflinger: fix regression in attachAuxEffect().
|
| fb3aacec395d5917e29244fbef4b200ac8d08d07 |
02-Jul-2012 |
Eric Laurent <elaurent@google.com> |
am 109347d4: audioflinger: fix regression in attachAuxEffect().
* commit '109347d421413303eb1678dd9e2aa9d40acf89d2':
audioflinger: fix regression in attachAuxEffect().
|
| 109347d421413303eb1678dd9e2aa9d40acf89d2 |
02-Jul-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix regression in attachAuxEffect().
Commit 717e1286 introduced a regression in PlaybackThread::Track::attachAuxEffect()
when called with an effect ID of 0 to detach the auxiliary effect.
It is normal in this case that AudioFlinger::getEffectThread_l() returns 0.
Bug 6768757.
Change-Id: I7430bd1aad2f68da38f7c3e4794e7ad657bfc6be
ervices/audioflinger/AudioFlinger.cpp
|
| dbabf8a7dfe3aa8bf0ed169220d2009d5891fef2 |
01-Jul-2012 |
Eric Laurent <elaurent@google.com> |
am 651f9e7c: am 717e1286: audioflinger: fix auxiliary effect attachment
* commit '651f9e7c972b58a49066081187161268bcf9237a':
audioflinger: fix auxiliary effect attachment
|
| 65febca659a21b1b5f1616bd083fb289c9acaf19 |
01-Jul-2012 |
Eric Laurent <elaurent@google.com> |
am 717e1286: audioflinger: fix auxiliary effect attachment
* commit '717e128691f083a9469a1d0e363ac6ecd5c65d58':
audioflinger: fix auxiliary effect attachment
|
| 651f9e7c972b58a49066081187161268bcf9237a |
01-Jul-2012 |
Eric Laurent <elaurent@google.com> |
am 717e1286: audioflinger: fix auxiliary effect attachment
* commit '717e128691f083a9469a1d0e363ac6ecd5c65d58':
audioflinger: fix auxiliary effect attachment
|
| 53f69c194d7ae8105b4c6d0c9901eb96281c7bf9 |
30-Jun-2012 |
James Dong <jdong@google.com> |
Fixed a video editor crash due to "divided by 0"
The crash was because the video sample was too short and has 0 duration (or a single frame video).
This patch is just simply not to support 0 duration video for editing.
Change-Id: I2c7ff78b1e884a4d3a5051f87cdbeeb5dc3078a6
related-to-bug: 6670656
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 717e128691f083a9469a1d0e363ac6ecd5c65d58 |
30-Jun-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix auxiliary effect attachment
Auxiliary effects (Reverb) are global effects and as such follow
the default rule which is to attach them to the output thread that
handles music streams by default. This causes a problem when several
threads are eligible to handle music streams as tracks can be attached
to either thread based on criteria unknown when teh effect is created.
The fix consists in moving the auxiliary effect if necessary when an
AudioTrack is attached to it and this track is not on the same
output thread.
Bug 6608561.
Change-Id: Ib32c3cabc731b2046aba728be1771982999c6069
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| a0108697f86d8625eb7ad3f13e422427fe7573ca |
30-Jun-2012 |
James Dong <jdong@google.com> |
Fixed a media server crash due to unintialized mRecord member variable
mRecord is not properly initialized if the call to AudioRecord::getMinFrameCount() fails.
media server crashes when the unintialized mRecord object is deleted in AudioSource's destructor.
Change-Id: Ia89222789d044c11c9957a99725bc89f9c709e17
related-to-bug: 6744014
edia/libstagefright/AudioSource.cpp
|
| f89a87ab3708e75c406b2abcb7e69dc1b076868a |
26-Jun-2012 |
Haynes Mathew George <hgeorge@codeaurora.org> |
Process EBD and FBD messages in ERROR state
- OMXCodec::on_message() function drops all OMX messages if
OMXCodec is in ERROR state
- This can cause EBD/FBD messages containing valid buffers to be
dropped
- Avoid dropping EBD/FBD messages so that buffer book-keeping is still
possible
Change-Id: Idc1174b3fa946b26458d49394b87fba1738b228e
Signed-off-by: Iliyan Malchev <malchev@google.com>
edia/libstagefright/OMXCodec.cpp
|
| af8e8aa1ada2948972555592570ec9ad90cbf372 |
26-Jun-2012 |
Nick Kralevich <nnk@google.com> |
Add mode when open(O_CREAT) is used.
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".
This will become a compile error in a future Android change.
Change-Id: I36a3d67d294a915c1f79632a1b0ba45edd1214b1
edia/libstagefright/AACWriter.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpServer.cpp
|
| 0dc6d5ef45c0721c76f0e55354ff80371d795e5d |
26-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioRecord comments"
|
| 02e84eaff54414e9f10c0f605152728a682c6874 |
25-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
AudioRecord comments
Group the private fields according to how they are used
Change-Id: I7ce3d0939510c10f34bd91a55f6e03afc8e7d43c
nclude/media/AudioRecord.h
|
| f18da5524ecc50b12ea8233f82892f99106fc009 |
26-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
* commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7':
SurfaceMediaSource: keep refs to current buffers
|
| 9ee836fc8cf54d26e1e0819d1467d4d39bb9295c |
25-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove acoustics from AudioSystem::getInput()"
|
| 20010053daabfa43fcfe781bbf004473b4c08538 |
22-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Remove acoustics from AudioSystem::getInput()
Change-Id: I29fb3ee5664c1f0ee0409c1bb2be087ecca637db
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 52a530fda9ae2bb8e00b35972c73e9cd0b110ab4 |
25-Jun-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: fix setStreamOutput()"
|
| 624a7fcb377f2a40109c16de5109ae8ea1f67a69 |
22-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_channel_mask_t in AudioRecord
Change-Id: I9e1b918b2635d961604a4a9d88eb1c7179a167a7
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| 70be725da4d8aafb94d47c1962e897ecd5fdf823 |
22-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Remove unused AudioRecord::channels()
It was declared but never implemented or called.
Change-Id: If5846147fcbd7f6d4187971e2044dd6fd3252b42
nclude/media/AudioRecord.h
|
| 868a6a357018e5872e064b7a13a9b891e2078962 |
22-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Include what you use
Change-Id: I12ef9367d05dbe069c037b1b4acd6347a8cf3ece
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| 46ec58976b3c04a99ce6e7eda2531543bfb151c7 |
25-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove AudioRecord record_flags"
|
| a4b06651f65d2c4f4d5840e7f879fb3ae5cfaa82 |
25-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 91ac74bb: Reconcile with jb-release
* commit '91ac74bb27ce99552e4bd428548ed12f7f61ddc5':
|
| 91ac74bb27ce99552e4bd428548ed12f7f61ddc5 |
25-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: I1ce46fa6332f684c76c276117c7b406bdd5e9336
|
| f15f6e2e7fc51d48ba95890e1f562908e6e957c0 |
13-Jun-2012 |
Jesse Hall <jessehall@google.com> |
Provide new argument to BufferQueue::releaseBuffer
Change-Id: Ib86f1af80a0d2833535a0ad170dce5ac061eec75
edia/libstagefright/SurfaceMediaSource.cpp
|
| 4221e2813f7a307936036e62b6a63bbda23005ee |
23-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 0f59d4815400649943716f10305a77c7d56b47c4 |
23-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
am e6cb412b: am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
* commit 'e6cb412b677966c25b424766dc6ceb2787d49caa':
SurfaceMediaSource: keep refs to current buffers
|
| e6cb412b677966c25b424766dc6ceb2787d49caa |
23-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
* commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7':
SurfaceMediaSource: keep refs to current buffers
|
| 33e28dd3c033641f4db9d1b99c7c88d6d08c61f7 |
23-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
|
| 2cd25a9056cc150b9fd3ac9b0bca37a1334ffd47 |
22-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
SurfaceMediaSource: keep refs to current buffers
This change fixes a bug in SurfaceMediaSource where it would not keep a
reference to all of the Gralloc buffers that the video encoder is currently
using.
Bug: 6655597
Change-Id: Ifd99976cc7ae57ed724bbf2bbcff357a39497391
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| f92eec53f886f43e4374a36195be55f2a7bbcf36 |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Remove AudioRecord record_flags
Change-Id: I021ddcc1bcb63132a4597d13e3d09db2a5f2c628
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
edia/libstagefright/AudioSource.cpp
|
| 723fcc49e0ca7e18c6c3a6898a89c911f609e025 |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5ca15ccf: Reconcile with jb-release
* commit '5ca15ccf7336d5aa5a7b563742757fa37092eb48':
Revert input buffer count for the SoftAAC* decoders back to 4.
|
| 5ca15ccf7336d5aa5a7b563742757fa37092eb48 |
22-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: Iea91c1026e7fc3a59815e01e4e4168f875527e7c
|
| 1e5b2b3361ddd07259bf4b29820ca4aa5f3a861b |
14-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
Update ANativeWindow client code for sync
This change updates all the uses of ANativeWindow to use the new ANW functions
that accept and return Sync HAL fence file descriptors.
Change-Id: Id7db42d8d6380f8b440d88476ce9211c6225fb16
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/tests/Android.mk
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| 18faac2af4e3b27deec0a707757883e5e569c591 |
21-Jun-2012 |
Haynes Mathew George <hgeorge@codeaurora.org> |
Add vendor specific output color format
- Add Qualcomm specific color format support to OMXCodec and ACodec
- This is the default color format supported on QCom chipsets
Change-Id: Id947b158c3b403c2d347f708bc1e780b4d65e220
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| d3a9ff4b725de612bf0354c035ba8f8564dbc6e8 |
21-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Move declarations of local variables to first use
Change-Id: I48b193a742b32b6746aa938b84dc405124a6a5c3
edia/libmedia/AudioTrack.cpp
|
| 95e6e6efcac831874b3d08947d1751d8f65503f9 |
21-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Workaround for corrupt Vorbis comment"
|
| 09e9c89978d636d48dee8bdad9c1444f035ebb4d |
20-Jun-2012 |
Andreas Huber <andih@google.com> |
Revert input buffer count for the SoftAAC* decoders back to 4.
This improves the netflix bandwidth change responsiveness.
With the old count of 32 the audio decoder running at a higher
priority would starve the video decoder for about 1 sec while
draining the input data.
I haven't been able to break any stream playback using MediaCodec
using the lower count, even though I'm sure I had a good reason
to increase it in the first place (see bug 6478823)
Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4
related-to-bug: 6685031
edia/libstagefright/codecs/aacdec/SoftAAC.h
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| a43787a8cc513715543fb5c80c7c464e2cd51b6e |
20-Jun-2012 |
Andreas Huber <andih@google.com> |
am e77c76dc: am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.
* commit 'e77c76dc57f88ec9e6b370dcba8a8c3e0684461d':
Revert input buffer count for the SoftAAC* decoders back to 4.
|
| 1c1a61cb1765c083a199c63863c2f6ae417e63d5 |
20-Jun-2012 |
Andreas Huber <andih@google.com> |
am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.
* commit '39a3113539f9bcc86a8efe562780c23ac8731098':
Revert input buffer count for the SoftAAC* decoders back to 4.
|
| e77c76dc57f88ec9e6b370dcba8a8c3e0684461d |
20-Jun-2012 |
Andreas Huber <andih@google.com> |
am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.
* commit '39a3113539f9bcc86a8efe562780c23ac8731098':
Revert input buffer count for the SoftAAC* decoders back to 4.
|
| 39a3113539f9bcc86a8efe562780c23ac8731098 |
20-Jun-2012 |
Andreas Huber <andih@google.com> |
Revert input buffer count for the SoftAAC* decoders back to 4.
This improves the netflix bandwidth change responsiveness.
With the old count of 32 the audio decoder running at a higher
priority would starve the video decoder for about 1 sec while
draining the input data.
I haven't been able to break any stream playback using MediaCodec
using the lower count, even though I'm sure I had a good reason
to increase it in the first place (see bug 6478823)
Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4
related-to-bug: 6685031
edia/libstagefright/codecs/aacdec/SoftAAC.h
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| 22167855ff9af7b13fda669ca27c67a037a7d585 |
20-Jun-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix setStreamOutput()
AudioFlinger::setStreamOutput() should also work for direct outputs.
Also ignore the destination output specified to match the expected
behavior which is to invalidate all tracks using the specified stream
type so that they can be re created on the correct ouput thread.
Do not send STREAM_CONFIG_CHANGED event wich is ignored by AudioSystem
anyway since the stream to output cache has been removed.
Change-Id: I13d9d47922923b630dd755717875424c16be4637
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| af2e65ca9a0415e68acfae9497ce445e96fb738a |
19-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Workaround for corrupt Vorbis comment
Bug: 6682991
Change-Id: I8b0d91ab76b700ab981f2524124109234023a9da
edia/libstagefright/FLACExtractor.cpp
|
| 5f12136299918ea30555f3481668ec0dbb775e5f |
15-Jun-2012 |
Eric Laurent <elaurent@google.com> |
audio policy: acquire lock for volume functions
Acquire the AudioPolicyService mutex when executing
setStreamVolumeIndex() and getStreamVolumeIndex().
These functions have become more complex and iterate on the
list of opened outputs and it is safer to acquire the
AudioPolicyService mutex to avoid concurrency with other
functions.
Bug 6626532.
Change-Id: Ifdcbbbf13338fd9a59f694d43faa7ade143f94bf
ervices/audioflinger/AudioPolicyService.cpp
|
| 1222bb9d9551cdf84923ea342ca3f4210867bd9a |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ff8977f3: Reconcile with jb-release
* commit 'ff8977f3392036b387fc2f65056bcf19f9942c9d':
|
| ff8977f3392036b387fc2f65056bcf19f9942c9d |
19-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: Ic4989b359b302c5d72751cdebae3433064770a29
|
| c67d875fde2158e60e45b7f0a79edaa959ca9464 |
18-Jun-2012 |
Colin Cross <ccross@android.com> |
Merge "libstagefright: dynamically load libstagefright_chromium_http"
|
| 5b42ee8124ffc7f95d5a8a433b5df0e18d847635 |
18-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 4862d1ea: am eb15716b: Change definition of warmup period
* commit '4862d1eaa6b3b2bad040d01fe090e8616685c12b':
Change definition of warmup period
|
| ff3e9fa062e2afb2b8ebb0f47c8ad90fdd890dbd |
18-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 16f07fb7: am 972af221: FastMixer compensates for SRC jitter in audio HAL
* commit '16f07fb7bb4c284cc0b16f55fe5eabd4a4802590':
FastMixer compensates for SRC jitter in audio HAL
|
| 4862d1eaa6b3b2bad040d01fe090e8616685c12b |
18-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am eb15716b: Change definition of warmup period
* commit 'eb15716b59020f342df62bce5b293f0603b94861':
Change definition of warmup period
|
| 16f07fb7bb4c284cc0b16f55fe5eabd4a4802590 |
18-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 972af221: FastMixer compensates for SRC jitter in audio HAL
* commit '972af221ae7253e406e0e1ea853e56a3010ed6b1':
FastMixer compensates for SRC jitter in audio HAL
|
| 2c08dc66c2980a50e90befe84f836b7ebf17fe94 |
15-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Move per-frame verbose logs to separate log enable
Bug: 6243944
Change-Id: I5850f8ceb2e603aa555cc71328f64d6a928694a0
ervices/camera/libcameraservice/Camera2Device.cpp
|
| 74cfa5b792fc17d7afd3e833d552fa0ec45ea977 |
18-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Handle preview orientation changes."
|
| e4aacc3be5f9a7128a0865a6878b644a05d25616 |
18-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Connect camera parameters to HAL request entries."
|
| 215bf587522e5587a4b46344304e6b0beef405b5 |
16-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| bea455c8e4a230cc5aedc9df33e1ba97c64cec5f |
15-Jun-2012 |
Colin Cross <ccross@android.com> |
libstagefright: dynamically load libstagefright_chromium_http
dlopen libstagefright_chromium_http to allow it to be on the platform
side of the pdk without getting overwritten during a pdk fusion build.
Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/chromium_http/chromium_http_stub.cpp
edia/libstagefright/chromium_http_stub.cpp
edia/libstagefright/include/chromium_http_stub.h
|
| c94cd19694ea0befe2eb22735c50b00070f006d9 |
15-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Handle preview orientation changes.
- Process sendCommand(CAMERA_CMD_SET_DISPLAY_ORIENTATION)
Bug: 6243944
Change-Id: I92d3bb13312d475703325230487d660a1cb7e0e5
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| be0573b93e2d6fa133579c885583af9ed16bc29d |
15-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Connect camera parameters to HAL request entries.
- All fields in Camera.Parameters are mapped to HAL2 entries, and
communicated to the HAL.
- Preview stream properly updated on parameter changes
- Slight code rearrangment for improved clarity
Bug: 6243944
Change-Id: I2a1db5c148809a62ba3524fb659dd6065affff8e
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 6b3c8a345d37d2cd9670ad6d94ce12c46a07f0b0 |
16-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am eb15716b: Change definition of warmup period
* commit 'eb15716b59020f342df62bce5b293f0603b94861':
Change definition of warmup period
|
| eb15716b59020f342df62bce5b293f0603b94861 |
13-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Change definition of warmup period
Previously, warmup was considered done as soon as any write() took
more than 0.5 nominal cycle time. In practice, this was always the
first write() that turned on power to the output path, and it didn't
accurately account for filling the full kernel buffer queue, or for
buffering in the HAL sample rate conversion.
Now warmup is considered done when a write() _after_ the first write
takes more than 0.5 nominal cycle time.
This will throttle the initial pull rate after coming out of standby.
When combined with another change to throttle the pull rate for
devices with HAL sample rate conversion, it may help reduce some of the
notification glitches. The only downside is that it will increase the
warmup time a bit.
Bug: 6508317, 6650846, 6607056
Change-Id: I39f324c5195578170a55308e9601d3a1b41db3e0
ervices/audioflinger/FastMixer.cpp
|
| a3ce152cac54d2519d596e1b1ece0cee9d41d496 |
15-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 972af221: FastMixer compensates for SRC jitter in audio HAL
* commit '972af221ae7253e406e0e1ea853e56a3010ed6b1':
FastMixer compensates for SRC jitter in audio HAL
|
| f6dca9f9101cac0fb2488b8f7691d4381476cab9 |
15-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Minor parameter restructuring"
|
| 11b7cdef9726f8270f12f6c393600e8fb3c469de |
15-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Minor parameter restructuring
Will make it easier to update HAL-level parameters.
Bug: 6243944
Change-Id: I3acac3c532de440d46755ce3e1d819ad5ed2e106
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 972af221ae7253e406e0e1ea853e56a3010ed6b1 |
14-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
FastMixer compensates for SRC jitter in audio HAL
Force a sleep if audio HAL write() returns too quickly.
Bug: 6661275
Change-Id: Ie810f5a087b89fb24dab229a0e500af1dee53571
ervices/audioflinger/FastMixer.cpp
|
| 6ff7918ba1c8b6b53c777dcb0b64992b5dd2a1f1 |
15-Jun-2012 |
James Dong <jdong@google.com> |
am fbb26f51: am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev
* commit 'fbb26f5101d9ef14251d561dba37f87d001fbbf6':
Fix track selection code in AwesomePlayer
|
| fbb26f5101d9ef14251d561dba37f87d001fbbf6 |
15-Jun-2012 |
James Dong <jdong@google.com> |
am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev
* commit 'fc42e16d96b7e1b18b573f40df1319c56f8ab933':
Fix track selection code in AwesomePlayer
|
| f865add6e370577bccb2db3f76f6ca6ab727866e |
15-Jun-2012 |
James Dong <jdong@google.com> |
am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev
* commit 'fc42e16d96b7e1b18b573f40df1319c56f8ab933':
Fix track selection code in AwesomePlayer
|
| fc42e16d96b7e1b18b573f40df1319c56f8ab933 |
15-Jun-2012 |
James Dong <jdong@google.com> |
Merge "Fix track selection code in AwesomePlayer" into jb-dev
|
| 4bb2253be6855ab2446fe2344a8a57487e3f5024 |
15-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am ff0fcb26: am 0a14c4ce: Make CPU frequency statistics optional
* commit 'ff0fcb2628613953f454875006bfb78c3fc087d3':
Make CPU frequency statistics optional
|
| 8234e627d1f786b3f93ba7c636a83a54811a9f98 |
15-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 0a14c4ce: Make CPU frequency statistics optional
* commit '0a14c4ce1a41bc09eb7855fa531a3af629a69139':
Make CPU frequency statistics optional
|
| ff0fcb2628613953f454875006bfb78c3fc087d3 |
15-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 0a14c4ce: Make CPU frequency statistics optional
* commit '0a14c4ce1a41bc09eb7855fa531a3af629a69139':
Make CPU frequency statistics optional
|
| 8a15dfba686b50f2b8163af247e236d52150321f |
15-Jun-2012 |
Insun Kang <insun@google.com> |
Fix track selection code in AwesomePlayer
Change-Id: I1c5a2f13f562a0ba253a93b4346cbe2c60099ddd
related-to-bug: 6671977
edia/libstagefright/AwesomePlayer.cpp
|
| e5a9440ca8308e7591cae76e3ba0903cbd10e0f8 |
15-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 59b9dffe: (-s ours) am 362ebcbf: DO NOT MERGE Remove log spam for fast track denied
* commit '59b9dffe570aac7c3f3826b64b03ad9cff0c59f0':
DO NOT MERGE Remove log spam for fast track denied
|
| 0a14c4ce1a41bc09eb7855fa531a3af629a69139 |
13-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Make CPU frequency statistics optional
Certain CPUs with dynamic cluster swapping and hotplug
don't report CPU frequency accurately. The file descriptors
used to read the frequency become stale and report bogus data.
So make this feature a build time option for debugging only.
This will also improve performance of the fast mixer loop.
Change-Id: I602f81ec3281a37992769208be08084ed1469e8c
ervices/audioflinger/Android.mk
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixer.h
|
| 1782ece2b2eb342c04bab424aaa4db4597a28930 |
15-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 362ebcbf: (-s ours) DO NOT MERGE Remove log spam for fast track denied
* commit '362ebcbf100f7fccd37551c77e67c4faa7241b63':
DO NOT MERGE Remove log spam for fast track denied
|
| 59b9dffe570aac7c3f3826b64b03ad9cff0c59f0 |
15-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 362ebcbf: DO NOT MERGE Remove log spam for fast track denied
* commit '362ebcbf100f7fccd37551c77e67c4faa7241b63':
DO NOT MERGE Remove log spam for fast track denied
|
| 362ebcbf100f7fccd37551c77e67c4faa7241b63 |
24-May-2012 |
Glenn Kasten <gkasten@google.com> |
DO NOT MERGE Remove log spam for fast track denied
Bug: 6531054
Change-Id: Iedf58e810a157aae88b5900da27c81054c437058
ervices/audioflinger/AudioFlinger.cpp
|
| fea3699c6921f50f404b6285d588894cee63d85f |
14-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
am be8cf4a2: am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev
* commit 'be8cf4a280b0aa786ba1aa3dad85d51125e0a86f':
stagefright: set scaling mode for blank frames
|
| be8cf4a280b0aa786ba1aa3dad85d51125e0a86f |
14-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev
* commit '7b4de10199f3a1803350e9a65baa671874d9c2f1':
stagefright: set scaling mode for blank frames
|
| 7b4de10199f3a1803350e9a65baa671874d9c2f1 |
14-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
Merge "stagefright: set scaling mode for blank frames" into jb-dev
|
| 627b9a3b4014fe6134493ab77e340b07cf4556d2 |
14-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 4ebbabda: am 192cbbad: Fix audio track pause.
* commit '4ebbabda6584aeb5ad2714e7db1702d00e84dad4':
Fix audio track pause.
|
| 4ebbabda6584aeb5ad2714e7db1702d00e84dad4 |
14-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 192cbbad: Fix audio track pause.
* commit '192cbbad773979a6fe3b5a0c223356de4fc3309c':
Fix audio track pause.
|
| 3297daae9681004775012faba9181d65e097e00c |
14-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add more dump information, connect HAL device dump
Bug: 6243944
Change-Id: I79a302f68786d815b9ab9984dbb31d237522416b
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| 1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27 |
14-Jun-2012 |
Jamie Gennis <jgennis@google.com> |
stagefright: set scaling mode for blank frames
This change sets the ANativeWindow scaling mode before pushing the blank frames
during decoder tear down.
Bug: 6603254
Change-Id: Ic64011645e2d3671b4a8d302ac7f39e6fd3affcd
edia/libstagefright/OMXCodec.cpp
|
| 192cbbad773979a6fe3b5a0c223356de4fc3309c |
13-Jun-2012 |
Eric Laurent <elaurent@google.com> |
Fix audio track pause.
AudioTrack::pause() should signal the control block condition
to release threads waiting for available buffers in obtainBuffer().
Otherwise the behavior relies on the timout on the condition
or the fact that audioflinger will mix a new audio buffer while executing
the pause.
Bug 6653769.
Change-Id: I5f8f73c471fe306070f30b814f32fd4b4dc1d575
edia/libmedia/AudioTrack.cpp
|
| 886e589546b71aad51e9260105d7752ce78ca942 |
14-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am c3c044ab: am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev
* commit 'c3c044ab1b2b5f9bebcff610795b6a1a9b60d01b':
Better handle invalid duration in Xing/VBRI tags
|
| 430aa1506245c42fa7106f3ee269b83143d53f34 |
14-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am ea1d16da: am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-dev
* commit 'ea1d16da8e28b30a58090e6372ce12d40b99c21f':
Shorten dumpsys media.audio_flinger output
|
| 1d6573032ecde54a466ca32951e101b41a05c797 |
14-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 48a0bfa6: am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
* commit '48a0bfa6f731386f2794ff36d6677d56e98fc6ea':
Log track name on obtain/releaseBuffer warnings
|
| bfe00d2e46531ef546cd9422a4d533070cbed8af |
14-Jun-2012 |
James Dong <jdong@google.com> |
am cc0df657: am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev
* commit 'cc0df657cdc8316c2b816c562f269be1706f00ea':
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
|
| 382c24a607857e644035dcf92e412c8044e75b81 |
14-Jun-2012 |
James Dong <jdong@google.com> |
am 8fe9840b: am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev
* commit '8fe9840be2ce6aac8a008fc15cb641f858b5a32e':
Fix one of the potential ANR issues from AwesomePlayer
|
| c3c044ab1b2b5f9bebcff610795b6a1a9b60d01b |
14-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev
* commit '82233b4b5bee06f11618a558ae465abbfdedfd6e':
Better handle invalid duration in Xing/VBRI tags
|
| 82233b4b5bee06f11618a558ae465abbfdedfd6e |
14-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev
|
| ea1d16da8e28b30a58090e6372ce12d40b99c21f |
14-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-dev
* commit 'e6adde403480333b613452ae0df442df9da4a5b2':
Shorten dumpsys media.audio_flinger output
|
| 48a0bfa6f731386f2794ff36d6677d56e98fc6ea |
14-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
* commit '49dd5cf3469cd755321f8ec10013ad4fcfaf723d':
Log track name on obtain/releaseBuffer warnings
|
| e6adde403480333b613452ae0df442df9da4a5b2 |
14-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Shorten dumpsys media.audio_flinger output" into jb-dev
|
| 49dd5cf3469cd755321f8ec10013ad4fcfaf723d |
14-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
|
| ed790412320527bf61798559ccf5e0ff8cb827ae |
14-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Improve error checking and debug logs."
|
| 239c0ddb4a783e4264537358b071637f0a9a6197 |
14-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Still image support"
|
| c92a2cc57a7d17103f252629626a0f9c0a6b1ccb |
14-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| cc0df657cdc8316c2b816c562f269be1706f00ea |
14-Jun-2012 |
James Dong <jdong@google.com> |
am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev
* commit 'e20435de10f63af812da9d4f801b61a8817733a0':
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
|
| e20435de10f63af812da9d4f801b61a8817733a0 |
14-Jun-2012 |
James Dong <jdong@google.com> |
Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev
|
| 8fe9840be2ce6aac8a008fc15cb641f858b5a32e |
14-Jun-2012 |
James Dong <jdong@google.com> |
am cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev
* commit 'cac467b3af9235229522a134d2c57e4fa605ba2f':
Fix one of the potential ANR issues from AwesomePlayer
|
| cac467b3af9235229522a134d2c57e4fa605ba2f |
14-Jun-2012 |
James Dong <jdong@google.com> |
Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev
|
| 5fd7d3a23316ec0d2320fece85201859b52c2aef |
13-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Better handle invalid duration in Xing/VBRI tags
b/6654637
Change-Id: Ie92eddd84ef5914b77dbadaacd80b4de6cd66e1c
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/XINGSeeker.cpp
|
| 3d51d5cb53cc630709a0ba78d0e60501a675f2d5 |
13-Jun-2012 |
James Dong <jdong@google.com> |
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26
related-to-bug: 6647465
amera/MODULE_LICENSE_APACHE2
amera/NOTICE
mds/stagefright/MODULE_LICENSE_APACHE2
mds/stagefright/NOTICE
rm/common/MODULE_LICENSE_APACHE2
rm/common/NOTICE
rm/drmserver/MODULE_LICENSE_APACHE2
rm/drmserver/NOTICE
rm/libdrmframework/MODULE_LICENSE_APACHE2
rm/libdrmframework/NOTICE
rm/libdrmframework/plugins/common/util/MODULE_LICENSE_APACHE2
rm/libdrmframework/plugins/common/util/NOTICE
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/MODULE_LICENSE_APACHE2
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/NOTICE
rm/libdrmframework/plugins/passthru/MODULE_LICENSE_APACHE2
rm/libdrmframework/plugins/passthru/NOTICE
edia/common_time/MODULE_LICENSE_APACHE2
edia/common_time/NOTICE
edia/libaah_rtp/MODULE_LICENSE_APACHE2
edia/libaah_rtp/NOTICE
edia/libeffects/downmix/MODULE_LICENSE_APACHE2
edia/libeffects/downmix/NOTICE
edia/libeffects/lvm/lib/MODULE_LICENSE_APACHE2
edia/libeffects/lvm/lib/NOTICE
edia/libeffects/lvm/wrapper/MODULE_LICENSE_APACHE2
edia/libeffects/lvm/wrapper/NOTICE
edia/libeffects/preprocessing/MODULE_LICENSE_APACHE2
edia/libeffects/preprocessing/NOTICE
edia/libeffects/testlibs/MODULE_LICENSE_APACHE2
edia/libeffects/testlibs/NOTICE
edia/libeffects/visualizer/MODULE_LICENSE_APACHE2
edia/libeffects/visualizer/NOTICE
edia/libmediaplayerservice/MODULE_LICENSE_APACHE2
edia/libmediaplayerservice/NOTICE
edia/libmediaplayerservice/nuplayer/MODULE_LICENSE_APACHE2
edia/libmediaplayerservice/nuplayer/NOTICE
edia/libstagefright/MODULE_LICENSE_APACHE2
edia/libstagefright/NOTICE
edia/libstagefright/codecs/aacdec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/aacdec/NOTICE
edia/libstagefright/codecs/aacenc/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/aacenc/NOTICE
edia/libstagefright/codecs/aacenc/SampleCode/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/aacenc/SampleCode/NOTICE
edia/libstagefright/codecs/amrnb/common/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/amrnb/common/NOTICE
edia/libstagefright/codecs/amrnb/dec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/amrnb/dec/NOTICE
edia/libstagefright/codecs/amrnb/enc/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/amrnb/enc/NOTICE
edia/libstagefright/codecs/amrwb/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/amrwb/NOTICE
edia/libstagefright/codecs/amrwbenc/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/amrwbenc/NOTICE
edia/libstagefright/codecs/amrwbenc/SampleCode/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/amrwbenc/SampleCode/NOTICE
edia/libstagefright/codecs/avc/common/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/avc/common/NOTICE
edia/libstagefright/codecs/avc/enc/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/avc/enc/NOTICE
edia/libstagefright/codecs/common/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/common/NOTICE
edia/libstagefright/codecs/flac/enc/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/flac/enc/NOTICE
edia/libstagefright/codecs/g711/dec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/g711/dec/NOTICE
edia/libstagefright/codecs/m4v_h263/dec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/m4v_h263/dec/NOTICE
edia/libstagefright/codecs/m4v_h263/enc/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/m4v_h263/enc/NOTICE
edia/libstagefright/codecs/mp3dec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/mp3dec/NOTICE
edia/libstagefright/codecs/raw/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/raw/NOTICE
edia/libstagefright/codecs/vorbis/dec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/vorbis/dec/NOTICE
edia/libstagefright/colorconversion/MODULE_LICENSE_APACHE2
edia/libstagefright/colorconversion/NOTICE
edia/libstagefright/foundation/MODULE_LICENSE_APACHE2
edia/libstagefright/foundation/NOTICE
edia/libstagefright/httplive/MODULE_LICENSE_APACHE2
edia/libstagefright/httplive/NOTICE
edia/libstagefright/id3/MODULE_LICENSE_APACHE2
edia/libstagefright/id3/NOTICE
edia/libstagefright/matroska/MODULE_LICENSE_APACHE2
edia/libstagefright/matroska/NOTICE
edia/libstagefright/mpeg2ts/MODULE_LICENSE_APACHE2
edia/libstagefright/mpeg2ts/NOTICE
edia/libstagefright/omx/MODULE_LICENSE_APACHE2
edia/libstagefright/omx/NOTICE
edia/libstagefright/omx/tests/MODULE_LICENSE_APACHE2
edia/libstagefright/omx/tests/NOTICE
edia/libstagefright/rtsp/MODULE_LICENSE_APACHE2
edia/libstagefright/rtsp/NOTICE
edia/libstagefright/tests/MODULE_LICENSE_APACHE2
edia/libstagefright/tests/NOTICE
edia/libstagefright/timedtext/MODULE_LICENSE_APACHE2
edia/libstagefright/timedtext/NOTICE
edia/libstagefright/yuv/MODULE_LICENSE_APACHE2
edia/libstagefright/yuv/NOTICE
edia/mediaserver/MODULE_LICENSE_APACHE2
edia/mediaserver/NOTICE
edia/mtp/MODULE_LICENSE_APACHE2
edia/mtp/NOTICE
ervices/audioflinger/MODULE_LICENSE_APACHE2
ervices/audioflinger/NOTICE
ervices/camera/libcameraservice/MODULE_LICENSE_APACHE2
ervices/camera/libcameraservice/NOTICE
ervices/camera/tests/CameraServiceTest/MODULE_LICENSE_APACHE2
ervices/camera/tests/CameraServiceTest/NOTICE
|
| 868c0abe9f26852c217bc201b337e72c68f829b8 |
13-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Shorten dumpsys media.audio_flinger output
Don't include in FastMixer if it's not present.
This removes confusing clutter especially for devices
with a separate deep buffer output thread, or for the
duplicating thread and A2DP output thread.
Change-Id: I84933f5555593256f11ba0895ec915c09cf16963
ervices/audioflinger/FastMixer.cpp
|
| 0c9d26d187017f7fb028ab52a0fbc6395142faa4 |
31-May-2012 |
Glenn Kasten <gkasten@google.com> |
Log track name on obtain/releaseBuffer warnings
This should help diagnose problems by allowing us to correlate
the logs with the dumpsys media.audio_flinger output.
Change-Id: I8c7c592b4f87d13b0f29c66ce7a2f301a0f063c9
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 4ecfec32aca8749baeb634f7c961f804cb1e8f3e |
13-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Improve error checking and debug logs.
Bug: 6243944
Change-Id: Ie61d89b733af7d1f653443bf64b767456127a455
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
|
| d4bcfde6bf3e7b28e36f6ec66e6d9e5adebfa949 |
08-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Still image support
- Add stream / request creation for still image capture
- Add takePicture call
- Add callback handler
- Fix shutdown bugs (wait until requests have drained)
Bug: 6243944
Change-Id: Id73eb7090e61b40b90348d1eb262f641ea5f3229
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| 6ba1b84527e516e6ab47a72265c63d34ad06e958 |
13-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| ce3d3ef78d6512cc272d469e236fba4fca1189b0 |
13-Jun-2012 |
James Dong <jdong@google.com> |
Fix one of the potential ANR issues from AwesomePlayer
Change-Id: I8ac7bbb5fe219f65bdbdd223538fbac0575e2957
related-to-bug: 6565826
edia/libstagefright/AwesomePlayer.cpp
|
| b5a640652ced298deff033cea82dcee95095f2c9 |
13-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 02bd2969: am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer size" into jb-dev
* commit '02bd296991e7e8a17939419cf197a6747ea441de':
stagefright: fix AudioRecord callback buffer size
|
| 02bd296991e7e8a17939419cf197a6747ea441de |
13-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am b4ea1ab8: Merge "stagefright: fix AudioRecord callback buffer size" into jb-dev
* commit 'b4ea1ab821d652cb080910d4081f5f1318597a90':
stagefright: fix AudioRecord callback buffer size
|
| b4ea1ab821d652cb080910d4081f5f1318597a90 |
13-Jun-2012 |
Eric Laurent <elaurent@google.com> |
Merge "stagefright: fix AudioRecord callback buffer size" into jb-dev
|
| 3d3b5c873b79aacd89e8a638f7231b4f630387c1 |
13-Jun-2012 |
James Dong <jdong@google.com> |
am 92a6141e: am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec
* commit '92a6141ea0bae283c898a8542604f6b47e226fad':
Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec
|
| 92a6141ea0bae283c898a8542604f6b47e226fad |
13-Jun-2012 |
James Dong <jdong@google.com> |
am 958f463c: Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec
* commit '958f463c4cddba6437c86d5bfef68167f767ee66':
Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec
|
| 958f463c4cddba6437c86d5bfef68167f767ee66 |
13-Jun-2012 |
James Dong <jdong@google.com> |
Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and libstagefright_soft_vpxdec
Change-Id: Id4f1ef8dfc21731846a9862b8d12940a92fe99bb
related-to-bug: 6647465
edia/libstagefright/codecs/on2/dec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/on2/dec/NOTICE
edia/libstagefright/codecs/on2/h264dec/MODULE_LICENSE_APACHE2
edia/libstagefright/codecs/on2/h264dec/NOTICE
|
| e49f2b424318aa8e830e7a1338e5e32ab82992f9 |
13-Jun-2012 |
Eric Laurent <elaurent@google.com> |
stagefright: fix AudioRecord callback buffer size
Make sure that the maximum number of frames passed to
AudioSource by the AudioRecord callback always fits within
the maximum buffer size defined by kMaxBufferSize.
Also make sure that the total AudioRecord buffer size is more
than the minimum required.
Change-Id: I26a1f998e0cf75ac88b02e67ec9d8db3c0cca193
edia/libstagefright/AudioSource.cpp
|
| 25ba34e78e6528f2e3a7585c49b37d71c01a65e2 |
12-Jun-2012 |
James Dong <jdong@google.com> |
am 2f2366fb: am bd961f4c: Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-dev
* commit '2f2366fb763862b8063e51b6e0fdee9e25387f1a':
Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor
|
| 2f2366fb763862b8063e51b6e0fdee9e25387f1a |
12-Jun-2012 |
James Dong <jdong@google.com> |
am bd961f4c: Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-dev
* commit 'bd961f4c4d51c4fcfc4722d02383eb4263ef0ac5':
Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor
|
| bd961f4c4d51c4fcfc4722d02383eb4263ef0ac5 |
12-Jun-2012 |
James Dong <jdong@google.com> |
Merge "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-dev
|
| 4832fedbfe2c18c469ab198d9ac3c349cb797527 |
12-Jun-2012 |
James Dong <jdong@google.com> |
Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor
Change-Id: I19308c5fb0f39f8e696092186f4386e3dad06894
related-to-bug: 6647465
ibvideoeditor/lvpp/MODULE_LICENSE_APACHE2
ibvideoeditor/lvpp/NOTICE
ibvideoeditor/osal/src/MODULE_LICENSE_APACHE2
ibvideoeditor/osal/src/NOTICE
ibvideoeditor/vss/3gpwriter/src/MODULE_LICENSE_APACHE2
ibvideoeditor/vss/3gpwriter/src/NOTICE
ibvideoeditor/vss/mcs/src/MODULE_LICENSE_APACHE2
ibvideoeditor/vss/mcs/src/NOTICE
ibvideoeditor/vss/src/MODULE_LICENSE_APACHE2
ibvideoeditor/vss/src/NOTICE
ibvideoeditor/vss/stagefrightshells/src/MODULE_LICENSE_APACHE2
ibvideoeditor/vss/stagefrightshells/src/NOTICE
ibvideoeditor/vss/video_filters/src/MODULE_LICENSE_APACHE2
ibvideoeditor/vss/video_filters/src/NOTICE
|
| 310cd41ceb1f063022c26828bcdb8df6bdefa6cf |
12-Jun-2012 |
Dave Burke <daveburke@google.com> |
am 8f1dd6fd: am 10cf121f: Merge "Update make file" into jb-dev
* commit '8f1dd6fdc2f788492e5ca77344eac13755c304ff':
Update make file
|
| 66077f4a2e2a81392ee75cf620509692ff8abd09 |
12-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am c6a957fc: am b7706712: Merge "Fix gapless for deep buffers" into jb-dev
* commit 'c6a957fca84ee2a673a3b7363b481afcf4b7e784':
Fix gapless for deep buffers
|
| 525fa8f3b9d8e04ee87b19b213d8a96663547629 |
12-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am b8d07d4b: am 58c8db6b: Merge "Fix gapless playback" into jb-dev
* commit 'b8d07d4b8dce11cfb293e4b0f2232ec860e9ccd5':
Fix gapless playback
|
| 3a1e74ff42a4ac0edc22e4e99a3817381bd94d6c |
12-Jun-2012 |
James Dong <jdong@google.com> |
am ddc757ca: am 8a61dc02: Merge "Revert "Added some informational log messages to track down ANR related issues"" into jb-dev
* commit 'ddc757cacf0336f028aec11380387cfdf3b3089c':
Revert "Added some informational log messages to track down ANR related issues"
|
| 8cc3651c04e48b755dcc579bfa4f9a7e9391d6e7 |
12-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 57d9b728: am c15d6657: Add audio watchdog thread
* commit '57d9b72812d25dff1c33e37b8475a469accd0919':
Add audio watchdog thread
|
| 8f1dd6fdc2f788492e5ca77344eac13755c304ff |
12-Jun-2012 |
Dave Burke <daveburke@google.com> |
am 10cf121f: Merge "Update make file" into jb-dev
* commit '10cf121f7285e23c37264dab3bad7cffefd754b1':
Update make file
|
| c6a957fca84ee2a673a3b7363b481afcf4b7e784 |
12-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am b7706712: Merge "Fix gapless for deep buffers" into jb-dev
* commit 'b7706712938c55706c87724af7f6d2f2156b8d1b':
Fix gapless for deep buffers
|
| b8d07d4b8dce11cfb293e4b0f2232ec860e9ccd5 |
12-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am 58c8db6b: Merge "Fix gapless playback" into jb-dev
* commit '58c8db6b7667db7a3bdb9b4bdd973091a5b0202f':
Fix gapless playback
|
| ddc757cacf0336f028aec11380387cfdf3b3089c |
12-Jun-2012 |
James Dong <jdong@google.com> |
am 8a61dc02: Merge "Revert "Added some informational log messages to track down ANR related issues"" into jb-dev
* commit '8a61dc02dbbc325dee51f2e9c9f0bbc238759ec5':
Revert "Added some informational log messages to track down ANR related issues"
|
| 57d9b72812d25dff1c33e37b8475a469accd0919 |
12-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am c15d6657: Add audio watchdog thread
* commit 'c15d6657a17d7cef91f800f40d11760e2e7340af':
Add audio watchdog thread
|
| 10cf121f7285e23c37264dab3bad7cffefd754b1 |
12-Jun-2012 |
Dave Burke <daveburke@google.com> |
Merge "Update make file" into jb-dev
|
| e836757109be3e8fa8e187124573c100beec4e6f |
12-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| c68f4a226fc5af54a882b0603d3051793a781037 |
12-Jun-2012 |
Dave Burke <daveburke@google.com> |
Update make file
Change-Id: I7dbd128245f584df2689457df0dd12ce888cf8ef
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
|
| b7706712938c55706c87724af7f6d2f2156b8d1b |
12-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Fix gapless for deep buffers" into jb-dev
|
| d791e094da5698c787f8db28ca5d5d490c512cf1 |
12-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Fix gapless for deep buffers
Forward current flags to next output.
b/6645676
Change-Id: I584f7a67472d99cbd6bc38f3fe84763331d115d1
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 58c8db6b7667db7a3bdb9b4bdd973091a5b0202f |
12-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Fix gapless playback" into jb-dev
|
| 67295b543c16ed7c77b67f859d598fe7b4571660 |
11-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Fix gapless playback
On some devices the actual framecount per buffer of an AudioTrack
will be different than what was requested, which prevented the
track from being reused. Now we create a new AudioTrack with the
requested parameters, and then compare it to the track we already
have. If they match, we throw away the new track and reuse the
existing one.
b/6644559
Change-Id: Id3e8c4460436f52e59b98ecaeb01c94f02877c1d
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| a4419420b0598413314a79c7ce3954a2e27686aa |
11-Jun-2012 |
Martin Storsjo <martin@martin.st> |
am b5325c8a: stagefright aacenc: Move system headers before local headers
* commit 'b5325c8a8fff4d735c24d9a8138e4213ee0833d5':
stagefright aacenc: Move system headers before local headers
|
| b5325c8a8fff4d735c24d9a8138e4213ee0833d5 |
23-May-2012 |
Martin Storsjo <martin@martin.st> |
stagefright aacenc: Move system headers before local headers
This avoids issues with the encoder's own definition of __inline,
which conflicts with headers brought in by string.h in glibc.
Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
edia/libstagefright/codecs/aacenc/src/adj_thr.c
|
| 8a61dc02dbbc325dee51f2e9c9f0bbc238759ec5 |
11-Jun-2012 |
James Dong <jdong@google.com> |
Merge "Revert "Added some informational log messages to track down ANR related issues"" into jb-dev
|
| c15d6657a17d7cef91f800f40d11760e2e7340af |
30-May-2012 |
Glenn Kasten <gkasten@google.com> |
Add audio watchdog thread
Change-Id: I4ed62087bd6554179abb8258d2da606050e762c0
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioWatchdog.cpp
ervices/audioflinger/AudioWatchdog.h
|
| 01e5b5699fb049bedbb7e156fbf7f5952c39130d |
11-Jun-2012 |
James Dong <jdong@google.com> |
Revert "Added some informational log messages to track down ANR related issues"
This reverts commit c558fa89016ba9583049b84dc57e66a913cabde8.
related-to-bug: 6565826
edia/libstagefright/OMXCodec.cpp
|
| 50581b2037f33847245ce251063fdb87449d3bf4 |
11-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7f9b2192: Reconcile with jb-release
* commit '7f9b21922e176f0d28a0932b3e402dc2f7edafbd':
Reduce underruns in screen off, esp. with EQ
|
| 7f9b21922e176f0d28a0932b3e402dc2f7edafbd |
11-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: Id132825de97a186047a6189a92abde9f5c087a5a
|
| 553b2babf5010e0972d6aa7d11c84383835672d9 |
11-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 617df15263c0827a20acca6341c5e986b02ab644 |
08-Jun-2012 |
Martin Storsjo <martin@martin.st> |
am 93eb01fd: stagefright aacenc: Add parentheses in expression with mixed && and ||
* commit '93eb01fd39e31b7532932f60828abf11a494fb8f':
stagefright aacenc: Add parentheses in expression with mixed && and ||
|
| 93eb01fd39e31b7532932f60828abf11a494fb8f |
12-Jan-2012 |
Martin Storsjo <martin@martin.st> |
stagefright aacenc: Add parentheses in expression with mixed && and ||
This doesn't maintain the exact behaviour, but seems closer to
what the original author probably intended.
This avoids a warning.
Change-Id: I191292faa0a25f715f2b7d46ec770827e2ac0b7b
edia/libstagefright/codecs/aacenc/src/aacenc.c
|
| f78bb81e2944ae21feff55797c0b6779c8c65ebe |
08-Jun-2012 |
James Dong <jdong@google.com> |
am 281a5040: am b7acdfb8: Merge "Fix green or corrupted video frames in the exported movies" into jb-dev
* commit '281a5040c92ff652d890b66e3ed9c081da39ee15':
Fix green or corrupted video frames in the exported movies
|
| 281a5040c92ff652d890b66e3ed9c081da39ee15 |
08-Jun-2012 |
James Dong <jdong@google.com> |
am b7acdfb8: Merge "Fix green or corrupted video frames in the exported movies" into jb-dev
* commit 'b7acdfb8068bf408ed859dfdd441b4a8722eb12a':
Fix green or corrupted video frames in the exported movies
|
| b7acdfb8068bf408ed859dfdd441b4a8722eb12a |
08-Jun-2012 |
James Dong <jdong@google.com> |
Merge "Fix green or corrupted video frames in the exported movies" into jb-dev
|
| a2d00e1b6634af9867737c74a7eba9dbe234c128 |
07-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Reduce underruns in screen off, esp. with EQ
Add MonoPipe APIs to specify setpoint.
Use screen state to configure pipe setpoint.
Fix a long-standing bug where pipe sleep time was excessive,
which interacted poorly with governor and low clock frequencies.
Now it deducts the elapsed time since last write(),
which was significant when there was EQ and low clock frequency.
Bug: 6618373
Change-Id: I6f3b0072c2244aeb033ef0795ad164491a164ff5
nclude/media/AudioParameter.h
edia/libmedia/AudioParameter.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/MonoPipe.cpp
ervices/audioflinger/MonoPipe.h
|
| 796078f96c8a15fefcea70e666b22ea67cc35301 |
08-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am ea5008d8: am 28ed2f93: Reduce underruns in screen off, esp. with EQ
* commit 'ea5008d8abfdf1479b4efa266cdb7c842d168aa9':
Reduce underruns in screen off, esp. with EQ
|
| ea5008d8abfdf1479b4efa266cdb7c842d168aa9 |
08-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 28ed2f93: Reduce underruns in screen off, esp. with EQ
* commit '28ed2f93324988767b5658eba7c1fa781a275183':
Reduce underruns in screen off, esp. with EQ
|
| 28ed2f93324988767b5658eba7c1fa781a275183 |
07-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Reduce underruns in screen off, esp. with EQ
Add MonoPipe APIs to specify setpoint.
Use screen state to configure pipe setpoint.
Fix a long-standing bug where pipe sleep time was excessive,
which interacted poorly with governor and low clock frequencies.
Now it deducts the elapsed time since last write(),
which was significant when there was EQ and low clock frequency.
Bug: 6618373
Change-Id: I6f3b0072c2244aeb033ef0795ad164491a164ff5
nclude/media/AudioParameter.h
edia/libmedia/AudioParameter.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/MonoPipe.cpp
ervices/audioflinger/MonoPipe.h
|
| a9300fd3d84cc07bbfa702e2fad3b32a5ebfd337 |
08-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Copy metadata buffers for streaming."
|
| 0e0dc7a60d605648ba11af4a55e2b99d4a544c50 |
08-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Improve ANativeWindow handling"
|
| da953c31c084d03fb964cb487134a363f97d2823 |
08-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Minor bugfixes and cleanup"
|
| e9fd4e80c965b77c8d196f2624a2604f44463df6 |
08-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Add setParameters call"
|
| 02c892280bed166745ff36809da5b802e71c4aeb |
08-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge changes I82c9811c,Id0294300
* changes:
Camera2: Add basic concurrency guards.
Camera2: Add internal parameter state to dump.
|
| 4ab2d8d734cafe4942c006544558266d4e55340c |
08-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Use new param structure, improve static camera info queries"
|
| 231d20944fee81328985145d40c3becc38f3b43c |
08-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 3e1e78ccd5936111f31a709592f11aa7c677c42d |
05-Jun-2012 |
James Dong <jdong@google.com> |
Fix green or corrupted video frames in the exported movies
At least two use cases are affected: trimming and transition clip generation.
If the starting time of the transition or the trimming position is not the same as
that of any existing video frame, the video frame right before the transition
starting position or the trimming position must be encoded as the the first video
frame for the transtion or the trimmed video, and it is encoded as a key frame.
This frame was not saved without the patch.
In the transcoding phrase, since we could not find such a frame, the existing
code did not return an error, and incorrectly used some other frame to serve
as the reference key frame for the remaining video frames of the transition or
the trimmed video. As a result, we may see corrupted or green video frames in
the exported movies.
The fix is to always save the frame right before the trimming position or
the transition starting time, so that a key frame will always be encoded, and
the right reference frame is used for remaining video frames. In addition,
checks are added to prevent from future mistakes to use incorrect reference frames.
Patch was originally contributed by teng.hong@nxp.com
Change-Id: I182784d4c1786224445224634edab3338bf2278f
related-to-bug: 5713461
ibvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| bdbf0c6f1a11d6fd9b71aa765f7de39e248557ba |
08-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 98e2e030: am a4f7e0e9: audioflinger: fix duplicating thread standby
* commit '98e2e030231ce99a4796d34d39a7517078d6735e':
audioflinger: fix duplicating thread standby
|
| 98e2e030231ce99a4796d34d39a7517078d6735e |
08-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am a4f7e0e9: audioflinger: fix duplicating thread standby
* commit 'a4f7e0e9a0e92a063f1b3a08988cf46e2cf1fa94':
audioflinger: fix duplicating thread standby
|
| a4f7e0e9a0e92a063f1b3a08988cf46e2cf1fa94 |
08-Jun-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix duplicating thread standby
The code that waits for a track presentation to be complete
before disabling it caused a regression for duplicating threads.
Because of the way output tracks activity is managed, the number
of frames output by the duplicating thread would never
reach the target set for a track to be considered presented.
The track would not be removed from active list and the thread would
not go to standby and keep its wakelock held.
Bug 6606922.
Change-Id: I4b46b420ac4cbf79a86b6791ae6589d407b01c92
ervices/audioflinger/AudioFlinger.cpp
|
| 6ed1ed1b3aa6fe01a72fa1c9fea3d6946adc3048 |
07-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Copy metadata buffers for streaming.
Using the passed-in buffer directly is incorrect; copy them so that
concurrent access can be controlled, and ownership is clear.
Bug: 6243944
Change-Id: Iad22c0dc166b7739e6c5dbfa39aac631b974c95a
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| bd4976a1651d5973836454f8a56871226ec000b5 |
07-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Improve ANativeWindow handling
- Properly set up scaling mode and transform on stream create
- More error checking/verbose logs on enqueue/dequeue
Bug: 6243944
Change-Id: Ic814e7f84a2016ed46ee2eb6832474f741f7cfd1
ervices/camera/libcameraservice/Camera2Device.cpp
|
| bd47b7bcfe7f5a97fef81143f4282c41590626fe |
07-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Minor bugfixes and cleanup
- Use CameraParameter-defined enum strings instead of writing our own
- Remember last window binder sent properly
Bug: 6243944
Change-Id: I68b1d042becaa6ebb4776fd2865dc0a29db7b87e
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 6861a4e9f929c2cb4a3131244e01e676c5b28f55 |
07-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add setParameters call
- Validate new parameters and transfer to internal parameters
- Add several utility functions to convert between CameraParameter
strings and camera2/internal parameter enums
Bug: 6243944
Change-Id: I323798dbfa028066f4963a6357766a781dde7cb6
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 349d79668ea4ca078400995c70d5d3201e8d9ea1 |
07-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am d89dea16: am e35a55fb: Merge "Take latency and current time into account for visualization" into jb-dev
* commit 'd89dea161ff3c3da515c02928cad4a9c73b23312':
Take latency and current time into account for visualization
|
| d89dea161ff3c3da515c02928cad4a9c73b23312 |
07-Jun-2012 |
Marco Nelissen <marcone@google.com> |
am e35a55fb: Merge "Take latency and current time into account for visualization" into jb-dev
* commit 'e35a55fbdff5a695ee35ff43f1466a62fb75662b':
Take latency and current time into account for visualization
|
| e35a55fbdff5a695ee35ff43f1466a62fb75662b |
07-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Take latency and current time into account for visualization" into jb-dev
|
| ac45eb3dfa7347f7b8c98be1111b2a5f9e344c46 |
07-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add basic concurrency guards.
- Serialize access through ICamera interface
- Serialize access to internal parameter structure
Bug: 6243944
Change-Id: I82c9811c1d059b2bca5cca7e3d73890120dbbe59
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 7f61084a428a5c7afbeff2fa9e9839baf9018020 |
07-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Add internal parameter state to dump.
Bug: 6243944
Change-Id: Id02943001ef92a9c5717b295eb4af1a18669b08b
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 3cca136b73b0f4d058019230eb2070cc23e2bbb0 |
07-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Use new param structure, improve static camera info queries
- Stop using CameraParameters for internal parameter storage, use a
straightforward structure instead.
- Improve querying for camera static characteristics for creating
defaults for API-facing CameraParameters.
Bug: 6243944
Change-Id: I965cdca7b242ef10ac1be931ebe7c186f997bb63
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
|
| 6685cf4fdfe4b9bdfd8e87c04165c08a436abcf7 |
07-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 6a070e79: am 9a0d82df: audioflinger: modify fast mixer overrun management
* commit '6a070e7941d3a521680116bfa2d0c99cd90c7502':
audioflinger: modify fast mixer overrun management
|
| 6a070e7941d3a521680116bfa2d0c99cd90c7502 |
07-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 9a0d82df: audioflinger: modify fast mixer overrun management
* commit '9a0d82df8fd681257bc5b29fb5e6c65fcc7cef5a':
audioflinger: modify fast mixer overrun management
|
| f06c2ed50e1db871ae9eb2bd15a196064f8c278c |
06-Jun-2012 |
Marco Nelissen <marcone@google.com> |
Take latency and current time into account for visualization
Buffer more data, and return the data that is currently being
output from the audio output, to ensure that visualizations are
smooth and responsive even when the audio output has a large
latency and/or large buffers.
b/6522728
Change-Id: I401637f01be7600b3c594a55c869036c13b206c0
edia/libeffects/visualizer/EffectVisualizer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 38a5e7d1d5c86d6c0ed706d6cf4e52c6892ec331 |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am bb866c2b: Reconcile with jb-release
* commit 'bb866c2bb2c8688378a6cb43ff09d64515ba30e6':
|
| bb866c2bb2c8688378a6cb43ff09d64515ba30e6 |
07-Jun-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: I08692b2be6cd851d6dcfc1a56113837cb2cc219e
|
| 9a0d82df8fd681257bc5b29fb5e6c65fcc7cef5a |
06-Jun-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: modify fast mixer overrun management
Do not force sleep when an overrun occurs. This was for non
blocking audio HAL and is unused.
Keep statistics on overruns.
Bug 6605215.
Change-Id: I295455d4562201aa3814c88bdd6e52c9226712af
ervices/audioflinger/FastMixer.cpp
|
| 1a51503b6f71c4f934c6f54ec99a4b87a8ddf052 |
06-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| a88ed026402d92d699c336aa11267616007e4a9d |
05-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 717f9b73: am 67c0a58e: audioflinger: various fixes on direct output
* commit '717f9b7392b0fc3ba15b018c923b85e64c0662b5':
audioflinger: various fixes on direct output
|
| 717f9b7392b0fc3ba15b018c923b85e64c0662b5 |
05-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 67c0a58e: audioflinger: various fixes on direct output
* commit '67c0a58e05f4c19d4a6f01fe6f06267d57b49305':
audioflinger: various fixes on direct output
|
| 67c0a58e05f4c19d4a6f01fe6f06267d57b49305 |
02-May-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: various fixes on direct output
Various fixes in direct output playback thread implementation:
- threadLoop_write() was broken for playback threads that do not
use a pipe sink.
- output buffer size calculation was hard coded for stereo.
- removed software volume that was implemented for PCM stereo
format only: the audio HAL has to implement volume if needed
for direct outputs.
Change-Id: If211b4489be9af395435707b8cf0388cce1347b2
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
|
| b86f92d552c391f5d2471bd4f979135be2578578 |
05-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am e506084e: am ab9071b8: audioflinger: fix active sleep time calculation.
* commit 'e506084e1c22f8f1797b9dc3eb789a699efd45c3':
audioflinger: fix active sleep time calculation.
|
| 16dca47d465d39a65031453a2d9fb9432dd0d11f |
05-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| e506084e1c22f8f1797b9dc3eb789a699efd45c3 |
05-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am ab9071b8: audioflinger: fix active sleep time calculation.
* commit 'ab9071b8d1b375418eb797c9a790da71de644344':
audioflinger: fix active sleep time calculation.
|
| ab9071b8d1b375418eb797c9a790da71de644344 |
04-Jun-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix active sleep time calculation.
When an audioTrack underruns, the audioflinger mixer thread
sleeps for a certain time to give the app a chance to recover.
This time is based on the reported audio HAL latency.
Some audio HALs implementing deep buffering have a variable
latency and this creates a problem if the sleep time is cached
when the output stream is opened and not updated afterwards.
This change derives the active sleep time from the mix buffer
framecount instead of the latency. This is more conservative
but works for variable latency.
Bug 6588525.
Change-Id: Ia892fc290fe06f836565c3ae15f7a2ce026c88c6
ervices/audioflinger/AudioFlinger.cpp
|
| 24a2fd0113da60785ce5af5dd905f8aaf9e0f0a1 |
04-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am f335f182: am 39993085: State queue dump
* commit 'f335f182e4b50249ac34b41da3566ddb016cc816':
State queue dump
|
| f335f182e4b50249ac34b41da3566ddb016cc816 |
04-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 39993085: State queue dump
* commit '399930859a75d806ce0ef124ac22025ae4ef0549':
State queue dump
|
| 5385b7b0f5d922ee38f8a54f11ee4462ef4b5e29 |
04-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 2c00676c: am 1295bb4d: Fast track dumpsys
* commit '2c00676cd34d78460ad610a4a4fd7a68544a7b7d':
Fast track dumpsys
|
| 399930859a75d806ce0ef124ac22025ae4ef0549 |
31-May-2012 |
Glenn Kasten <gkasten@google.com> |
State queue dump
Bug: 6591648
Change-Id: Iac75e5ea64e86640b3d890c46a636641b9733c6d
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/StateQueue.cpp
ervices/audioflinger/StateQueue.h
|
| 2c00676cd34d78460ad610a4a4fd7a68544a7b7d |
04-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 1295bb4d: Fast track dumpsys
* commit '1295bb4dcff7b29c75cd23746816df12a871d72c':
Fast track dumpsys
|
| 66a7a6e97efbf0005cdaaba40cdb01e5a4fb97cb |
04-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 510ba8b812d88f62968a2c9b0b638fff6d99ee84 |
03-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am f45dc2f1: am bf0d21fb: Count underruns for normal tracks also
* commit 'f45dc2f1751d9ac19826b99fab0b226f5c84570a':
Count underruns for normal tracks also
|
| f45dc2f1751d9ac19826b99fab0b226f5c84570a |
03-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am bf0d21fb: Count underruns for normal tracks also
* commit 'bf0d21fb1310e8677caa53b90e8c3aecebc7fc13':
Count underruns for normal tracks also
|
| 1295bb4dcff7b29c75cd23746816df12a871d72c |
31-May-2012 |
Glenn Kasten <gkasten@google.com> |
Fast track dumpsys
Bug: 6591648
Change-Id: I696f51c682e7233ba690d97da26012084989b412
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixer.h
|
| ad2c249a660f8ff81597dab00aaba1118b4a4342 |
03-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 33350528: am 81787e56: Merge "Was calculating measured warmup time wrong" into jb-dev
* commit '333505280fd86cf91bd97096bfa5a3fb524d84c1':
Was calculating measured warmup time wrong
|
| 333505280fd86cf91bd97096bfa5a3fb524d84c1 |
03-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 81787e56: Merge "Was calculating measured warmup time wrong" into jb-dev
* commit '81787e56f8f21407eade5accc50c6da39b8af9b2':
Was calculating measured warmup time wrong
|
| bf0d21fb1310e8677caa53b90e8c3aecebc7fc13 |
31-May-2012 |
Glenn Kasten <gkasten@google.com> |
Count underruns for normal tracks also
Bug: 6591648
Change-Id: Iff9cabe392bb2ce97062603adb9c9dc7aa4170d5
ervices/audioflinger/AudioFlinger.cpp
|
| 81787e56f8f21407eade5accc50c6da39b8af9b2 |
03-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Was calculating measured warmup time wrong" into jb-dev
|
| a00aaeb32d1e94a7e9c17df6ad792fea53327afc |
03-Jun-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 35d7bfc359b3aa87ade92d1ab55c6992418cad48 |
01-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 92e5ee95: am 7dc5b165: Merge "Fix fast track leak if out of normal track names" into jb-dev
* commit '92e5ee9548542513791a70c81e0cd3fd70397269':
Fix fast track leak if out of normal track names
|
| 68edcad7d1619a648e0988ac40cc23e61200c2a2 |
01-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am a0991fea: am 0c22272f: Merge "Pipe throttle based on requested frame count" into jb-dev
* commit 'a0991fea7b7047206ba8da573952d0c19d1bc4e7':
Pipe throttle based on requested frame count
|
| 92e5ee9548542513791a70c81e0cd3fd70397269 |
01-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 7dc5b165: Merge "Fix fast track leak if out of normal track names" into jb-dev
* commit '7dc5b165d4f98a2059eaf1c7fec20b3b5773cd4c':
Fix fast track leak if out of normal track names
|
| a0991fea7b7047206ba8da573952d0c19d1bc4e7 |
01-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
am 0c22272f: Merge "Pipe throttle based on requested frame count" into jb-dev
* commit '0c22272f1c97fd4b7e106030a1fd5e6b50680b61':
Pipe throttle based on requested frame count
|
| 7dc5b165d4f98a2059eaf1c7fec20b3b5773cd4c |
01-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix fast track leak if out of normal track names" into jb-dev
|
| 0c22272f1c97fd4b7e106030a1fd5e6b50680b61 |
01-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Pipe throttle based on requested frame count" into jb-dev
|
| 04a4ca4217e9b30342d5865024c340013d7184e8 |
01-Jun-2012 |
Glenn Kasten <gkasten@google.com> |
Was calculating measured warmup time wrong
Bug: 6592923
Change-Id: I980c6fc69d78c569147ea44ce33a7f8a41739c91
ervices/audioflinger/FastMixer.cpp
|
| a7daa16ee5c2ec9cbb1b4c9dd195cbf9bb0173f7 |
01-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera2: Switch to using ATRACE"
|
| bcba3b909f35edc06626d09c568fc833b9701307 |
01-Jun-2012 |
Jeff Tinker <jtinker@google.com> |
am c9bdf9b4: am dadc0ddb: Part of fix for double spins & faster startup
* commit 'c9bdf9b442bd6bb8f59e8e25c145ac625ac07c54':
Part of fix for double spins & faster startup
|
| c9bdf9b442bd6bb8f59e8e25c145ac625ac07c54 |
01-Jun-2012 |
Jeff Tinker <jtinker@google.com> |
am dadc0ddb: Part of fix for double spins & faster startup
* commit 'dadc0ddbfe309086801b479ddc91c55eeb2a9cbb':
Part of fix for double spins & faster startup
|
| dadc0ddbfe309086801b479ddc91c55eeb2a9cbb |
01-Jun-2012 |
Jeff Tinker <jtinker@google.com> |
Part of fix for double spins & faster startup
This change alters the way that the media player
interacts with the Widevine adaptive streaming buffer
logic. It eliminates the reliance on cached buffer
duration to determine pause/play states and instead
only generates buffering events when the widevine
library is not producing data (i.e. when it is
buffering). This eliminates unnecessary pause and
rebuffer cycles, reducing startup time and the
frequency and duration of spinners.
Multi-repo commit, depends on related changes in vendor/widevine
Change-Id: I387db2decd83841775a8351bddf5a6381fe4104f
related-to-bug:6503294
related-to-bug:6463780
edia/libstagefright/AwesomePlayer.cpp
|
| 4f35be8ba68f59303ddfb122bb5778f5531169cb |
01-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 721e18b7: am 27d33134: Merge "Do not keep audio wake lock when apps underrun." into jb-dev
* commit '721e18b75824eae3f3e79c915f4800ecad5dac80':
Do not keep audio wake lock when apps underrun.
|
| 721e18b75824eae3f3e79c915f4800ecad5dac80 |
01-Jun-2012 |
Eric Laurent <elaurent@google.com> |
am 27d33134: Merge "Do not keep audio wake lock when apps underrun." into jb-dev
* commit '27d33134130379cc91d936cdc742700311901a9d':
Do not keep audio wake lock when apps underrun.
|
| 27d33134130379cc91d936cdc742700311901a9d |
01-Jun-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Do not keep audio wake lock when apps underrun." into jb-dev
|
| 00bb735e3716720e538eb3f45752bc9173a3b636 |
01-Jun-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera service: Minimally functional preview for camera 2 devices."
|
| 5c4dc385a4e214a5eef7fbcf1f7b0d0c37dc098d |
01-Jun-2012 |
James Dong <jdong@google.com> |
am 386f04ea: am cafc53c0: Fix another buffer overflow issue
* commit '386f04ea89f858ae1a1865b6d92ae30a87930151':
Fix another buffer overflow issue
|
| 386f04ea89f858ae1a1865b6d92ae30a87930151 |
01-Jun-2012 |
James Dong <jdong@google.com> |
am cafc53c0: Fix another buffer overflow issue
* commit 'cafc53c0ac77c2aa7564cea26120da6bc0c589f2':
Fix another buffer overflow issue
|
| cafc53c0ac77c2aa7564cea26120da6bc0c589f2 |
31-May-2012 |
James Dong <jdong@google.com> |
Fix another buffer overflow issue
Using hard-coded length value easily leads to buffer overflow.
Refactor the code a bit to make it more readable, and more
extensible, and less subject to the buffer overflow coding error.
Patch originally contributed by teng.hong@nxp.com
Change-Id: Id262915302ccea8ae3b0121bf39890ab463aeeb7
related-to-bug: 6328360
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
|
| a189097d0c96fac9afa86e644312ffbb0027b124 |
31-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Switch to using ATRACE
Bug: 6243944
Change-Id: Ib2aa1875c72b20ae764d9de95b4122b736738df2
ervices/camera/libcameraservice/Camera2Client.cpp
|
| 893a05479c96f911d02beb0443da3ed6508143a7 |
30-May-2012 |
Glenn Kasten <gkasten@google.com> |
Fix fast track leak if out of normal track names
Bug: 6580402
Change-Id: I3ac7f012062c35833147f47ba822eb4bf532a824
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| df839841d2db4cb8e2acb10205b3942622b3e7a2 |
31-May-2012 |
Eric Laurent <elaurent@google.com> |
Do not keep audio wake lock when apps underrun.
Do not automatically restart an AudioTrack after an underrun
if the callback is executed but no data is written by the app.
Bug 6541286.
Change-Id: I11e7ab8dc968d7ff087058fec68f44490d3a7731
edia/libmedia/AudioTrack.cpp
|
| 6db981c45a964f0d9df4c3451f064dff7954d78e |
22-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera service: Minimally functional preview for camera 2 devices.
- Camera app starts up
- Basic preview operation with defaults
- Shutdown sequence is very minimal
Bug: 6243944
Change-Id: I67673b7c1fc08956d218d99f9171e74a7a82bf07
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
|
| 611f61998863d3a3ffae4e5f2b723b7319c59ddf |
31-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Add basic Camera2Client dump, minor fixes to CameraService dump.
Bug: 6243944
Change-Id: I52caaa6146050c38976768e99b0eeea1d13a3f51
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/CameraService.cpp
|
| a15ce1a9fdbe0d3bfde1360329396cc5552c3e22 |
31-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| a383a7e03686d746612007e58a894779ae63e994 |
31-May-2012 |
James Dong <jdong@google.com> |
am 3fc87370: am 83410a85: Avoid prematurely terminating parsing when some track only has a single access unit
* commit '3fc873706a73b0a6aa753057f1704988d6f1adf7':
Avoid prematurely terminating parsing when some track only has a single access unit
|
| 3fc873706a73b0a6aa753057f1704988d6f1adf7 |
31-May-2012 |
James Dong <jdong@google.com> |
am 83410a85: Avoid prematurely terminating parsing when some track only has a single access unit
* commit '83410a85993ad6f5f0c122036ff0bda42bf1d4f7':
Avoid prematurely terminating parsing when some track only has a single access unit
|
| 83410a85993ad6f5f0c122036ff0bda42bf1d4f7 |
31-May-2012 |
James Dong <jdong@google.com> |
Avoid prematurely terminating parsing when some track only has a single access unit
Patch was contributed by teng.hong@nxp.com
Change-Id: I0f56361d839f18627e512d18e86f51b58b9b0e05
related-to-bug: 6240789
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 820ba70df8ba595ae9055dfd34fdbfa32f70f14d |
31-May-2012 |
Glenn Kasten <gkasten@google.com> |
Pipe throttle based on requested frame count
Now does throttling based on the requested frame count, but
still permits overfilling pipe up to the rounded-up frame count.
Also still uses the larger frame count for non-blocking arithmetic.
Bug: 6585323
Change-Id: Ic2420a071419905524a14c22ebe1ce0e32d70a9d
ervices/audioflinger/MonoPipe.cpp
ervices/audioflinger/MonoPipe.h
|
| 529e888738a91ca70cbdeeabd982f8fb2947780c |
30-May-2012 |
Eric Laurent <elaurent@google.com> |
am 8c07f759: am 3bdb4fbf: Merge "audioflinger: fix effect problem during underrun" into jb-dev
* commit '8c07f7599a757fe51dc54253c480067cf01f13d3':
audioflinger: fix effect problem during underrun
|
| c65abc64bff11b194a0b416ec66e44f5ed957dcf |
30-May-2012 |
James Dong <jdong@google.com> |
am 3878fbed: am cc9833b5: Only send port settings changed if the number of channels and sample rate are both known to be valid.
* commit '3878fbedd8cd1f09aa2c1c2b6a44efd57c75e834':
Only send port settings changed if the number of channels and sample rate are both known to be valid.
|
| 8c07f7599a757fe51dc54253c480067cf01f13d3 |
30-May-2012 |
Eric Laurent <elaurent@google.com> |
am 3bdb4fbf: Merge "audioflinger: fix effect problem during underrun" into jb-dev
* commit '3bdb4fbfc6730b6edc0b1ee980141574ed54ed8d':
audioflinger: fix effect problem during underrun
|
| 3bdb4fbfc6730b6edc0b1ee980141574ed54ed8d |
30-May-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: fix effect problem during underrun" into jb-dev
|
| 3878fbedd8cd1f09aa2c1c2b6a44efd57c75e834 |
30-May-2012 |
James Dong <jdong@google.com> |
am cc9833b5: Only send port settings changed if the number of channels and sample rate are both known to be valid.
* commit 'cc9833b5db0e96f12daddb90a747fd146627377d':
Only send port settings changed if the number of channels and sample rate are both known to be valid.
|
| 9d1e267c831b21dcfd380ce36de0e5837f94aab3 |
30-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera service: Initialization for camera2 clients and devices"
|
| cc9833b5db0e96f12daddb90a747fd146627377d |
30-May-2012 |
James Dong <jdong@google.com> |
Only send port settings changed if the number of channels and sample rate are both known to be valid.
Change-Id: I9f8813eedc95db202488d8860cf485bdb8e69e11
related-to-bug: 6553089
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 91b14c4c144d0cc957a427cffc02ba10d0615677 |
30-May-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix effect problem during underrun
When an audio track underruns, the input buffer of the
corresponding effect chain (if any) must be cleared, otherwise
audio from previous mixer run will be fed again to the effect process
function.
Bug 6551652.
Change-Id: I5cd02196745f756c85af82d6937e9dc54369b37f
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| da4cb00ea329ac6d15d33ec67e85d76fed3154fa |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 7cc5eddc: Reconcile with jb-release
* commit '7cc5eddcab55c4e039d1bfaa746961ca510939be':
Added some informational log messages to track down ANR related issues
|
| 7cc5eddcab55c4e039d1bfaa746961ca510939be |
30-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: Ia7adbc708c661ef21a54ae85315de1b061d3cd53
|
| cdbd0874a7f823c4081341d648aac0200aece066 |
30-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 72b9d65607445ac7a887cd79191676137388de56 |
29-May-2012 |
James Dong <jdong@google.com> |
Added some informational log messages to track down ANR related issues
Change-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262
related-to-bug: 6565826
edia/libstagefright/OMXCodec.cpp
|
| 4e23cdbf3e9e0f49fd0b0bc5ffe39dedac270ac4 |
30-May-2012 |
Dave Burke <daveburke@google.com> |
am 16c4cc1e: am 4364d2d1: Merge "Precautionary logging to identify a potential infinite loop." into jb-dev
* commit '16c4cc1ecd9f907a34846117a3b3c7f59d9838ad':
Precautionary logging to identify a potential infinite loop.
|
| 16c4cc1ecd9f907a34846117a3b3c7f59d9838ad |
30-May-2012 |
Dave Burke <daveburke@google.com> |
am 4364d2d1: Merge "Precautionary logging to identify a potential infinite loop." into jb-dev
* commit '4364d2d1fd712faed7e839b58fedba3f48f626d0':
Precautionary logging to identify a potential infinite loop.
|
| 4364d2d1fd712faed7e839b58fedba3f48f626d0 |
30-May-2012 |
Dave Burke <daveburke@google.com> |
Merge "Precautionary logging to identify a potential infinite loop." into jb-dev
|
| 503775e4e2c3ead1cbd3c10561e3bdd90f2e70d5 |
30-May-2012 |
Dave Burke <daveburke@google.com> |
Precautionary logging to identify a potential infinite loop.
Bug: 6571063
Change-Id: I433659c6da333d5acd25ad03cb7f4a6ab0b6a4a5
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| c2f0cc7db9ddfe31fa92190fa035622ce78c93da |
30-May-2012 |
James Dong <jdong@google.com> |
am c5a5ebde: am c558fa89: Added some informational log messages to track down ANR related issues
* commit 'c5a5ebde7d14292e54532692fc9082051119fb80':
Added some informational log messages to track down ANR related issues
|
| c5a5ebde7d14292e54532692fc9082051119fb80 |
30-May-2012 |
James Dong <jdong@google.com> |
am c558fa89: Added some informational log messages to track down ANR related issues
* commit 'c558fa89016ba9583049b84dc57e66a913cabde8':
Added some informational log messages to track down ANR related issues
|
| c558fa89016ba9583049b84dc57e66a913cabde8 |
29-May-2012 |
James Dong <jdong@google.com> |
Added some informational log messages to track down ANR related issues
Change-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262
related-to-bug: 6565826
edia/libstagefright/OMXCodec.cpp
|
| f69c70ded4316ea3ee504ac779bd024433ed4ef7 |
21-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera service: Initialization for camera2 clients and devices
- Refactor initialization code to hide device type from CameraService
- Add metadata queue class to Camera2Device
- Initialization of Camera2Device, Camera2Client
- Conversion from HAL2 device static metadata to camera API
parameters.
Bug: 6243944
Change-Id: I524145b45438e906d8493dae202704ce8f090aeb
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
ervices/camera/libcameraservice/CameraClient.cpp
ervices/camera/libcameraservice/CameraClient.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| dd72c3017aef65d099460cfc6c0402bc2ba85bc3 |
29-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am 89b7f7ff: (-s ours) am 0bbf868d: Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev
* commit '89b7f7ff8e198916d79b0f59184bc5dd444a4dd4':
DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock
|
| 89b7f7ff8e198916d79b0f59184bc5dd444a4dd4 |
29-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am 0bbf868d: Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev
* commit '0bbf868d53f55646651db6717468faeac618859d':
DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock
|
| 0bbf868d53f55646651db6717468faeac618859d |
29-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev
|
| c9be8e558eba00cdb152102433b6873f3aff5c81 |
29-May-2012 |
Andreas Huber <andih@google.com> |
am aeb1ce5f: am 91b0d43a: Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring." into jb-dev
* commit 'aeb1ce5fe2e23d89d2f3f00a7623741945d75b12':
Unwedge ACodec if allocating output buffers fails while reconfiguring.
|
| aeb1ce5fe2e23d89d2f3f00a7623741945d75b12 |
29-May-2012 |
Andreas Huber <andih@google.com> |
am 91b0d43a: Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring." into jb-dev
* commit '91b0d43a27b3a1cebd75270f953f3fb9fa4f2047':
Unwedge ACodec if allocating output buffers fails while reconfiguring.
|
| 91b0d43a27b3a1cebd75270f953f3fb9fa4f2047 |
29-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring." into jb-dev
|
| 755b9861197f1566f916785ba7d35cf86fd5b2d5 |
29-May-2012 |
Andreas Huber <andih@google.com> |
Unwedge ACodec if allocating output buffers fails while reconfiguring.
Change-Id: I871cf639167c01860e65c0408d3ce935f8f8f1ea
related-to-bug: 6571060
edia/libstagefright/ACodec.cpp
|
| 09cf462a265c3e9bc84c518cc75d77a5b1d69012 |
29-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock
- Caused by already held lock in camera service
- Introduce one more lock, mICameraLock, to control access to camera
client through ICamera binder interface.
- mLock is released before calling HAL takePicture, allowing HAL
callbacks to access camera client during takePicture processing.
Bug: 5804701
Change-Id: Ibcef4857a2c844c964afefa70f9cdccdd0a55fd0
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 11e76918956ac4d4a4a43c70e25552b38fdf0cf1 |
29-May-2012 |
Andreas Huber <andih@google.com> |
am 35a14476: am 40fe18f2: Force shutdown of the omx decoder even if it\'s in a wedged state...
* commit '35a144765f0403bf93765a01691c898e38b4ef55':
Force shutdown of the omx decoder even if it's in a wedged state...
|
| 35a144765f0403bf93765a01691c898e38b4ef55 |
29-May-2012 |
Andreas Huber <andih@google.com> |
am 40fe18f2: Force shutdown of the omx decoder even if it\'s in a wedged state...
* commit '40fe18f20e07f3626ff23d89ebdd5113733e155d':
Force shutdown of the omx decoder even if it's in a wedged state...
|
| 40fe18f20e07f3626ff23d89ebdd5113733e155d |
29-May-2012 |
Andreas Huber <andih@google.com> |
Force shutdown of the omx decoder even if it's in a wedged state...
Change-Id: I5899928a3df4bcf7715769992955a0b834db1e2f
related-to-bug: 6571060
edia/libstagefright/OMXCodec.cpp
|
| 6f2e351fd2c4664fad9c0fdf8669c1b915a892e0 |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 49ce8ae3: Reconcile with jb-release nakasi-factoryrom-release
* commit '49ce8ae3e4dc78b9ae093dcc20a584f7701d4e6c':
audioflinger: change session check in createTrack.
Revert "Revert "Revert to PV for AAC codec for FactoryROM.""
|
| 49ce8ae3e4dc78b9ae093dcc20a584f7701d4e6c |
29-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I51f6059054379d1cc1cc4bc6080f3bb48cf77a48
|
| ffe09e3e50ae9977eb2f998668721d3028e2287e |
29-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 713468b9710b4cfb6e563c9f69e16a8a6372a5a4 |
25-May-2012 |
Martin Storsjo <martin@martin.st> |
am f8321d62: stagefright aacenc: Fix reading out of bounds in pow2_xy
* commit 'f8321d624f4bbbfcf01d59f346d3eb390f75f24c':
stagefright aacenc: Fix reading out of bounds in pow2_xy
|
| f8321d624f4bbbfcf01d59f346d3eb390f75f24c |
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
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.c
|
| 342fdb573ae0ca387e72b615129fc34ad275ca30 |
25-May-2012 |
Dave Burke <daveburke@google.com> |
am f6554832: am 6350e21e: Merge "Property to enable AAC 5.1 pass-through." into jb-dev
* commit 'f655483263128529bc01aa1c2e80c229a2d169b8':
Property to enable AAC 5.1 pass-through.
|
| f655483263128529bc01aa1c2e80c229a2d169b8 |
25-May-2012 |
Dave Burke <daveburke@google.com> |
am 6350e21e: Merge "Property to enable AAC 5.1 pass-through." into jb-dev
* commit '6350e21e8947398a94402bc2969d13d407fbc3fb':
Property to enable AAC 5.1 pass-through.
|
| 6350e21e8947398a94402bc2969d13d407fbc3fb |
25-May-2012 |
Dave Burke <daveburke@google.com> |
Merge "Property to enable AAC 5.1 pass-through." into jb-dev
|
| 1adacd921319ec52fac1a4596ab6eaf8689e6a7d |
23-May-2012 |
Dave Burke <daveburke@google.com> |
Property to enable AAC 5.1 pass-through.
Bug: 6275957
Change-Id: I8debdce872fc8287a4f6340f1790e02c075886e3
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| c2adf7108037fc188915f47505ebbf8bfc7c82da |
25-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 61b0ca86: am c9d0294e: Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-dev
* commit '61b0ca86d3d853172ccc147256a64a9fd2ba6606':
Prevent occurences of clipping in loud downmixed scenes
|
| 61b0ca86d3d853172ccc147256a64a9fd2ba6606 |
25-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am c9d0294e: Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-dev
* commit 'c9d0294e0526510267a0c4148a0dbc0449bed223':
Prevent occurences of clipping in loud downmixed scenes
|
| c9d0294e0526510267a0c4148a0dbc0449bed223 |
25-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-dev
|
| aeef495a2de6bec7270d8400df03b2724937dca4 |
24-May-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: change session check in createTrack.
Do not refuse to create a track on an output thread if the same session
is present on another thread. It is now possible that two tracks
with the same session ID are on different threads if one can use deep
buffering and the other can't.
In this case, move effects attached to this session to the output
thread ion which the new track is created.
Bug 6530324.
Change-Id: I9019b3ee382e374c89d2319033afcfa7f886e4c4
ervices/audioflinger/AudioFlinger.cpp
|
| 55fddda7ae1cee9de86446e1842e072349de1bc4 |
25-May-2012 |
James Dong <jdong@google.com> |
am 41ced0ad: am 49fcd3cc: Fix an error caused by sample size value by order
* commit '41ced0ade8a90f071e85fe1cf49f073c0738e95a':
Fix an error caused by sample size value by order
|
| 41ced0ade8a90f071e85fe1cf49f073c0738e95a |
25-May-2012 |
James Dong <jdong@google.com> |
am 49fcd3cc: Fix an error caused by sample size value by order
* commit '49fcd3cc0c0bf352c5c0516e53805278e94951ca':
Fix an error caused by sample size value by order
|
| 49fcd3cc0c0bf352c5c0516e53805278e94951ca |
25-May-2012 |
James Dong <jdong@google.com> |
Fix an error caused by sample size value by order
The sample size was saved in the array in network order, but it was treated as host order when
writeInt32() is called. Calling write(void *, int, int) resolves the issue.
related-to-bug: 6555366
Change-Id: If7ef99911ad65108c61b533673ac4d4cd580a370
edia/libstagefright/MPEG4Writer.cpp
|
| aea2715e65994e665a3732551880419ba1cecc0d |
24-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Prevent occurences of clipping in loud downmixed scenes
The downmixer effect is a mixer, wich, like the platform mixer,
hard-clips. To prevent clipping during loud scenes across multiple
chanels, apply a fixed attenuation on the result of the downmix.
Note that this attenuation is lower the theoretical required
attenuation (except for quad and surround) but is adequate for
most content.
Bug 4280902
Change-Id: Iec520e9f1367284d6102633f532429361717692d
edia/libeffects/downmix/EffectDownmix.c
|
| 6d80297a55ab12759ee00b7f99fa97584b430da0 |
24-May-2012 |
Eric Laurent <elaurent@google.com> |
am 0cc62570: am f436fdcf: audioflinger: change session check in createTrack.
* commit '0cc6257030d3e6c649ea3ad807ecb9327ceb5b3e':
audioflinger: change session check in createTrack.
|
| 0cc6257030d3e6c649ea3ad807ecb9327ceb5b3e |
24-May-2012 |
Eric Laurent <elaurent@google.com> |
am f436fdcf: audioflinger: change session check in createTrack.
* commit 'f436fdcf93bd417fd3c9d2a8b19fd221d894b5e3':
audioflinger: change session check in createTrack.
|
| f436fdcf93bd417fd3c9d2a8b19fd221d894b5e3 |
24-May-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: change session check in createTrack.
Do not refuse to create a track on an output thread if the same session
is present on another thread. It is now possible that two tracks
with the same session ID are on different threads if one can use deep
buffering and the other can't.
In this case, move effects attached to this session to the output
thread ion which the new track is created.
Bug 6530324.
Change-Id: I9019b3ee382e374c89d2319033afcfa7f886e4c4
ervices/audioflinger/AudioFlinger.cpp
|
| 3545690e39ff7033c906d12d8bb77a06013d3f3c |
24-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove log spam for fast track denied"
|
| c2522525436414852d0d3f634765f452b00977e7 |
24-May-2012 |
The Android Automerger <android-build@android.com> |
Revert "Revert "Revert to PV for AAC codec for FactoryROM.""
This reverts commit c9ef89cd40bea216046ed28e5366f8ac361d3dd4.
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
|
| 461efc50b1a217ec8eac8b7f6786df29d53c0b37 |
24-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| 329aa61818987fe079868bc22c0e237d578b184b |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 74ea96c7: Reconcile with jb-release nakasi-factoryrom-release
* commit '74ea96c7a7e9bf647c4201a060229e24a115c376':
Revert "Revert "Revert to PV for AAC codec for FactoryROM.""
|
| 74ea96c7a7e9bf647c4201a060229e24a115c376 |
24-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Id5f721d64bceada4e4d00fc49e0564af0497778d
|
| 852fca99e25db8d2180c2622ca55fca676490a08 |
24-May-2012 |
Glenn Kasten <gkasten@google.com> |
Remove log spam for fast track denied
Bug: 6531054
Change-Id: Iedf58e810a157aae88b5900da27c81054c437058
ervices/audioflinger/AudioFlinger.cpp
|
| 4b9866e32b15e3512c8a6f84e2709ff542522991 |
24-May-2012 |
Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> |
am 4719fa8a: libstagefright/matroska: Fix build with gcc 4.7
* commit '4719fa8ae1259d6a94ba5b5ecdaa01e69f553996':
libstagefright/matroska: Fix build with gcc 4.7
|
| 54b05aa7b48e77c95fe5e7f30fcd940b690c2119 |
24-May-2012 |
Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> |
am 3c8889e8: libmedia: Fix build with gcc 4.7
* commit '3c8889e827d95b195fe5ba077a01cb5b6042e534':
libmedia: Fix build with gcc 4.7
|
| 4719fa8ae1259d6a94ba5b5ecdaa01e69f553996 |
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>
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 3c8889e827d95b195fe5ba077a01cb5b6042e534 |
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>
edia/libmedia/MediaProfiles.cpp
|
| a6d7da4e897d5201423f7c205d48c1c1a4a07e17 |
23-May-2012 |
Kei Takahashi <KeiA.Takahashi@jp.sony.com> |
am cba7b32d: Add a new API on DRM Framework for streaming
* commit 'cba7b32d8f2c47632313f54118ed3733b4b02cc8':
Add a new API on DRM Framework for streaming
|
| cba7b32d8f2c47632313f54118ed3733b4b02cc8 |
18-Jan-2012 |
Kei Takahashi <KeiA.Takahashi@jp.sony.com> |
Add a new API on DRM Framework for streaming
In case of DRM streaming, decrypt session can start just after
receiving the header, and it doesn't need to wait for the entire
content. However, current API of DRM framework only accepts file
handle or URI. With this new API, DRM session can start
without waiting for the entire content.
Changes are made by SEMC and Sony.
Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
rm/common/DrmEngineBase.cpp
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
nclude/drm/DrmManagerClient.h
|
| 3587c3c77d924687608226271aeb3e70cb0731ff |
23-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 90886550eaf41e2255c99065667ac40b812b1c1b |
23-May-2012 |
Eric Laurent <elaurent@google.com> |
am cf0bf78c: am e737cda6: audioflinger: refine latency latency calculation.
* commit 'cf0bf78c28cf25c30c42c784c1dc5bc094e6035d':
audioflinger: refine latency latency calculation.
|
| cf0bf78c28cf25c30c42c784c1dc5bc094e6035d |
23-May-2012 |
Eric Laurent <elaurent@google.com> |
am e737cda6: audioflinger: refine latency latency calculation.
* commit 'e737cda649acbfa43fc1b74612a83f2fac9aa449':
audioflinger: refine latency latency calculation.
|
| e737cda649acbfa43fc1b74612a83f2fac9aa449 |
23-May-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: refine latency latency calculation.
There is an audio pipe between the normal mixer output and the fast
mixer to cope for scheduling delays and buffer size difference.
This pipe depth was not taken into account in latency calculation.
Adding the pipe contribution to the latency significantly improves A/V sync.
Bug 6520569.
Change-Id: I5584908e8aa8a02170eb38b22b4370eea800a235
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/MonoPipe.h
|
| 4417ec0bed2575853b3ef904b105e954e3e5756d |
22-May-2012 |
Andreas Huber <andih@google.com> |
am 73e9a35c: am 8d9846c0: Merge "Tell surface flinger that we want to protect output buffers from being" into jb-dev
* commit '73e9a35c41efe4dac6b05387a9dafecdc662f140':
Tell surface flinger that we want to protect output buffers from being
|
| 56b6f9c33a8318db543a59b7da34fec0d50f8c44 |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am a508b3d7: Reconcile with jb-release
* commit 'a508b3d74454664e209e315ba9296b53cf50c13d':
|
| ea1151ac33f9327a44a6c7b80c1c15586c0f380c |
22-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 25a25ebd: am 67e54402: Merge "Keep a copy of most recent audio played" into jb-dev
* commit '25a25ebdd1cca5fa42ef20d4d55c3e49da294380':
Keep a copy of most recent audio played
|
| a97f9a2e731a45d9fb9be904161073aff523e483 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
Revert "Revert "Revert to PV for AAC codec for FactoryROM.""
This reverts commit c9ef89cd40bea216046ed28e5366f8ac361d3dd4.
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
|
| 73e9a35c41efe4dac6b05387a9dafecdc662f140 |
22-May-2012 |
Andreas Huber <andih@google.com> |
am 8d9846c0: Merge "Tell surface flinger that we want to protect output buffers from being" into jb-dev
* commit '8d9846c0693b7651b243f0161caa86be506f764a':
Tell surface flinger that we want to protect output buffers from being
|
| 8d9846c0693b7651b243f0161caa86be506f764a |
22-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Tell surface flinger that we want to protect output buffers from being" into jb-dev
|
| 97e0cd6fd56f8fe0faea1620fb90ed252bfec805 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| a508b3d74454664e209e315ba9296b53cf50c13d |
22-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release
Change-Id: I1f173833b337368c87084eccddb4d9b7d46294fd
|
| bc098410be55f9d96f394b3981a0c482b83859b6 |
22-May-2012 |
Andreas Huber <andih@google.com> |
Tell surface flinger that we want to protect output buffers from being
sent to HDMI (without HDCP) and push a few black frames on IDLE->LOADED
similar to OMXCodec's behaviour.
Change-Id: Iea6055a115151ca881220a70a31af6ade2c58cb3
related-to-bug: 6537187
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/NuMediaExtractor.cpp
|
| 25a25ebdd1cca5fa42ef20d4d55c3e49da294380 |
22-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 67e54402: Merge "Keep a copy of most recent audio played" into jb-dev
* commit '67e5440202cc442621c352756537ead31fca80cf':
Keep a copy of most recent audio played
|
| 67e5440202cc442621c352756537ead31fca80cf |
22-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Keep a copy of most recent audio played" into jb-dev
|
| 5f325ffb086e86f7f3ef5ff84db2ba156d6514af |
22-May-2012 |
Andreas Huber <andih@google.com> |
am bbc09405: am a6490c65: Only mark the audio player as started if it did so successfully.
* commit 'bbc0940562f8cb6cbf19750246eb259b43a5a698':
Only mark the audio player as started if it did so successfully.
|
| 56d88b5efe61b541be3b05cc08873afe8efeaccc |
22-May-2012 |
Andreas Huber <andih@google.com> |
am d684da86: am 4575beb3: Revert "Stop audio source if AudioPlayer could not be started"
* commit 'd684da86233357b51f0dc096bbe840892165bb3e':
Revert "Stop audio source if AudioPlayer could not be started"
|
| bbc0940562f8cb6cbf19750246eb259b43a5a698 |
22-May-2012 |
Andreas Huber <andih@google.com> |
am a6490c65: Only mark the audio player as started if it did so successfully.
* commit 'a6490c65f93e1cbe969fba499978e8d64214108a':
Only mark the audio player as started if it did so successfully.
|
| d684da86233357b51f0dc096bbe840892165bb3e |
22-May-2012 |
Andreas Huber <andih@google.com> |
am 4575beb3: Revert "Stop audio source if AudioPlayer could not be started"
* commit '4575beb3dea80e271eaa6619234fdc02e914e6e6':
Revert "Stop audio source if AudioPlayer could not be started"
|
| a6490c65f93e1cbe969fba499978e8d64214108a |
22-May-2012 |
Andreas Huber <andih@google.com> |
Only mark the audio player as started if it did so successfully.
Change-Id: I4683f5ca243f9f1b80990028d225d0f6c5973899
related-to-bug: 6500580
edia/libstagefright/AwesomePlayer.cpp
|
| 4575beb3dea80e271eaa6619234fdc02e914e6e6 |
22-May-2012 |
Andreas Huber <andih@google.com> |
Revert "Stop audio source if AudioPlayer could not be started"
This reverts commit 022048e95f3f1d65cb776cf21de2001423fcf7d9.
edia/libstagefright/AudioPlayer.cpp
|
| 3174ac1ba34f26d6f14812e22905007bde96cce9 |
22-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 9a653f65a5a781e535ec03f5e985451ff18306a9 |
22-May-2012 |
Dave Burke <daveburke@google.com> |
am 93a417da: am c9ef89cd: Revert "Revert to PV for AAC codec for FactoryROM."
* commit '93a417da48394ff929c9bb0b36cc3bef77a893a8':
Revert "Revert to PV for AAC codec for FactoryROM."
|
| 93a417da48394ff929c9bb0b36cc3bef77a893a8 |
22-May-2012 |
Dave Burke <daveburke@google.com> |
am c9ef89cd: Revert "Revert to PV for AAC codec for FactoryROM."
* commit 'c9ef89cd40bea216046ed28e5366f8ac361d3dd4':
Revert "Revert to PV for AAC codec for FactoryROM."
|
| 7b1ca56c5e84aa3aab8fffe8780138d1d5c796ed |
22-May-2012 |
Dave Burke <daveburke@google.com> |
am 96286ab6: am d7d79a2b: Revert to PV for AAC codec for FactoryROM.
* commit '96286ab6ec6dfa178f9356dc5f9595648eb37e60':
Revert to PV for AAC codec for FactoryROM.
|
| 96286ab6ec6dfa178f9356dc5f9595648eb37e60 |
22-May-2012 |
Dave Burke <daveburke@google.com> |
am d7d79a2b: Revert to PV for AAC codec for FactoryROM.
* commit 'd7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444':
Revert to PV for AAC codec for FactoryROM.
|
| c9ef89cd40bea216046ed28e5366f8ac361d3dd4 |
22-May-2012 |
Dave Burke <daveburke@google.com> |
Revert "Revert to PV for AAC codec for FactoryROM."
This reverts commit d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444.
Change-Id: I7076feab31ab64fccd364699280d821011edc099
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
|
| d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444 |
19-May-2012 |
Dave Burke <daveburke@google.com> |
Revert to PV for AAC codec for FactoryROM.
Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
|
| 7b037cc888789caebcc30d151042bce42e6bc3ec |
22-May-2012 |
Martin Storsjo <martin@martin.st> |
am 4b43b41e: stagefright avcenc: Use intptr_t for casting pointers to integers
* commit '4b43b41eaf8c4c80f66185e13620cf94b8b2ef5b':
stagefright avcenc: Use intptr_t for casting pointers to integers
|
| 4b43b41eaf8c4c80f66185e13620cf94b8b2ef5b |
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
edia/libstagefright/codecs/avc/enc/src/avcenc_api.cpp
edia/libstagefright/codecs/avc/enc/src/motion_comp.cpp
edia/libstagefright/codecs/avc/enc/src/sad_inline.h
|
| 07a10ef3992f7678a86b58b18a4c0c56f44cbf69 |
22-May-2012 |
Martin Storsjo <martin@martin.st> |
am 4e1d7b8d: stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
* commit '4e1d7b8d16abbe8a60fa3957646297b552e82fb0':
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
|
| 4e1d7b8d16abbe8a60fa3957646297b552e82fb0 |
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
edia/libstagefright/codecs/avc/common/src/deblock.cpp
edia/libstagefright/codecs/avc/enc/src/motion_comp.cpp
|
| d6a88612d3d048fcfcd770b4000a22878ea407b1 |
21-May-2012 |
James Dong <jdong@google.com> |
am 0c072553: am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
* commit '0c072553f20085b18e6204afc8818b7922bffa9d':
Fix a mediaserver crash caused by dereferencing a NULL pointer.
|
| ecceee9a00bca85721b99723f4e1d84f5f34d9b0 |
21-May-2012 |
Andreas Huber <andih@google.com> |
am ff29e486: am 9ec3547e: Merge "For an RTSP live stream we won\'t map rtp time to normal play time," into jb-dev
* commit 'ff29e48676ceca9655c37ebd9023d2e389c584e2':
For an RTSP live stream we won't map rtp time to normal play time,
|
| 726f992930f90090097964e7f6449238b0ebe56b |
21-May-2012 |
Andreas Huber <andih@google.com> |
am 602b8994: am cd8a36fd: Merge "Add more verbose ADTS error logging to SoftAAC." into jb-dev
* commit '602b899432e1540a8e874c9dfd73aaa9743d1b3b':
Add more verbose ADTS error logging to SoftAAC.
|
| d3536ed0a6016d363c684db38e4fa6cae380b2b4 |
21-May-2012 |
Andreas Huber <andih@google.com> |
am c86ae70b: am 91bfadb4: If we encounter an error during buffer allocation change state back
* commit 'c86ae70bf5a7ae7f62d3b5ea3f459aed4e362095':
If we encounter an error during buffer allocation change state back
|
| ced2fa7d626dfe831232fe1fd776eae941fd4dab |
21-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 44629a33: Reconcile with jb-release nakasi-factoryrom-release
* commit '44629a33690011863d97ca679de77aad3d2642e2':
|
| 9d1ca09772a8dd74900fd2fa416b846b448d4969 |
21-May-2012 |
Andreas Huber <andih@google.com> |
am 60359f49: am 8370c7ad: Instead of asserting on malformed ADTS headers or insufficient data,
* commit '60359f49d38c16d95b6e4f5c024e256b37d03f0c':
Instead of asserting on malformed ADTS headers or insufficient data,
|
| 2c19f57f03a6fda28d763c8c65ac5740977e33ec |
21-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 11a4b98d: am 7c2af29e: Merge "Add throttle to have pipe fill at more stable rate" into jb-dev
* commit '11a4b98d26dbce03ed2e97f4b1121995a09ed519':
Add throttle to have pipe fill at more stable rate
|
| 631d31a4002091503acf11d9aa6c59b3b6693266 |
21-May-2012 |
Dave Burke <daveburke@google.com> |
am e40d461e: am bf2461ec: Don\'t reconfigure stream after outputing data.
* commit 'e40d461e4826a8515aaa74779a1705ff1b1997ef':
Don't reconfigure stream after outputing data.
|
| 0dedfa41684a88440b71a81fa1f5b4215eb5c75e |
21-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 4e11a1ff: am 874a897f: Merge "systrace for audio" into jb-dev
* commit '4e11a1ffa708965cf91ea210daa5675a82149213':
systrace for audio
|
| 0c072553f20085b18e6204afc8818b7922bffa9d |
21-May-2012 |
James Dong <jdong@google.com> |
am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
* commit 'a92896f62d8f4a4a6ff61f26439ad61c210ce728':
Fix a mediaserver crash caused by dereferencing a NULL pointer.
|
| ff29e48676ceca9655c37ebd9023d2e389c584e2 |
21-May-2012 |
Andreas Huber <andih@google.com> |
am 9ec3547e: Merge "For an RTSP live stream we won\'t map rtp time to normal play time," into jb-dev
* commit '9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1':
For an RTSP live stream we won't map rtp time to normal play time,
|
| a92896f62d8f4a4a6ff61f26439ad61c210ce728 |
21-May-2012 |
James Dong <jdong@google.com> |
Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
|
| 9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1 |
21-May-2012 |
Andreas Huber <andih@google.com> |
Merge "For an RTSP live stream we won't map rtp time to normal play time," into jb-dev
|
| 21a0dca457bc0f3b8bafca0c49dfe2d442acbde0 |
21-May-2012 |
James Dong <jdong@google.com> |
Fix a mediaserver crash caused by dereferencing a NULL pointer.
The pointer (info in method drainInputBuffer) in can be null at the point of the dereference,
but it will get updated subsequently. Thus, we should move the logging after the pointer gets updated.
related-to-bug: 6530159
Change-Id: Ifa5f19a694953af6942454e5c28cd3fa024f11d2
edia/libstagefright/OMXCodec.cpp
|
| c2e70e40d8459f9e0094614e7c2e780afbbbd386 |
21-May-2012 |
Dave Burke <daveburke@google.com> |
am 896da3c8: am 441fbdea: Robustness - use defaults if we see bogus sample rate / channels from decoder.
* commit '896da3c8f8a1e252bf088f2602caf9f79296b875':
Robustness - use defaults if we see bogus sample rate / channels from decoder.
|
| 49652d7e7530e16d64a90636909f6e66f3e49dcf |
21-May-2012 |
Dave Burke <daveburke@google.com> |
am 00e7ebd0: am 3748b71a: Handle stream changes at any point in the stream.
* commit '00e7ebd0fc7674ab885dcddd09c1f53bf0423e69':
Handle stream changes at any point in the stream.
|
| 6c523b17df166edb63a0dd4fab1c93d1c3533923 |
21-May-2012 |
Dave Burke <daveburke@google.com> |
am 540b65bc: am 3eda271f: Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev
* commit '540b65bcd4cad71593abb49d305b01a807cf2a92':
Clear the decoder input buffer after it signalled an error to be able to continue.
|
| 11598145ebbdfe46853feb06ea27cae8e6447dfb |
21-May-2012 |
Andreas Huber <andih@google.com> |
am b5733a94: am 8dfa2282: Fixes parsing of PSI sections in MPEG2 transport streams
* commit 'b5733a9474cb8bf3f29965a0c5faa467238e015e':
Fixes parsing of PSI sections in MPEG2 transport streams
|
| aaf249522ab16636afe23c65e829e1ee31ff03c3 |
21-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 2123ae8c: am 55247760: Merge "Display pipe underrun counters in dumpsys" into jb-dev
* commit '2123ae8c171250950e5e4c51ec5afe6e61760e38':
Display pipe underrun counters in dumpsys
|
| aa014234be3c99f8de5ade596f54d674f7cf509e |
21-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 06d9729b: am c059bd42: Skip bad kHz values, and display them accurately
* commit '06d9729b00e9157440ea485faf2ea38e6d2eb23f':
Skip bad kHz values, and display them accurately
|
| 75b43f13e1bbf4f8462b97b7cc01ff08a1f924ce |
21-May-2012 |
Andreas Huber <andih@google.com> |
am d361f189: am e00e0485: Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev
* commit 'd361f18957a3470ef9c2e23d92039371f7105060':
Buffer at least 2 secs worth of data at startup of after a seek before
|
| 6a7325fdabbc19d8a8b217f0ae5de47341b56350 |
21-May-2012 |
Andreas Huber <andih@google.com> |
am 569a6fe3: am b33eaec7: Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-dev
* commit '569a6fe322da8cd3ae0bc37307254af1f91102d4':
Prefix MPEG4-generic audio data with ADTS headers
|
| a790fa33e481c784c2db8fadd529f468d5d7dcfe |
21-May-2012 |
Dave Burke <daveburke@google.com> |
am ece3dcfe: am 35c53ccd: Merge "Add informational logging to track 0 channel issue." into jb-dev
* commit 'ece3dcfe23ccd804293dbb408f0f680c94f7dd72':
Add informational logging to track 0 channel issue.
|
| d6b680b0e1cfa078df369d28ec0279d0b7ec8733 |
21-May-2012 |
James Dong <jdong@google.com> |
am cd160b17: am 022048e9: Stop audio source if AudioPlayer could not be started
* commit 'cd160b175dbccc4581131653e3fcd08b632150ca':
Stop audio source if AudioPlayer could not be started
|
| c6125a9ad2d966cc5acb6aacbc2caf38fd63c684 |
21-May-2012 |
Andreas Huber <andih@google.com> |
am 87cbe8ae: am 88ba895b: Merge "Stop extrapolating audio time from the anchor if we\'re paused or reached eos." into jb-dev
* commit '87cbe8aed7e6c9306df8c9c68a2fa82c24da66c3':
Stop extrapolating audio time from the anchor if we're paused or reached eos.
|
| fbae5dae5187aca9d974cbe15ec818e9c6f56705 |
21-May-2012 |
Glenn Kasten <gkasten@google.com> |
Keep a copy of most recent audio played
Change-Id: I6b2f97881c39998a2fae9ab79d669af6c0a37e94
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixerState.cpp
ervices/audioflinger/FastMixerState.h
ervices/audioflinger/PipeReader.cpp
|
| c9d1696d214d2175327067ccc1991bcb36976404 |
21-May-2012 |
Andreas Huber <andih@google.com> |
For an RTSP live stream we won't map rtp time to normal play time,
since we don't have the information necessary.
Change-Id: I3119fcc061c4b6756a69c6139ffdf013d806fee1
related-to-bug: 6528548
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
|
| 602b899432e1540a8e874c9dfd73aaa9743d1b3b |
21-May-2012 |
Andreas Huber <andih@google.com> |
am cd8a36fd: Merge "Add more verbose ADTS error logging to SoftAAC." into jb-dev
* commit 'cd8a36fdc49a823f78d45e8e1a464dc261553b26':
Add more verbose ADTS error logging to SoftAAC.
|
| cd8a36fdc49a823f78d45e8e1a464dc261553b26 |
21-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Add more verbose ADTS error logging to SoftAAC." into jb-dev
|
| e35ac2860e99d809a2ccca59bd4eb2f8c02d15ad |
21-May-2012 |
Andreas Huber <andih@google.com> |
Add more verbose ADTS error logging to SoftAAC.
and fix the corresponding code in SoftAAC2.
Change-Id: I6c745fb6e8e093708fdfe2861963b0a35fa7b912
related-to-bug: 6519161
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| c86ae70bf5a7ae7f62d3b5ea3f459aed4e362095 |
21-May-2012 |
Andreas Huber <andih@google.com> |
am 91bfadb4: If we encounter an error during buffer allocation change state back
* commit '91bfadb4aa75444c60e9949232de3c184cfe060a':
If we encounter an error during buffer allocation change state back
|
| 91bfadb4aa75444c60e9949232de3c184cfe060a |
21-May-2012 |
Andreas Huber <andih@google.com> |
If we encounter an error during buffer allocation change state back
to LOADED instead of remaining in the transitional state LOADED->IDLE
that won't properly handle flush or shutdown requests.
Change-Id: Ica1bf22eb884b220f18ed2a4f7a9c56eec228796
related-to-bug: 6516512
edia/libstagefright/ACodec.cpp
|
| 2fedd5ae24a781d6da3ac50a84d8831c0295882a |
20-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 9adb8218106c6d2af067ec1d3686865b416826fc |
19-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 894cf22b18c028163d4c943fc3635b87f481e594 |
19-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 44629a33690011863d97ca679de77aad3d2642e2 |
19-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I8efb3018010f96a9a7dbcf004172c6069ea62f95
|
| 60359f49d38c16d95b6e4f5c024e256b37d03f0c |
18-May-2012 |
Andreas Huber <andih@google.com> |
am 8370c7ad: Instead of asserting on malformed ADTS headers or insufficient data,
* commit '8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc':
Instead of asserting on malformed ADTS headers or insufficient data,
|
| 11a4b98d26dbce03ed2e97f4b1121995a09ed519 |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 7c2af29e: Merge "Add throttle to have pipe fill at more stable rate" into jb-dev
* commit '7c2af29ebced41b1b7ed32910cc9b587fb8bbf5c':
Add throttle to have pipe fill at more stable rate
|
| e40d461e4826a8515aaa74779a1705ff1b1997ef |
18-May-2012 |
Dave Burke <daveburke@google.com> |
am bf2461ec: Don\'t reconfigure stream after outputing data.
* commit 'bf2461ecc71c0aacf8c03fcdaf0dc46bc8285c7f':
Don't reconfigure stream after outputing data.
|
| 4e11a1ffa708965cf91ea210daa5675a82149213 |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 874a897f: Merge "systrace for audio" into jb-dev
* commit '874a897f09dc7b06679bb273506d7e0fa0152220':
systrace for audio
|
| 8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc |
18-May-2012 |
Andreas Huber <andih@google.com> |
Instead of asserting on malformed ADTS headers or insufficient data,
stop decoding and signal a runtime error.
Change-Id: Ib66a17a2908273f65a92999951439cc6f0752164
related-to-bug: 6519161
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 7c2af29ebced41b1b7ed32910cc9b587fb8bbf5c |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Add throttle to have pipe fill at more stable rate" into jb-dev
|
| 6d8aabe8a3be1ac0789d00b82c3ca8b81381f5ab |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
Add throttle to have pipe fill at more stable rate
Change-Id: Ibff9ab62764e2acd04518a4a00e25f19e28aff4a
ervices/audioflinger/MonoPipe.cpp
ervices/audioflinger/MonoPipe.h
|
| c8cb3092af78652e2bb4460bd74e282e061b479a |
18-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Camera service: Add skeleton support for camera2 devices."
|
| aa2eb417ffa7b00fc316cdf2d8c24cb094ef7048 |
18-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| bf2461ecc71c0aacf8c03fcdaf0dc46bc8285c7f |
18-May-2012 |
Dave Burke <daveburke@google.com> |
Don't reconfigure stream after outputing data.
Handle invalid configuration.
Bug: 6519161
Change-Id: Ib2d38bee769e63e627c93d7f3839c3a55de694e9
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 874a897f09dc7b06679bb273506d7e0fa0152220 |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "systrace for audio" into jb-dev
|
| 896da3c8f8a1e252bf088f2602caf9f79296b875 |
18-May-2012 |
Dave Burke <daveburke@google.com> |
am 441fbdea: Robustness - use defaults if we see bogus sample rate / channels from decoder.
* commit '441fbdea6e46ddc6b99fa864ab1edaa9759ec033':
Robustness - use defaults if we see bogus sample rate / channels from decoder.
|
| 441fbdea6e46ddc6b99fa864ab1edaa9759ec033 |
18-May-2012 |
Dave Burke <daveburke@google.com> |
Robustness - use defaults if we see bogus sample rate / channels from decoder.
Bug: 6498711
Change-Id: I6950d316a292cfd0cb516ee6d95b6af071b08fdc
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 00e7ebd0fc7674ab885dcddd09c1f53bf0423e69 |
18-May-2012 |
Dave Burke <daveburke@google.com> |
am 3748b71a: Handle stream changes at any point in the stream.
* commit '3748b71a7fe73b0365a93f1fd28ced14219f85e5':
Handle stream changes at any point in the stream.
|
| 3748b71a7fe73b0365a93f1fd28ced14219f85e5 |
18-May-2012 |
Dave Burke <daveburke@google.com> |
Handle stream changes at any point in the stream.
Also, handle discontinuity properly (was using wrong flag before).
Bug: 6498711
Change-Id: I18a6684f7dc96aa04b1e8113b54ec1053895ca98
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| 540b65bcd4cad71593abb49d305b01a807cf2a92 |
18-May-2012 |
Dave Burke <daveburke@google.com> |
am 3eda271f: Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev
* commit '3eda271f8b1879467759f98e5538577b1b6804f4':
Clear the decoder input buffer after it signalled an error to be able to continue.
|
| 3eda271f8b1879467759f98e5538577b1b6804f4 |
18-May-2012 |
Dave Burke <daveburke@google.com> |
Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev
|
| b5733a9474cb8bf3f29965a0c5faa467238e015e |
18-May-2012 |
Andreas Huber <andih@google.com> |
am 8dfa2282: Fixes parsing of PSI sections in MPEG2 transport streams
* commit '8dfa228201131da0bf3ba1d74c819c27c0500f6b':
Fixes parsing of PSI sections in MPEG2 transport streams
|
| 61ab9f93315ea817cd1ac110e2a95da4dab6b4d1 |
17-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Camera service: Add skeleton support for camera2 devices.
- Add Camera2Client, which maps the current android.hardware.Camera
API to the new camera2 semantics
- Add Camera2Device, a C++ wrapper for the HAL camera 2 device
No functionality besides create/destroy; all client methods return
error or null.
Bug: 6243944
Change-Id: I6bd5136fa1efd8279b8cd2d9847d9b0bb2862294
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/Camera2Client.cpp
ervices/camera/libcameraservice/Camera2Client.h
ervices/camera/libcameraservice/Camera2Device.cpp
ervices/camera/libcameraservice/Camera2Device.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 99c99d00beb43b939dedc9ffb07adb89f6a85ba5 |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
systrace for audio
Trace fast track buffer fill status for underruns etc.
Move the definition of macro to Android.mk.
No overhead if disabled.
Change-Id: If0e83e21b61b059ca38f543f8a6ffb58e08c79ee
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/FastMixer.cpp
|
| 8dfa228201131da0bf3ba1d74c819c27c0500f6b |
15-May-2012 |
Andreas Huber <andih@google.com> |
Fixes parsing of PSI sections in MPEG2 transport streams
They can span multiple transport stream packets, something the parser
previously did not support.
Change-Id: I78da6ffd2d422cceedb87aad61cba2062419e635
related-to-bug: 6166596
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
|
| e672a0eea2cdc2ed43e002f0583902f20705de57 |
18-May-2012 |
Andreas Huber <andih@google.com> |
Clear the decoder input buffer after it signalled an error to be able to continue.
Change-Id: I06d43723dea7688d63cfb05e7fc7754672788562
related-to-bug: 6419102
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 2123ae8c171250950e5e4c51ec5afe6e61760e38 |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 55247760: Merge "Display pipe underrun counters in dumpsys" into jb-dev
* commit '552477608b137fb66af126655c6865207a82d888':
Display pipe underrun counters in dumpsys
|
| 06d9729b00e9157440ea485faf2ea38e6d2eb23f |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
am c059bd42: Skip bad kHz values, and display them accurately
* commit 'c059bd4246c1b3944965be921e5b334d51cd236c':
Skip bad kHz values, and display them accurately
|
| 552477608b137fb66af126655c6865207a82d888 |
18-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Display pipe underrun counters in dumpsys" into jb-dev
|
| 7de245bf7d12ddb2f8a44b3452f56af21fb7e368 |
18-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 8c21080d: am cd28dc10: Merge "Stereo downmixer supports generic configurations. Fix 7.1 downmix" into jb-dev
* commit '8c21080d6651f415672d59da9ca53fba68a1ae3f':
Stereo downmixer supports generic configurations. Fix 7.1 downmix
|
| 88cbea8a918bbaf5e06e48aadd5af5e81d58d232 |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
Display pipe underrun counters in dumpsys
The normal mixer writes it's submix to a pipe, which is read by the fast
mixer. Now dumpsys media.audio_flinger display the raw underrun counters
when fast mixer tries to pull from the pipe but doesn't get enough frames.
Change-Id: I72505f149f9e12802784da654a651d43734e1c79
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| c059bd4246c1b3944965be921e5b334d51cd236c |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
Skip bad kHz values, and display them accurately
One device reports zero CPU kHz occasionally, so skip those values.
Preserve accuracy of the low-order 4 bits of the the CPU frequency.
Change-Id: I7d934f697412277462464fca82d112d0306a214e
ervices/audioflinger/FastMixer.cpp
|
| d361f18957a3470ef9c2e23d92039371f7105060 |
17-May-2012 |
Andreas Huber <andih@google.com> |
am e00e0485: Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev
* commit 'e00e0485b0aa1e432be8c639da0eb5285942777b':
Buffer at least 2 secs worth of data at startup of after a seek before
|
| e00e0485b0aa1e432be8c639da0eb5285942777b |
17-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev
|
| bfd4d0d9fe0033abf3f55b94f30f6a58846a875e |
17-May-2012 |
Andreas Huber <andih@google.com> |
Buffer at least 2 secs worth of data at startup of after a seek before
resuming starting RTSP playback.
Change-Id: I060c6c7fd627ab7ebd5c095ddcfdb4cc0f637aad
related-to-bug: 6364126
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
|
| 569a6fe322da8cd3ae0bc37307254af1f91102d4 |
17-May-2012 |
Andreas Huber <andih@google.com> |
am b33eaec7: Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-dev
* commit 'b33eaec751d712c237e1c1b53a18a259456fa682':
Prefix MPEG4-generic audio data with ADTS headers
|
| b33eaec751d712c237e1c1b53a18a259456fa682 |
17-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-dev
|
| ece3dcfe23ccd804293dbb408f0f680c94f7dd72 |
17-May-2012 |
Dave Burke <daveburke@google.com> |
am 35c53ccd: Merge "Add informational logging to track 0 channel issue." into jb-dev
* commit '35c53ccdc1be56879ba25956bf2284d2cff7c3c4':
Add informational logging to track 0 channel issue.
|
| 35c53ccdc1be56879ba25956bf2284d2cff7c3c4 |
17-May-2012 |
Dave Burke <daveburke@google.com> |
Merge "Add informational logging to track 0 channel issue." into jb-dev
|
| e893150187191299002626c75232f8985189cb0d |
17-May-2012 |
Dave Burke <daveburke@google.com> |
Add informational logging to track 0 channel issue.
Bug #: 6498711
Change-Id: I952777923569511a171fe8b79eab579625eda073
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 8647bbe4420ca487467318404127f52c567e346b |
17-May-2012 |
Andreas Huber <andih@google.com> |
Prefix MPEG4-generic audio data with ADTS headers
to work around limitations of the new AAC decoder.
Change-Id: I4988c7c39fedb7d04eb1ae2ba2d618aa6cb14e77
related-to-bug: 6488547
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPAssembler.cpp
edia/libstagefright/rtsp/ARTPAssembler.h
|
| cd160b175dbccc4581131653e3fcd08b632150ca |
17-May-2012 |
James Dong <jdong@google.com> |
am 022048e9: Stop audio source if AudioPlayer could not be started
* commit '022048e95f3f1d65cb776cf21de2001423fcf7d9':
Stop audio source if AudioPlayer could not be started
|
| 022048e95f3f1d65cb776cf21de2001423fcf7d9 |
17-May-2012 |
James Dong <jdong@google.com> |
Stop audio source if AudioPlayer could not be started
related-to-bug: 6500580
Change-Id: If47e442db2f1ea400e9b598502bb48513f28cd6d
edia/libstagefright/AudioPlayer.cpp
|
| 44631c2939369e66df7021b1f359ded319971d26 |
17-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Break out CameraClient from CameraService."
|
| 87cbe8aed7e6c9306df8c9c68a2fa82c24da66c3 |
17-May-2012 |
Andreas Huber <andih@google.com> |
am 88ba895b: Merge "Stop extrapolating audio time from the anchor if we\'re paused or reached eos." into jb-dev
* commit '88ba895b5ddd8b3da364c3ceacdb698224ee746f':
Stop extrapolating audio time from the anchor if we're paused or reached eos.
|
| 88ba895b5ddd8b3da364c3ceacdb698224ee746f |
17-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Stop extrapolating audio time from the anchor if we're paused or reached eos." into jb-dev
|
| cbb8a89cd4c3e9825771a2725f862eeddded2ea6 |
17-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 5e08d60617fc63c2e41f9069ff89f5c00db2617d |
16-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Break out CameraClient from CameraService.
To allow for different low-level implementations of the current camera
API, the Client class inside CameraService has to be inheritable. This
change breaks it up into the common section accessed by the camera
service, and the full implementation for camera device HAL version 1.
The full implementation is moved out to CameraClient.h/.cpp.
There are no functionality changes, just code reorganization.
Bug: 6243944
Change-Id: I8a79b31a3ae3617198dc6bb5576a9f2e2d9c95de
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/CameraClient.cpp
ervices/camera/libcameraservice/CameraClient.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| ba3c33da6a8ecda13e584c617f3ae9a06a27fbaf |
17-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Remove old fake camera.
The fake camera implementation was moved to the emulator a while back.
No reason to keep around this old broken code that's not used
anywhere.
Change-Id: I5dd87f766821d6e85c5eefb7122047d4ec4a3225
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraHardwareStub.h
ervices/camera/libcameraservice/CannedJpeg.h
ervices/camera/libcameraservice/FakeCamera.cpp
ervices/camera/libcameraservice/FakeCamera.h
|
| 8c21080d6651f415672d59da9ca53fba68a1ae3f |
16-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am cd28dc10: Merge "Stereo downmixer supports generic configurations. Fix 7.1 downmix" into jb-dev
* commit 'cd28dc10d49c359566c69d48a29a6f0d3eefa6d9':
Stereo downmixer supports generic configurations. Fix 7.1 downmix
|
| cd28dc10d49c359566c69d48a29a6f0d3eefa6d9 |
16-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Stereo downmixer supports generic configurations. Fix 7.1 downmix" into jb-dev
|
| 6895deeecc8797e6f5b28e7d07ec6bc499355c0c |
16-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Stereo downmixer supports generic configurations. Fix 7.1 downmix
Added a generic downmixer to stereo function to handle the
multichannel configurations not supported by the dedicated
downmix functions.
It first verifies the mask is supported, and then derives
channel indices for the downmix.
Added support for forcing the generic downmixer to be always
used instead of the format-specific functions (define
DOWNMIX_ALWAYS_USE_GENERIC_DOWNMIXER to force it).
Fixed 7.1 downmix function where handling of accumulate vs
overwrite was inversed.
Bug 4280902
Change-Id: I8259b32c4e90f76ef4dcd803592fc71df4ae90c5
edia/libeffects/downmix/EffectDownmix.c
edia/libeffects/downmix/EffectDownmix.h
|
| 8ceaedfe124f6c9e51610a7dc2270579f8264fa7 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 8954fb1f: Reconcile with jb-release nakasi-factoryrom-release
* commit '8954fb1f92d25be2b0f111f5d83a1ef311b8d579':
Fix static track activity ref counting
Don't allow AudioTrack frameCount to decrease
Fix race in AudioTrack destruction
AudioFlinger: fix tracks ready for mixing logic.
Fix regression in AudioTrack::pause()
Fix ToneGenerator regression
|
| 8954fb1f92d25be2b0f111f5d83a1ef311b8d579 |
16-May-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ieda43a5a0f94cd68ed2a7f8ed58ae2a36740fce8
|
| 97b9e7d4fd5c34f762273d2cc9806d0f6294da15 |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| 38e15fbd2bf9dd0dda2f049c7c1a2ce21e2724bd |
16-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 53860ec9fb7df34212b3f778b4d2fb83ce1f5f1a |
16-May-2012 |
James Dong <jdong@google.com> |
am 7a0e268b: am a86c809b: Remove libvideoeditor_jni.so\'s dependency on static libs in video editor engine
* commit '7a0e268bc998d4bfbf0e9744921d1d7b73c93ac2':
Remove libvideoeditor_jni.so's dependency on static libs in video editor engine
|
| 7a0e268bc998d4bfbf0e9744921d1d7b73c93ac2 |
16-May-2012 |
James Dong <jdong@google.com> |
am a86c809b: Remove libvideoeditor_jni.so\'s dependency on static libs in video editor engine
* commit 'a86c809bff463ae1d782dcaa1c45d1acea5f34d3':
Remove libvideoeditor_jni.so's dependency on static libs in video editor engine
|
| a86c809bff463ae1d782dcaa1c45d1acea5f34d3 |
15-May-2012 |
James Dong <jdong@google.com> |
Remove libvideoeditor_jni.so's dependency on static libs in video editor engine
related-to-bug: 6502980
Change-Id: I9cbbf44eb53c406263df4003cc3de2af4d239180
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/3gpwriter/src/Android.mk
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
|
| 1ebba96a971c161780f2d65fed01b46bacb331d0 |
16-May-2012 |
Dave Burke <daveburke@google.com> |
am 7d2256a5: am 62999949: Merge "Add logging for invalid channel count or sample rate." into jb-dev
* commit '7d2256a535434d4f05a57eebc592790a1d1edd90':
Add logging for invalid channel count or sample rate.
|
| 7d2256a535434d4f05a57eebc592790a1d1edd90 |
16-May-2012 |
Dave Burke <daveburke@google.com> |
am 62999949: Merge "Add logging for invalid channel count or sample rate." into jb-dev
* commit '62999949c58ae18784a6061d83e4f2b78dbc3465':
Add logging for invalid channel count or sample rate.
|
| 62999949c58ae18784a6061d83e4f2b78dbc3465 |
16-May-2012 |
Dave Burke <daveburke@google.com> |
Merge "Add logging for invalid channel count or sample rate." into jb-dev
|
| 26976984d4f882f5da385360e76bc1c29fb4a696 |
16-May-2012 |
Dave Burke <daveburke@google.com> |
Add logging for invalid channel count or sample rate.
Change-Id: I2e2145e4b258923cf6c2907106345b7172c12280
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 8526f4b742c7fbc2dd068b20e9a2b262a0746bfe |
16-May-2012 |
James Dong <jdong@google.com> |
am e9f4e016: am 50a9908f: Merge "Speed up stsz box write in MPEG4Writer" into jb-dev
* commit 'e9f4e016145f9bd1f2d133425dde6440d2f4c27e':
Speed up stsz box write in MPEG4Writer
|
| b3e923ff7067eb86786a0a743bd1db2e69e0883a |
16-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am 792f3b2e: am 09effe38: Merge "Move CameraParameters header to join rest of camera library." into jb-dev
* commit '792f3b2e9ef31876567a1e28ab5d2d9af514e4a0':
Move CameraParameters header to join rest of camera library.
|
| e9f4e016145f9bd1f2d133425dde6440d2f4c27e |
16-May-2012 |
James Dong <jdong@google.com> |
am 50a9908f: Merge "Speed up stsz box write in MPEG4Writer" into jb-dev
* commit '50a9908f987fd5a73d8a95d6fe46b530386cdc86':
Speed up stsz box write in MPEG4Writer
|
| 2577ec36c70db34c2017ed700e91608eb1ef9718 |
16-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 913862ea: am 9017e5e0: Increase normal mixer\'s pipe to fast mixer
* commit '913862ea96e1147b589f0da558bb19dc0dcb9525':
Increase normal mixer's pipe to fast mixer
|
| 792f3b2e9ef31876567a1e28ab5d2d9af514e4a0 |
16-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am 09effe38: Merge "Move CameraParameters header to join rest of camera library." into jb-dev
* commit '09effe3813dcdec19c6767bf754cc3834e816937':
Move CameraParameters header to join rest of camera library.
|
| 50a9908f987fd5a73d8a95d6fe46b530386cdc86 |
16-May-2012 |
James Dong <jdong@google.com> |
Merge "Speed up stsz box write in MPEG4Writer" into jb-dev
|
| 913862ea96e1147b589f0da558bb19dc0dcb9525 |
16-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 9017e5e0: Increase normal mixer\'s pipe to fast mixer
* commit '9017e5e0ebad9664bb7b6f2057e5bb29c852c64f':
Increase normal mixer's pipe to fast mixer
|
| 09effe3813dcdec19c6767bf754cc3834e816937 |
16-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Move CameraParameters header to join rest of camera library." into jb-dev
|
| 9017e5e0ebad9664bb7b6f2057e5bb29c852c64f |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
Increase normal mixer's pipe to fast mixer
Change-Id: I330925c7d07b6adb30b773bda3657e4efef9ae9b
ervices/audioflinger/AudioFlinger.cpp
|
| d8fa5152bf9769860008af88b618987fc54a934e |
16-May-2012 |
Andreas Huber <andih@google.com> |
am 6051af9e: am 6d0780ae: Merge "Log which OMX component is not returning all buffers to us on executing->idle." into jb-dev
* commit '6051af9e024700a1ce5f3243e543f9aac09f934f':
Log which OMX component is not returning all buffers to us on executing->idle.
|
| 6051af9e024700a1ce5f3243e543f9aac09f934f |
16-May-2012 |
Andreas Huber <andih@google.com> |
am 6d0780ae: Merge "Log which OMX component is not returning all buffers to us on executing->idle." into jb-dev
* commit '6d0780ae34ed2fa3e9631667f200e15ddd472464':
Log which OMX component is not returning all buffers to us on executing->idle.
|
| 6d0780ae34ed2fa3e9631667f200e15ddd472464 |
16-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Log which OMX component is not returning all buffers to us on executing->idle." into jb-dev
|
| 8c460498c028888c533ab442be12b6d4b669b965 |
15-May-2012 |
James Dong <jdong@google.com> |
Speed up stsz box write in MPEG4Writer
With this patch, the write time for 30+ minutes recording session is reduced from 10+ seconds down to around 2-3 seconds.
related-to-bug: 6435176
Change-Id: I83b705cea42d8de798e7032c770c5c7b033e267e
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 5179ff34cf3ca69b3d3eaa71cdbf0c2aec6b45b3 |
16-May-2012 |
Andreas Huber <andih@google.com> |
Log which OMX component is not returning all buffers to us on executing->idle.
Change-Id: I8cd102cc5b1f3c9c36e3c5832ae4bee75c471efd
related-to-bug: 6498711
edia/libstagefright/OMXCodec.cpp
|
| a99a5bca365277271915cbaeea811ad87131270d |
16-May-2012 |
Andreas Huber <andih@google.com> |
Stop extrapolating audio time from the anchor if we're paused or reached eos.
Change-Id: I55903ba625d9c075a9a6e7bcd5ff95d450b915b2
related-to-bug: 6479613
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
|
| 5be138c1e29f9d7798982b49077d313c4bff403e |
16-May-2012 |
Eric Laurent <elaurent@google.com> |
Fix static track activity ref counting
When a static AudioTrack underruns, it means that playback is over.
As apps do not necessarily stop playback explicitly, AudioFlinger
should call stopOutput() to decrease activity ref count in
audio policy manager.
Bug 6486311.
Change-Id: I1ea722c443780329ded6310c958b24726e918d16
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| c2d6427f693f1847100c8f4b9a4aff6c1a12bb29 |
16-May-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Move CameraParameters header to join rest of camera library.
CameraParameters was moved over to frameworks/native before
frameworks/av was created, since it is referenced by HAL
implementations. Move it to frameworks/av to keep it together with its
implementation.
Bug: 6500863
Change-Id: If1a3b7768bedeb825729c3cdd55e8fcea04b7369
nclude/camera/CameraParameters.h
|
| be5956a06d5a3a91554e14641f20e6710ef42c47 |
16-May-2012 |
Eric Laurent <elaurent@google.com> |
am ca99165a: am 5d3d12bf: Merge "Fix static track activity ref counting" into jb-dev
* commit 'ca99165a06115d453e26af0bc22074125dc9d1a2':
Fix static track activity ref counting
|
| ca99165a06115d453e26af0bc22074125dc9d1a2 |
16-May-2012 |
Eric Laurent <elaurent@google.com> |
am 5d3d12bf: Merge "Fix static track activity ref counting" into jb-dev
* commit '5d3d12bf58da5b48b1edb7c20b5d1edec0773f75':
Fix static track activity ref counting
|
| 5d3d12bf58da5b48b1edb7c20b5d1edec0773f75 |
16-May-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Fix static track activity ref counting" into jb-dev
|
| 44a957f06400a338e7af20b3d16c4c4ae22a673c |
16-May-2012 |
Eric Laurent <elaurent@google.com> |
Fix static track activity ref counting
When a static AudioTrack underruns, it means that playback is over.
As apps do not necessarily stop playback explicitly, AudioFlinger
should call stopOutput() to decrease activity ref count in
audio policy manager.
Bug 6486311.
Change-Id: I1ea722c443780329ded6310c958b24726e918d16
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 1f1cdb8d7e2cbe5c15dc5f3cf47aa5a3e1d24935 |
16-May-2012 |
James Dong <jdong@google.com> |
am f7017689: am 18793d77: Revert "Remove libvideoeditor_jni.so\'s dependency on static libs in video editor engine"
* commit 'f7017689e144e6c424ee459c9566b61455ae1fa5':
Revert "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine"
|
| f7017689e144e6c424ee459c9566b61455ae1fa5 |
15-May-2012 |
James Dong <jdong@google.com> |
am 18793d77: Revert "Remove libvideoeditor_jni.so\'s dependency on static libs in video editor engine"
* commit '18793d77792e12f5f63e67f721bc238b6dc497a1':
Revert "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine"
|
| 18793d77792e12f5f63e67f721bc238b6dc497a1 |
15-May-2012 |
James Dong <jdong@google.com> |
Revert "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine"
This reverts commit 1af1f6a60b9fa217b6809e767babf1ce8a2e95c9.
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
|
| ac1d2f626aa36c0d48a3f29cf7d9d19aaf141f57 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am e5575ae2: am 859c897b: Merge "Ignore sideband parsing errors and spit out a frame of silence." into jb-dev
* commit 'e5575ae2280dc02f1e623c92a31b0ea83081d49f':
Ignore sideband parsing errors and spit out a frame of silence.
|
| e5575ae2280dc02f1e623c92a31b0ea83081d49f |
15-May-2012 |
Andreas Huber <andih@google.com> |
am 859c897b: Merge "Ignore sideband parsing errors and spit out a frame of silence." into jb-dev
* commit '859c897b87593386d7c37ab844d4890aaa19bceb':
Ignore sideband parsing errors and spit out a frame of silence.
|
| 859c897b87593386d7c37ab844d4890aaa19bceb |
15-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Ignore sideband parsing errors and spit out a frame of silence." into jb-dev
|
| 5272c510085ecd051b869f75eca2833bdfa4968c |
15-May-2012 |
James Dong <jdong@google.com> |
am a7809a42: am deb98e71: Merge "Remove libvideoeditor_jni.so\'s dependency on static libs in video editor engine" into jb-dev
* commit 'a7809a42ce5c454ba2d50f949289e232a5849fa1':
Remove libvideoeditor_jni.so's dependency on static libs in video editor engine
|
| a7809a42ce5c454ba2d50f949289e232a5849fa1 |
15-May-2012 |
James Dong <jdong@google.com> |
am deb98e71: Merge "Remove libvideoeditor_jni.so\'s dependency on static libs in video editor engine" into jb-dev
* commit 'deb98e7193cb544892662dd4054a01da3f6acaf6':
Remove libvideoeditor_jni.so's dependency on static libs in video editor engine
|
| deb98e7193cb544892662dd4054a01da3f6acaf6 |
15-May-2012 |
James Dong <jdong@google.com> |
Merge "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine" into jb-dev
|
| 259b39cbfc03cb94c48e66d752836e153e9a2f8b |
15-May-2012 |
Andreas Huber <andih@google.com> |
Ignore sideband parsing errors and spit out a frame of silence.
Change-Id: I274d8e9018e02eb42121a2440b42caefeca94fb0
related-to-bug: 6498193
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
|
| 835695c1a428251652e8f1b313d37203397eea84 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am 8311aa4a: am 2879bb21: Merge "Explicitly set the video scaling mode to "stretch"." into jb-dev
* commit '8311aa4a6a33563232f9b94b43a5eb6482f369b9':
Explicitly set the video scaling mode to "stretch".
|
| 9fb65969a46aecf6ab351c00ce1b56e8fd5bdda1 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am 3f9d05d2: am de321c32: Instead of asserting, turn an unsupported colorspace conversion into a
* commit '3f9d05d2d8f92498172b0260a4284b649dc0af85':
Instead of asserting, turn an unsupported colorspace conversion into a
|
| 8311aa4a6a33563232f9b94b43a5eb6482f369b9 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am 2879bb21: Merge "Explicitly set the video scaling mode to "stretch"." into jb-dev
* commit '2879bb2181c4c315ae653724f6b605b3e3831bdd':
Explicitly set the video scaling mode to "stretch".
|
| 3f9d05d2d8f92498172b0260a4284b649dc0af85 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am de321c32: Instead of asserting, turn an unsupported colorspace conversion into a
* commit 'de321c324cc4af88a8ea54d08c63546f73677037':
Instead of asserting, turn an unsupported colorspace conversion into a
|
| 2879bb2181c4c315ae653724f6b605b3e3831bdd |
15-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Explicitly set the video scaling mode to "stretch"." into jb-dev
|
| 1ec498e67f78fb0c3ab2a1cd9a071e6356618dad |
15-May-2012 |
Andreas Huber <andih@google.com> |
Explicitly set the video scaling mode to "stretch".
Change-Id: I23b8848cfef51bc8ea72deb22783e21d093dbd98
related-to-bug: 6498150
edia/libstagefright/ACodec.cpp
|
| de321c324cc4af88a8ea54d08c63546f73677037 |
15-May-2012 |
Andreas Huber <andih@google.com> |
Instead of asserting, turn an unsupported colorspace conversion into a
runtime error.
Change-Id: I0a1754ecaa2a6aac8b0b1bcc829aa873cf238b9b
related-to-bug: 6499326
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| e45c88e150685ef8c240f6118ff9015abc368378 |
15-May-2012 |
Eric Laurent <elaurent@google.com> |
am 73730bec: am 29864609: Fix issues with synchronous record start.
* commit '73730bec0f30f517f66481f939d474bdfef39ed3':
Fix issues with synchronous record start.
|
| 2dc2a2e771a420caac9bafe6fdbd4fd9fc856967 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am cb013629: am dfa29ab1: Merge "Smoothen audio "real" time by compensating with system_time()" into jb-dev
* commit 'cb013629eaac7fa42a5b1e2f9b6b10af87851909':
Smoothen audio "real" time by compensating with system_time()
|
| 48f91ce1dbef883c11fa608d76aa38eebc427732 |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 075f0d11: am 427eea93: Merge "Reduce video frame drop rate" into jb-dev
* commit '075f0d1139477a80701f3c7818d88b3cf00fd97b':
Reduce video frame drop rate
|
| 73730bec0f30f517f66481f939d474bdfef39ed3 |
15-May-2012 |
Eric Laurent <elaurent@google.com> |
am 29864609: Fix issues with synchronous record start.
* commit '2986460984580833161bdaabc7f17da1005a8961':
Fix issues with synchronous record start.
|
| cb013629eaac7fa42a5b1e2f9b6b10af87851909 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am dfa29ab1: Merge "Smoothen audio "real" time by compensating with system_time()" into jb-dev
* commit 'dfa29ab13647f22b30b2de34d4830c9e815bf120':
Smoothen audio "real" time by compensating with system_time()
|
| 075f0d1139477a80701f3c7818d88b3cf00fd97b |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 427eea93: Merge "Reduce video frame drop rate" into jb-dev
* commit '427eea9368eeb29d3ff888f6171c7f03d943684c':
Reduce video frame drop rate
|
| 273d0ca2c04e41f6ac810d09338fa15ef8b04c5f |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in nakasi-factoryrom-release history after reset to jb-dev
|
| 14b5304d7c0024c2fc34b6402ac6fbd52b02cf6e |
15-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 1af1f6a60b9fa217b6809e767babf1ce8a2e95c9 |
15-May-2012 |
James Dong <jdong@google.com> |
Remove libvideoeditor_jni.so's dependency on static libs in video editor engine
related-to-bug: 6328360
Change-Id: I36324820c7e72fedd8c4caf1b03443a4f7cec37f
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
|
| b6365a6ef920bf09970c75d568b0166127d3c6af |
15-May-2012 |
James Dong <jdong@google.com> |
am 0cfd2ada: am 804c27e9: Merge "Switch audio tracks at runtime" into jb-dev
* commit '0cfd2ada44749a934bf943da9c90ab91d2208d95':
Switch audio tracks at runtime
|
| 0460ee2e0efc405a7d1f7da56e53fcbc678c7562 |
15-May-2012 |
Andreas Huber <andih@google.com> |
am 3a01ce73: am 44f84ded: ACodec mustn\'t override the video scaling mod.
* commit '3a01ce738476b2543e1d0a31aa54875b1c69a31b':
ACodec mustn't override the video scaling mod.
|
| 331e1ab3a235142d8532949c15d7d574f477f281 |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
am c3988f0a: am 09474df6: Improve underrun handling for fast tracks
* commit 'c3988f0a725bb1b5cc8c8d6a2559437123e6d2e9':
Improve underrun handling for fast tracks
|
| 3fc787e2ce5cfd09f8c61a5733c9d47c90579644 |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 5aa38bca: am d08f48c2: Fix stopping process for fast tracks
* commit '5aa38bca24d1e00d9b62e5e44341302c8b9ce443':
Fix stopping process for fast tracks
|
| 0cfd2ada44749a934bf943da9c90ab91d2208d95 |
15-May-2012 |
James Dong <jdong@google.com> |
am 804c27e9: Merge "Switch audio tracks at runtime" into jb-dev
* commit '804c27e91ea324c5d8dc89b60637695adc776141':
Switch audio tracks at runtime
|
| 3a01ce738476b2543e1d0a31aa54875b1c69a31b |
15-May-2012 |
Andreas Huber <andih@google.com> |
am 44f84ded: ACodec mustn\'t override the video scaling mod.
* commit '44f84ded62bffd5f04e0f5961e8304427a7b9f34':
ACodec mustn't override the video scaling mod.
|
| c3988f0a725bb1b5cc8c8d6a2559437123e6d2e9 |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 09474df6: Improve underrun handling for fast tracks
* commit '09474df67278c0cd621b57c4aef1deaec4d8447f':
Improve underrun handling for fast tracks
|
| 5aa38bca24d1e00d9b62e5e44341302c8b9ce443 |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
am d08f48c2: Fix stopping process for fast tracks
* commit 'd08f48c2ad2941d62b313007955c7145075d562c':
Fix stopping process for fast tracks
|
| 2986460984580833161bdaabc7f17da1005a8961 |
09-May-2012 |
Eric Laurent <elaurent@google.com> |
Fix issues with synchronous record start.
- Added a timeout in case the trigger event is never fired.
- Extend AudioRecord obtainBuffer() timeout in case of
synchronous start to avoid spurious warning.
- Make sure that the event is triggered if the track is
destroyed.
- Reject event if the triggering track is in an incompatible state.
Also fix a problem when restoring a static AudioTrack after
a mediaserver crash.
Bug 6449468.
Change-Id: Ib36e11111fb88f73caa31dcb0622792737d57a4b
nclude/media/AudioSystem.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| dfa29ab13647f22b30b2de34d4830c9e815bf120 |
15-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Smoothen audio "real" time by compensating with system_time()" into jb-dev
|
| e4451a91a61a341014f5eff61db356156c3ecb37 |
15-May-2012 |
Andreas Huber <andih@google.com> |
Smoothen audio "real" time by compensating with system_time()
for the delay since the last buffer submission to the audio sink.
Change-Id: Ib1a8672f96ba8bbef07d23372f1076fbb1f0bdcc
related-to-bug: 6479613
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
|
| 427eea9368eeb29d3ff888f6171c7f03d943684c |
15-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Reduce video frame drop rate" into jb-dev
|
| 804c27e91ea324c5d8dc89b60637695adc776141 |
14-May-2012 |
James Dong <jdong@google.com> |
Merge "Switch audio tracks at runtime" into jb-dev
|
| ab7a2e544643edcb2e09ed5f204580afd763edc1 |
27-Apr-2012 |
James Dong <jdong@google.com> |
Switch audio tracks at runtime
o The switching is not allowed if there is an audio seek operation ongoing.
o related-to-bug: 6110705
Change-Id: Ib92a165f3984aa033d97800184d3d17319522db5
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 4adcede0dc54a85c31abaf139921aebd7a072d8e |
14-May-2012 |
Glenn Kasten <gkasten@google.com> |
Reduce video frame drop rate
The video playback engine depends on having relatively precise audio
progress updates for its A/V sync and frame drop calculations. For small
audio HAL buffer sizes, this was not a problem, but when the HAL buffer
size was > 12 ms, the normal mix buffer size became > 24 ms and this
then caused video problems. The new formula tries to keep the normal
mix buffer size within a closer tolerance of 20 ms to 24 ms.
Also use consistent term: multiplier instead of multiple.
Bug: 6479613
Change-Id: I903bad74461908e8c8f0a61e99ab5e24d5c44433
ervices/audioflinger/AudioFlinger.cpp
|
| 44f84ded62bffd5f04e0f5961e8304427a7b9f34 |
14-May-2012 |
Andreas Huber <andih@google.com> |
ACodec mustn't override the video scaling mod.
Change-Id: Id9b569446d73dcfe44ab4a3488812203758c9c42
related-to-bug: 6490687
edia/libstagefright/ACodec.cpp
|
| 09474df67278c0cd621b57c4aef1deaec4d8447f |
10-May-2012 |
Glenn Kasten <gkasten@google.com> |
Improve underrun handling for fast tracks
Maintain more accurate accounting of type of underrun.
Automatically remove track from active list after a series of "empty" underruns.
Change-Id: If042bf80e1790dcaaf195c99dc9c0ed9b55382c1
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixer.h
|
| 3da8a947fac569d41624be610f8d4fca43badbab |
14-May-2012 |
Dave Burke <daveburke@google.com> |
am 89463ee0: am 94f60e29: Remove ASC workaround (now fixed in Franhofer library).
* commit '89463ee03d8393cf42cc3d6b1ebf95a8a0d35e99':
Remove ASC workaround (now fixed in Franhofer library).
|
| 7d8cb9ad679e51055702a1d1f63935d3a23654b1 |
14-May-2012 |
Eric Laurent <elaurent@google.com> |
am e84458e4: am 808e7d16: AudioFlinger: fix global effects suspend logic
* commit 'e84458e457ddc6505b2910128c033dbcb78ff014':
AudioFlinger: fix global effects suspend logic
|
| ccae1bd72d9ceb93cf396a62707bee1cb6bf63ca |
14-May-2012 |
Jamie Gennis <jgennis@google.com> |
am 6906d17e: am bb9d731b: Merge "stagefright: add tracing to AwesomePlayer." into jb-dev
* commit '6906d17e061b6fb9ee9f9294a280134d48a8ff41':
stagefright: add tracing to AwesomePlayer.
|
| 1f37aba65cd1742ad8c7eca434dc22e60c9d340a |
14-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 634d40da: am 82741e48: Merge "Fix 2 bugs in fast mixer statistics" into jb-dev
* commit '634d40da8e4b5ae00a9cb82012ffc95590274e37':
Fix 2 bugs in fast mixer statistics
|
| b2ba6f09bff5c8402c57ee0ad562dda654f2cf28 |
14-May-2012 |
James Dong <jdong@google.com> |
am e9c21233: am 7cf0de49: Merge "Remove unused VideoSourceDownSampler class" into jb-dev
* commit 'e9c21233c3fd08e0ae5be60f11a898c1866ed470':
Remove unused VideoSourceDownSampler class
|
| d08f48c2ad2941d62b313007955c7145075d562c |
02-May-2012 |
Glenn Kasten <gkasten@google.com> |
Fix stopping process for fast tracks
Previously, the state of a fast track "wiggled" back and forth at the end.
Now it goes through these transitions:
active -> stopping_1 -> stopping_2 -> stopped
This CL is only for fast tracks, and does not change how
normal tracks work.
Change-Id: Icc414f2b48c46dda63cfa6373ca22d033dd21cd4
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 7c8f2dd51a498fed374f1be5645c7d3fb6a761a9 |
14-May-2012 |
Andreas Huber <andih@google.com> |
am 68be0108: am 7d580566: Merge "Increase AAC software decoder\'s buffer count. Refactor how clients" into jb-dev
* commit '68be0108a701cbae2d9e3335a7b1056d8eedb140':
Increase AAC software decoder's buffer count. Refactor how clients
|
| 170725b2bce8b314bc99543a1dcc72b17f21d186 |
14-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 89463ee03d8393cf42cc3d6b1ebf95a8a0d35e99 |
13-May-2012 |
Dave Burke <daveburke@google.com> |
am 94f60e29: Remove ASC workaround (now fixed in Franhofer library).
* commit '94f60e297b9e45fac387cf10b6ce1acc067cb4a1':
Remove ASC workaround (now fixed in Franhofer library).
|
| 94f60e297b9e45fac387cf10b6ce1acc067cb4a1 |
12-May-2012 |
Dave Burke <daveburke@google.com> |
Remove ASC workaround (now fixed in Franhofer library).
Change-Id: Ia0ce8155def9f6dea85da7f88942ac1b11c16823
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| e84458e457ddc6505b2910128c033dbcb78ff014 |
12-May-2012 |
Eric Laurent <elaurent@google.com> |
am 808e7d16: AudioFlinger: fix global effects suspend logic
* commit '808e7d16504cbe5b28bb88c31afb2542ab488965':
AudioFlinger: fix global effects suspend logic
|
| 808e7d16504cbe5b28bb88c31afb2542ab488965 |
12-May-2012 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: fix global effects suspend logic
Audio effects on the output mix should not be suspended when effects
on the output stage (post processing) are enabled.
Change-Id: I2e1c08fa9358ea3cbaec68856738d504b1be54e4
ervices/audioflinger/AudioFlinger.cpp
|
| 6906d17e061b6fb9ee9f9294a280134d48a8ff41 |
12-May-2012 |
Jamie Gennis <jgennis@google.com> |
am bb9d731b: Merge "stagefright: add tracing to AwesomePlayer." into jb-dev
* commit 'bb9d731bc2b5759f72f6d382834e431a0389cf07':
stagefright: add tracing to AwesomePlayer.
|
| bb9d731bc2b5759f72f6d382834e431a0389cf07 |
12-May-2012 |
Jamie Gennis <jgennis@google.com> |
Merge "stagefright: add tracing to AwesomePlayer." into jb-dev
|
| 634d40da8e4b5ae00a9cb82012ffc95590274e37 |
12-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 82741e48: Merge "Fix 2 bugs in fast mixer statistics" into jb-dev
* commit '82741e48228a69d9ffdf7fd3278b6d2d5c0d48c4':
Fix 2 bugs in fast mixer statistics
|
| 82741e48228a69d9ffdf7fd3278b6d2d5c0d48c4 |
12-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix 2 bugs in fast mixer statistics" into jb-dev
|
| e9c21233c3fd08e0ae5be60f11a898c1866ed470 |
12-May-2012 |
James Dong <jdong@google.com> |
am 7cf0de49: Merge "Remove unused VideoSourceDownSampler class" into jb-dev
* commit '7cf0de49dbdcb2da7d9bf9421f58adf442dfeaea':
Remove unused VideoSourceDownSampler class
|
| 7cf0de49dbdcb2da7d9bf9421f58adf442dfeaea |
12-May-2012 |
James Dong <jdong@google.com> |
Merge "Remove unused VideoSourceDownSampler class" into jb-dev
|
| e58ccce45598bcf4b4874b0e87cd1eb8d05ba9a9 |
12-May-2012 |
Glenn Kasten <gkasten@google.com> |
Fix 2 bugs in fast mixer statistics
Was losing the upper half of the bounds, and MHz was off.
Change-Id: I61c98027b35ce7c3578ea6f3acf05aa5c48a5831
ervices/audioflinger/FastMixer.cpp
|
| 3a2633008be4a92fbca6e76c057f86e220558197 |
11-May-2012 |
James Dong <jdong@google.com> |
Remove unused VideoSourceDownSampler class
Change-Id: I2faf5962ff4cc366c688ef5bb27f53596f08fe0a
related-to-bug: 6484217
nclude/media/stagefright/VideoSourceDownSampler.h
edia/libstagefright/Android.mk
edia/libstagefright/VideoSourceDownSampler.cpp
|
| 68be0108a701cbae2d9e3335a7b1056d8eedb140 |
11-May-2012 |
Andreas Huber <andih@google.com> |
am 7d580566: Merge "Increase AAC software decoder\'s buffer count. Refactor how clients" into jb-dev
* commit '7d5805669dea851e70115c494154a2d26b8dc39e':
Increase AAC software decoder's buffer count. Refactor how clients
|
| 7d5805669dea851e70115c494154a2d26b8dc39e |
11-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Increase AAC software decoder's buffer count. Refactor how clients" into jb-dev
|
| eb61431af13741aa8b7e57a39f69bba5a6c190dc |
11-May-2012 |
Andreas Huber <andih@google.com> |
Increase AAC software decoder's buffer count. Refactor how clients
of ACodec get notified about codec buffers and buffer ids.
Change-Id: I962f873262dae7aa7b43f5f68a6d60268282f91e
related-to-bug: 6478823
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.h
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| 83dcbba06c01ac3df7d5add7954bac3a3d282499 |
11-May-2012 |
James Dong <jdong@google.com> |
am cb0e6ac3: am c20f467d: Merge "Fix a bug on sending a message to retry in TimedText." into jb-dev
* commit 'cb0e6ac3d9f9f006652ead57f5b4d5e54ecc5d37':
Fix a bug on sending a message to retry in TimedText.
|
| cb0e6ac3d9f9f006652ead57f5b4d5e54ecc5d37 |
11-May-2012 |
James Dong <jdong@google.com> |
am c20f467d: Merge "Fix a bug on sending a message to retry in TimedText." into jb-dev
* commit 'c20f467d54f921730aa0b2fd087ad83496aeaf4b':
Fix a bug on sending a message to retry in TimedText.
|
| c20f467d54f921730aa0b2fd087ad83496aeaf4b |
11-May-2012 |
James Dong <jdong@google.com> |
Merge "Fix a bug on sending a message to retry in TimedText." into jb-dev
|
| 2163320110d2f971becbad82e15b2ab360a1ddb6 |
11-May-2012 |
Jamie Gennis <jgennis@google.com> |
stagefright: add tracing to AwesomePlayer.
Change-Id: Id84419a1c54e41e158b24477f0676071e90f6922
edia/libstagefright/AwesomePlayer.cpp
|
| 3b963c60693c10276f5ebf5e0abb95f6be78070f |
10-May-2012 |
Insun Kang <insun@google.com> |
Fix a bug on sending a message to retry in TimedText.
related-to-bug: 6480861
Change-Id: I86f24f1304dea42a7501c578cff0c590b048ccc2
edia/libstagefright/timedtext/TimedTextPlayer.cpp
|
| 82e3b78d197fb212ceda543eacb642acab2c3f14 |
11-May-2012 |
Glenn Kasten <gkasten@google.com> |
am df39376e: am 240d8a84: Merge "Use audio tag for system tracing" into jb-dev
* commit 'df39376eb12fc9dca87058560e58072f47dfc1a4':
Use audio tag for system tracing
|
| df39376eb12fc9dca87058560e58072f47dfc1a4 |
11-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 240d8a84: Merge "Use audio tag for system tracing" into jb-dev
* commit '240d8a84dec9f9482257a8037457a1d63193b7ff':
Use audio tag for system tracing
|
| 240d8a84dec9f9482257a8037457a1d63193b7ff |
11-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio tag for system tracing" into jb-dev
|
| 5a8a338e5950716997c42cae9d5247ce0fc743eb |
11-May-2012 |
Andreas Huber <andih@google.com> |
am 0c0e003f: am 96409203: Merge "Add "support" for AMR WB comfort noise, no data and speech lost frame types" into jb-dev
* commit '0c0e003f8e4557eb3ddb477c6adbdb3cd2ba28f4':
Add "support" for AMR WB comfort noise, no data and speech lost frame types
|
| e70b58a13dc9c3248f53dc54732499f0d5817bb2 |
11-May-2012 |
Dave Burke <daveburke@google.com> |
am 8ab086d0: am da66e667: Merge "Make decoder more robust to inaccurate ASCs." into jb-dev
* commit '8ab086d0356f90bc1901d1c4e7e0687f6ac273c3':
Make decoder more robust to inaccurate ASCs.
|
| 0c0e003f8e4557eb3ddb477c6adbdb3cd2ba28f4 |
11-May-2012 |
Andreas Huber <andih@google.com> |
am 96409203: Merge "Add "support" for AMR WB comfort noise, no data and speech lost frame types" into jb-dev
* commit '96409203b4a857768e38137e88001378ad383584':
Add "support" for AMR WB comfort noise, no data and speech lost frame types
|
| 8ab086d0356f90bc1901d1c4e7e0687f6ac273c3 |
11-May-2012 |
Dave Burke <daveburke@google.com> |
am da66e667: Merge "Make decoder more robust to inaccurate ASCs." into jb-dev
* commit 'da66e667840de77d3b9a9a094bbf12f43975d7e0':
Make decoder more robust to inaccurate ASCs.
|
| 96409203b4a857768e38137e88001378ad383584 |
11-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Add "support" for AMR WB comfort noise, no data and speech lost frame types" into jb-dev
|
| da66e667840de77d3b9a9a094bbf12f43975d7e0 |
11-May-2012 |
Dave Burke <daveburke@google.com> |
Merge "Make decoder more robust to inaccurate ASCs." into jb-dev
|
| dc5db5d281d57ff59d92105cf0cd383df3b3c368 |
11-May-2012 |
Dave Burke <daveburke@google.com> |
Make decoder more robust to inaccurate ASCs.
Bug: 6408518
Bug: 6463794
Change-Id: Ice4ae327bc53e9d826adce572a2706e045eacd62
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| a9605efa3edfae96fa618a4b78f6c2276f941fab |
10-May-2012 |
Andreas Huber <andih@google.com> |
Add "support" for AMR WB comfort noise, no data and speech lost frame types
by emitting silence.
Change-Id: I27b7f31051f0c9a14adde866305bbc91a827a00c
related-to-bug: 6478154
edia/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
|
| f252f44c66e7c88ceb00298f88309f8a7d737b30 |
10-May-2012 |
Andreas Huber <andih@google.com> |
am 0bf47426: am af9e6a17: Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev
* commit '0bf474261dc5656990ecc25af63f3b2d125b2b20':
Properly connect/disconnect to/from the native window in MediaCodec.
|
| 0bf474261dc5656990ecc25af63f3b2d125b2b20 |
10-May-2012 |
Andreas Huber <andih@google.com> |
am af9e6a17: Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev
* commit 'af9e6a17d7038b411b61a3cb0669694058511a05':
Properly connect/disconnect to/from the native window in MediaCodec.
|
| af9e6a17d7038b411b61a3cb0669694058511a05 |
10-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev
|
| 78c2ddb715a367f6859e1421d2b86df91b12d4e8 |
10-May-2012 |
Glenn Kasten <gkasten@google.com> |
am ddebe415: am c3798d7e: Merge "Update fast mixer statistics" into jb-dev
* commit 'ddebe415450d1fba7a9cb1972f279621d6784c32':
Update fast mixer statistics
|
| ddebe415450d1fba7a9cb1972f279621d6784c32 |
10-May-2012 |
Glenn Kasten <gkasten@google.com> |
am c3798d7e: Merge "Update fast mixer statistics" into jb-dev
* commit 'c3798d7e97cb11076310f06163417c0631cce04e':
Update fast mixer statistics
|
| d8e6fd35ec2b59ee7d873daf1f1d9d348221c7bc |
07-May-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio tag for system tracing
Disabled by default; uncomment ATRACE_TAG to enable
Change-Id: I99af894022a859ee5644bd853cfd8a48e4735ff9
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/FastMixer.cpp
|
| c3798d7e97cb11076310f06163417c0631cce04e |
10-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Update fast mixer statistics" into jb-dev
|
| 7e137d717f2edf112acd4bf4f1df055ad20c2e31 |
10-May-2012 |
Andreas Huber <andih@google.com> |
am 0857d4e2: am 5c36fc87: Don\'t attempt to support content the software MPEG4 decoder clearly wasn\'t
* commit '0857d4e2bdca4d4b0fd085b6fe7058d61b080165':
Don't attempt to support content the software MPEG4 decoder clearly wasn't
|
| 0857d4e2bdca4d4b0fd085b6fe7058d61b080165 |
10-May-2012 |
Andreas Huber <andih@google.com> |
am 5c36fc87: Don\'t attempt to support content the software MPEG4 decoder clearly wasn\'t
* commit '5c36fc8701eb7468c268c47dae5dba58dbd8e83e':
Don't attempt to support content the software MPEG4 decoder clearly wasn't
|
| 42d45cfd0c3d62357a6549c62f535e4d4fe08d91 |
02-May-2012 |
Glenn Kasten <gkasten@google.com> |
Update fast mixer statistics
Compute statistics on fast mixer elapsed time and CPU load per cycle using a
simple moving average rather than by fixed blocks. This has a couple advantages:
- remove burstiness of CPU usage due to former floating-point calculations in fast mixer
- gives us flexibility in how to report (e.g. could report over just the last 1 second)
Disadvantage is increased RAM, and since the samples are not updated
atomically, it is possible to have an error in the statistics. This
should not be much of an issue due to the relatively large number of samples.
Also add CPU raw ns and adjusted MHz statistics.
Change-Id: Iaa2cd13f18250c3162aff40409b3694b769d9505
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixer.h
|
| 5c36fc8701eb7468c268c47dae5dba58dbd8e83e |
10-May-2012 |
Andreas Huber <andih@google.com> |
Don't attempt to support content the software MPEG4 decoder clearly wasn't
prepared for.
Change-Id: I4614ba25a1c67e47bde27ddebd99cb50892c1a94
related-to-bug: 6327803
edia/libstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
|
| 0e1d3f3095eb70bf5cd475e21ba41c26d850366a |
10-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am ce738081: am 2f74ef3c: OMX IL wrapper for FLAC encoder
* commit 'ce7380818e9b19668730fdc527ee7876d3427078':
OMX IL wrapper for FLAC encoder
|
| 7541ff5d83a3e77cb533841a0326a241550b95d9 |
10-May-2012 |
Andreas Huber <andih@google.com> |
Properly connect/disconnect to/from the native window in MediaCodec.
Change-Id: Ib5bf90a3b81fca8ff2346235bc28a2bd0bc7bfb1
related-to-bug: 6472161
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/MediaCodec.cpp
|
| ce7380818e9b19668730fdc527ee7876d3427078 |
10-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 2f74ef3c: OMX IL wrapper for FLAC encoder
* commit '2f74ef3cdc192f817ee1121f41765f0852c1d81e':
OMX IL wrapper for FLAC encoder
|
| 2f74ef3cdc192f817ee1121f41765f0852c1d81e |
30-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
OMX IL wrapper for FLAC encoder
Add wrapper around libFLAC for FLAC encoding in OpenMAX IL.
Declare FLAC encoder in OMX component roles.
Bug 5525503
Change-Id: I19bbce41c216870669d09365693f4ea89f8bc0f7
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/flac/Android.mk
edia/libstagefright/codecs/flac/enc/Android.mk
edia/libstagefright/codecs/flac/enc/SoftFlacEncoder.cpp
edia/libstagefright/codecs/flac/enc/SoftFlacEncoder.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 7b00bee8d19626ccdc062dec94554d7a2570a5b8 |
09-May-2012 |
Andreas Huber <andih@google.com> |
am 89f24546: am c150ca7d: Merge "Submit codec specific data automatically" into jb-dev
* commit '89f24546f131e78ada87d60c3843470fd737fa24':
Submit codec specific data automatically
|
| a373f575a93d9120bb616e136abaeec5f2a57606 |
09-May-2012 |
Andreas Huber <andih@google.com> |
am f4407649: am a9623e01: Merge "Fix both H.263 and MPEG4 decoders." into jb-dev
* commit 'f4407649ea26382dd33109c71cc0c3b150f56f87':
Fix both H.263 and MPEG4 decoders.
|
| bd043c04d1286007cb52d877631b3b12cefafa02 |
09-May-2012 |
Fred Gylys-Colwell <fredgc@google.com> |
am 70dbe3e9: am 1d02a827: Fix DRM timer start for Widevine.
* commit '70dbe3e9c240e6ae1a23edc4dc7ee8b6261667c5':
Fix DRM timer start for Widevine.
|
| f6afe5b50910bb443333ac35d5dd21bcd819da02 |
09-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 89f24546f131e78ada87d60c3843470fd737fa24 |
09-May-2012 |
Andreas Huber <andih@google.com> |
am c150ca7d: Merge "Submit codec specific data automatically" into jb-dev
* commit 'c150ca7dda844891fa684f6898da7f7e0c40329d':
Submit codec specific data automatically
|
| f4407649ea26382dd33109c71cc0c3b150f56f87 |
09-May-2012 |
Andreas Huber <andih@google.com> |
am a9623e01: Merge "Fix both H.263 and MPEG4 decoders." into jb-dev
* commit 'a9623e018737889d32f6b231f913a70d020c7ac5':
Fix both H.263 and MPEG4 decoders.
|
| 70dbe3e9c240e6ae1a23edc4dc7ee8b6261667c5 |
09-May-2012 |
Fred Gylys-Colwell <fredgc@google.com> |
am 1d02a827: Fix DRM timer start for Widevine.
* commit '1d02a827bc0bb5023a551bc9ce3fb37457240daa':
Fix DRM timer start for Widevine.
|
| 06e915a67821ac679be1ed5303b050303e012e85 |
09-May-2012 |
Marco Nelissen <marcone@google.com> |
am d57c4548: am a62bde0a: Merge "Use new sd card mount point for dumpsys" into jb-dev
* commit 'd57c4548766e112cd70c43773e296122eb489a50':
Use new sd card mount point for dumpsys
|
| ded0a80ec2751870f3ce9c1b9742f603f528892a |
09-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 6dd12786: am b21d070f: Merge "dumpsys fCnt and flags" into jb-dev
* commit '6dd12786534b9926d9834c08d09983fc535f946d':
dumpsys fCnt and flags
|
| c150ca7dda844891fa684f6898da7f7e0c40329d |
08-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Submit codec specific data automatically" into jb-dev
|
| 344b965850a7db028d7ebca6daf3534bc76fdcc4 |
08-May-2012 |
James Dong <jdong@google.com> |
am 706bb450: am 3e0f56df: Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev
* commit '706bb450ee7eb56691c61b40284136d9e2228444':
Get rid of vendor specific video encoder component names from ACodec and OMXCodec
|
| f12758bb17eaeacac5ed9bde6976ef83854cdbff |
08-May-2012 |
Andreas Huber <andih@google.com> |
am 907a33bc: am e5177094: Remove/Disable the AVI extractor.
* commit '907a33bce9457a8b27de35c554856dc6d45b0d9b':
Remove/Disable the AVI extractor.
|
| 8ee516a515c70a492c395b67ce12e19e7d159804 |
08-May-2012 |
Andreas Huber <andih@google.com> |
Submit codec specific data automatically
if it is contained in the format passed to MediaCodec::configure.
Change-Id: I8ef6755e8389ec47b44a9c70904ea6c03a00f4f2
related-to-bug: 6364139
mds/stagefright/codec.cpp
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/MediaCodec.cpp
|
| a9623e018737889d32f6b231f913a70d020c7ac5 |
08-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix both H.263 and MPEG4 decoders." into jb-dev
|
| 02accddf8d69da7b2b5e05631ad222cd842ff547 |
08-May-2012 |
Andreas Huber <andih@google.com> |
Fix both H.263 and MPEG4 decoders.
Change-Id: I6c76fa33f6ea4b439abc14c396a86c3553c85189
related-to-bug: 6460112
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
|
| 1d02a827bc0bb5023a551bc9ce3fb37457240daa |
05-May-2012 |
Fred Gylys-Colwell <fredgc@google.com> |
Fix DRM timer start for Widevine.
The DRM flag should always be true for WVMExtractor. The WVMExtractor always
turns on the DRM flag. Before this change, it was reset to false in
MediaExtractor::Create. After this change, MediaExtractor::Create will return
as soon as the WVMExtractor has been created.
Change-Id: I04949d2cd11b912bde61a106ee6b805932041c25
related-to-bug:6261699
edia/libstagefright/MediaExtractor.cpp
|
| 2ec18f95b04e505e8d336774a7dbeb6069f1bebf |
08-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| d57c4548766e112cd70c43773e296122eb489a50 |
08-May-2012 |
Marco Nelissen <marcone@google.com> |
am a62bde0a: Merge "Use new sd card mount point for dumpsys" into jb-dev
* commit 'a62bde0a391f65a418d77c46e6ba468433d81dba':
Use new sd card mount point for dumpsys
|
| a62bde0a391f65a418d77c46e6ba468433d81dba |
08-May-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Use new sd card mount point for dumpsys" into jb-dev
|
| 6dd12786534b9926d9834c08d09983fc535f946d |
08-May-2012 |
Glenn Kasten <gkasten@google.com> |
am b21d070f: Merge "dumpsys fCnt and flags" into jb-dev
* commit 'b21d070fbf5379aea1af970cb96cdb9c3665a4c6':
dumpsys fCnt and flags
|
| b21d070fbf5379aea1af970cb96cdb9c3665a4c6 |
08-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "dumpsys fCnt and flags" into jb-dev
|
| 73ac1eebff620714c6977f7342ff8dcc4858b3cf |
08-May-2012 |
Marco Nelissen <marcone@google.com> |
Use new sd card mount point for dumpsys
b/6455962
Change-Id: I5c9f8c16c50587b25cafab03c48662e63855868e
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 706bb450ee7eb56691c61b40284136d9e2228444 |
08-May-2012 |
James Dong <jdong@google.com> |
am 3e0f56df: Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev
* commit '3e0f56df1a22b76f59d85699d0cc78c37ddd37c5':
Get rid of vendor specific video encoder component names from ACodec and OMXCodec
|
| 3e0f56df1a22b76f59d85699d0cc78c37ddd37c5 |
08-May-2012 |
James Dong <jdong@google.com> |
Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev
|
| 907a33bce9457a8b27de35c554856dc6d45b0d9b |
07-May-2012 |
Andreas Huber <andih@google.com> |
am e5177094: Remove/Disable the AVI extractor.
* commit 'e51770946feca174d2d65811f773dcfc3d66ad3b':
Remove/Disable the AVI extractor.
|
| 7c25df82dfc8bbedb58608242f0d923a4594bb14 |
07-May-2012 |
James Dong <jdong@google.com> |
Get rid of vendor specific video encoder component names from ACodec and OMXCodec
o related-to-bug: 6446245
Change-Id: I1fa07ad8a39337e3b19ac51c10533a2de8c11bb5
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| e213c86d36414a8fc75e37c52999522fe09c7328 |
25-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
dumpsys fCnt and flags
Previously displayed TrackBase::mFrameCount but not control block frameCount.
Now displays both.
Also display the track flags in control block.
Change-Id: Ie53781d4784633d78b6f928d69ebd494d8f110ec
ervices/audioflinger/AudioFlinger.cpp
|
| e51770946feca174d2d65811f773dcfc3d66ad3b |
07-May-2012 |
Andreas Huber <andih@google.com> |
Remove/Disable the AVI extractor.
Change-Id: I47dcae710df9c66688a937fb1e648f9b00ca0f65
related-to-bug: 5717242
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaExtractor.cpp
|
| 8385a71afe6e560e16c1f1d700785f3ef507b88c |
06-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 5cf151fef2a379dd6de74f1a5989ee5e811d2897 |
05-May-2012 |
Eric Laurent <elaurent@google.com> |
am f2861d6b: am fc52dd88: Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev
* commit 'f2861d6b867827ec752930e12825f278ab7cebab':
Revert "Merge "Improve AudioPlayer position reporting""
|
| 24a8926b986d7ed1a420d464e2161d1864c25538 |
05-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| f2861d6b867827ec752930e12825f278ab7cebab |
05-May-2012 |
Eric Laurent <elaurent@google.com> |
am fc52dd88: Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev
* commit 'fc52dd88e4d2f433feba5d5aaff1880659d46319':
Revert "Merge "Improve AudioPlayer position reporting""
|
| fc52dd88e4d2f433feba5d5aaff1880659d46319 |
05-May-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev
|
| b48aea123775fb6ec7e6944826fc99da8d8996a5 |
04-May-2012 |
Eric Laurent <elaurent@google.com> |
Revert "Merge "Improve AudioPlayer position reporting""
This reverts commit 887c5d2ac34d81bde66dadbd7b2ff07501744778, reversing
changes made to 5aaeb0d64fc98f9b019a4378eb39f0ee49ee6ec4.
edia/libstagefright/AudioPlayer.cpp
|
| 8bba28e34be496e7bd0f047711477f6597b51dc5 |
04-May-2012 |
Andreas Huber <andih@google.com> |
am 4ded4983: am 9dc4c66f: Until we have emulator support for YUV12 rendering do software color conversion.
* commit '4ded4983983aa8597e927d3a7f0dc241fa993951':
Until we have emulator support for YUV12 rendering do software color conversion.
|
| 4ded4983983aa8597e927d3a7f0dc241fa993951 |
04-May-2012 |
Andreas Huber <andih@google.com> |
am 9dc4c66f: Until we have emulator support for YUV12 rendering do software color conversion.
* commit '9dc4c66f36ca0158b470c78b0929cd9dd929a375':
Until we have emulator support for YUV12 rendering do software color conversion.
|
| 9dc4c66f36ca0158b470c78b0929cd9dd929a375 |
04-May-2012 |
Andreas Huber <andih@google.com> |
Until we have emulator support for YUV12 rendering do software color conversion.
Change-Id: Id2e118cae224facad7077f2f62c62cd21e95e749
related-to-bug: 6444358
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| b667e8a85ffe45459f48ccb10cd87d195c1aaeab |
04-May-2012 |
Andreas Huber <andih@google.com> |
am b26105c0: am f53c36c6: Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev
* commit 'b26105c04508f32528f59dd66b78d1e0858fe90e':
Respect channel mask in ACodec and NuPlayer.
|
| b26105c04508f32528f59dd66b78d1e0858fe90e |
04-May-2012 |
Andreas Huber <andih@google.com> |
am f53c36c6: Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev
* commit 'f53c36c6463d899895719b8b17ba45bd2d552cee':
Respect channel mask in ACodec and NuPlayer.
|
| f53c36c6463d899895719b8b17ba45bd2d552cee |
04-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Respect channel mask in ACodec and NuPlayer." into jb-dev
|
| 94e6cd9b57b4371bdcee221c1f1c06cfeb08d801 |
03-May-2012 |
Glenn Kasten <gkasten@google.com> |
Don't allow AudioTrack frameCount to decrease
This is a workaround for bug that client can cache return value of
frameCount(), and is not notified when this value changes due to automatic
re-recreation of the underlying IAudioTrack.
A better long-term fix would be to notify clients when these kinds of
parameters change, and to fix assumptions in client code that they are
constant (e.g. in SoundPool and maybe obtainBuffer).
Also, once a fast track request is denied, don't request it again.
Bug: 6431187
Change-Id: I55b4ff30bbd9ed3a402e39452a38de52cdea53a9
edia/libmedia/AudioTrack.cpp
|
| 9806555d3930be43e11106281dee354820ac1c88 |
03-May-2012 |
Andreas Huber <andih@google.com> |
Respect channel mask in ACodec and NuPlayer.
Refactor conversion from MetaData into AMessage while we're at it.
Change-Id: I5479129836ea4316e8de28cf1b472bf19e3ac4ab
related-to-bug: 6439076
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/Utils.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/Utils.cpp
|
| 8e842556b0b69332521b9fc5744ba40286fcf088 |
03-May-2012 |
Andreas Huber <andih@google.com> |
am 878044b8: am ef7f3794: Merge "Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST." into jb-dev
* commit '878044b88a088ca021fdfa113150e7a2233a8f16':
Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST.
|
| 878044b88a088ca021fdfa113150e7a2233a8f16 |
03-May-2012 |
Andreas Huber <andih@google.com> |
am ef7f3794: Merge "Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST." into jb-dev
* commit 'ef7f379497199148b5694615e75b3fb2bf666a18':
Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST.
|
| ef7f379497199148b5694615e75b3fb2bf666a18 |
03-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST." into jb-dev
|
| 49e7daaf6c2fd7f3e3d06d350de73de1ffeff5dd |
03-May-2012 |
Andreas Huber <andih@google.com> |
Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST.
Change-Id: I375ca724b228cb0bb4776b87eeaab788e365be84
related-to-bug: 6437985
edia/libstagefright/AwesomePlayer.cpp
|
| 926439764a6af997508c43e0b84d9dd563c36604 |
03-May-2012 |
Glenn Kasten <gkasten@google.com> |
am e5121e9d: am 093000f7: Don\'t allow AudioTrack frameCount to decrease
* commit 'e5121e9da8298021cf245ead2145ba5eb3fb6077':
Don't allow AudioTrack frameCount to decrease
|
| e5121e9da8298021cf245ead2145ba5eb3fb6077 |
03-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 093000f7: Don\'t allow AudioTrack frameCount to decrease
* commit '093000f7d11839b920e8dfaa42ed1d09f48e24b8':
Don't allow AudioTrack frameCount to decrease
|
| 093000f7d11839b920e8dfaa42ed1d09f48e24b8 |
03-May-2012 |
Glenn Kasten <gkasten@google.com> |
Don't allow AudioTrack frameCount to decrease
This is a workaround for bug that client can cache return value of
frameCount(), and is not notified when this value changes due to automatic
re-recreation of the underlying IAudioTrack.
A better long-term fix would be to notify clients when these kinds of
parameters change, and to fix assumptions in client code that they are
constant (e.g. in SoundPool and maybe obtainBuffer).
Also, once a fast track request is denied, don't request it again.
Bug: 6431187
Change-Id: I55b4ff30bbd9ed3a402e39452a38de52cdea53a9
edia/libmedia/AudioTrack.cpp
|
| 67134982753b09e424446816355765ca795e33cc |
03-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 5e877751e119d6afed66041e0bc4253cdd3c4e5c |
03-May-2012 |
Edwin Wong <edwinwong@google.com> |
am 588f93d3: am 6a3969cc: Removed mutex lock in addTextSource, and rename to addTextSource_l to indicate this method needs to be called with a lock hold.
* commit '588f93d3130774056a8c568e31adeac29eb84579':
Removed mutex lock in addTextSource, and rename to addTextSource_l to indicate this method needs to be called with a lock hold.
|
| 588f93d3130774056a8c568e31adeac29eb84579 |
03-May-2012 |
Edwin Wong <edwinwong@google.com> |
am 6a3969cc: Removed mutex lock in addTextSource, and rename to addTextSource_l to indicate this method needs to be called with a lock hold.
* commit '6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b':
Removed mutex lock in addTextSource, and rename to addTextSource_l to indicate this method needs to be called with a lock hold.
|
| 6a3969cc3bcbfc84dbcc27aa726eb96bc03a830b |
03-May-2012 |
Edwin Wong <edwinwong@google.com> |
Removed mutex lock in addTextSource, and rename to addTextSource_l
to indicate this method needs to be called with a lock hold.
Change-Id: I7e99f0a622e7de49c288be09dd4fc955bbca390b
related-to-bug: 5629511
related-to-bug: 5542712
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 6606402d68710aea2a773efb49e1e8695e1a2fcf |
02-May-2012 |
Glenn Kasten <gkasten@google.com> |
Fix race in AudioTrack destruction
Bug: 6427369
Change-Id: Id3b4487406235b881f6f0b4b95c5a02a9b797e75
edia/libmedia/AudioTrack.cpp
|
| 5ea215567bae73185064b9e294af0628e554189c |
02-May-2012 |
James Dong <jdong@google.com> |
am a8f61328: am 359f90ce: Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev
* commit 'a8f613283901dfbe4c06c9149930f4c923c15374':
The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter.
|
| a8f613283901dfbe4c06c9149930f4c923c15374 |
02-May-2012 |
James Dong <jdong@google.com> |
am 359f90ce: Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev
* commit '359f90cea8a59c4a8d25b422fd0b0569e31db2fa':
The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter.
|
| 359f90cea8a59c4a8d25b422fd0b0569e31db2fa |
02-May-2012 |
James Dong <jdong@google.com> |
Merge "The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter." into jb-dev
|
| c5b34ec2729e17e5cfc4b61a4e1a47324d8a8142 |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am ce0a54de: am 06f6ae34: Fix build, WAVExtractor typo
* commit 'ce0a54de16aa2197fe4e6ac9a8c91562ae0ff114':
Fix build, WAVExtractor typo
|
| 4020d65219f5042b16e47e4839c454f674c32fe2 |
02-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 8a6dbce5: am 428a59d9: Merge "Fix race in AudioTrack destruction" into jb-dev
* commit '8a6dbce54b814b453eb8ff4d86257c5770918f7e':
Fix race in AudioTrack destruction
|
| d4b9d56992ee89d950943f04bb2b8d4f6b8af2ba |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 38f45a53: am 95c157cc: Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-dev
* commit '38f45a53ff1a19d3a6440e03a579b23186267062':
Tolerate 0 valid bits value in WAV_EXT
|
| ce0a54de16aa2197fe4e6ac9a8c91562ae0ff114 |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 06f6ae34: Fix build, WAVExtractor typo
* commit '06f6ae34c735640dccdaca6ab1567d8afc9d3938':
Fix build, WAVExtractor typo
|
| 8a6dbce54b814b453eb8ff4d86257c5770918f7e |
02-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 428a59d9: Merge "Fix race in AudioTrack destruction" into jb-dev
* commit '428a59d9f6deb548f46151e7c7962aa204f13cf0':
Fix race in AudioTrack destruction
|
| 38f45a53ff1a19d3a6440e03a579b23186267062 |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 95c157cc: Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-dev
* commit '95c157cc6b109a5058f29edd73811e90d91e92ab':
Tolerate 0 valid bits value in WAV_EXT
|
| 2d94235a343151bed9aa74e86697fa01241ea5cf |
02-May-2012 |
James Dong <jdong@google.com> |
The presence of the kKeyAACProfile is optional, we should not mandate its presence in AACWriter.
o related-to-bug: 6421833
Change-Id: Ia1d75e73270430177d3010e8024b48c88eb7b430
edia/libstagefright/AACWriter.cpp
|
| 06f6ae34c735640dccdaca6ab1567d8afc9d3938 |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix build, WAVExtractor typo
Change-Id: I6885f3f259619526165c6e76364bfe9a4ce49f97
edia/libstagefright/WAVExtractor.cpp
|
| 428a59d9f6deb548f46151e7c7962aa204f13cf0 |
02-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix race in AudioTrack destruction" into jb-dev
|
| f4022f90db5acb680870db8c1150b673cdd211d9 |
02-May-2012 |
Glenn Kasten <gkasten@google.com> |
Fix race in AudioTrack destruction
Bug: 6427369
Change-Id: Id3b4487406235b881f6f0b4b95c5a02a9b797e75
edia/libmedia/AudioTrack.cpp
|
| 95c157cc6b109a5058f29edd73811e90d91e92ab |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-dev
|
| 72b2b9ba68ee85a3054a0de3a8414b8dfb217aeb |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Tolerate 0 valid bits value in WAV_EXT
Some WAV_EXT writers don't properly set the "valid bits per sample"
value and set it to 0. Don't return an error when such a header
is parsed.
Change-Id: I21763087af4f3fc8c62a24b883aae53b23ae71d4
edia/libstagefright/WAVExtractor.cpp
|
| 393c3b5f81cca672f5230295480f7d58d95ea8a2 |
02-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| aabff5d326e568929cf5ea33032aea9f31314b5d |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 375172c4: am 2c3297ab: No warning on using channel order in AudioPlayer
* commit '375172c4ccb1b810e1065cf9dad98b8a9c4c5fc8':
No warning on using channel order in AudioPlayer
|
| 375172c4ccb1b810e1065cf9dad98b8a9c4c5fc8 |
02-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 2c3297ab: No warning on using channel order in AudioPlayer
* commit '2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1':
No warning on using channel order in AudioPlayer
|
| 53b754a324c2326ecf2855bac6d88fbed708d763 |
02-May-2012 |
Martin Storsjo <martin@martin.st> |
am e0b6fc58: stagefright: Remove useless declarations
* commit 'e0b6fc58cb1b5a560da8e7903b1f7d291e7448de':
stagefright: Remove useless declarations
|
| e0b6fc58cb1b5a560da8e7903b1f7d291e7448de |
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
edia/libstagefright/codecs/common/Android.mk
|
| 2c3297ab6c4daaaa7b27eed8418c64cf168fe2a1 |
01-May-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
No warning on using channel order in AudioPlayer
Don't log a warning when an AudioPlayer derives a channel mask
from the channel count, only info-log when channel count is
higher than 2.
Change-Id: Ia1cbced660903483654eede300ef72f7f17dcf78
edia/libstagefright/AudioPlayer.cpp
|
| f1d1919c3c2571ba14d66c8b92e95160d91a895e |
01-May-2012 |
James Dong <jdong@google.com> |
am daaf7b11: Merge "Impl for supporting two video scaling modes" into jb-dev
* commit 'daaf7b119649674cfc414a8761585fed6b0296df':
Impl for supporting two video scaling modes
|
| daaf7b119649674cfc414a8761585fed6b0296df |
01-May-2012 |
James Dong <jdong@google.com> |
Merge "Impl for supporting two video scaling modes" into jb-dev
|
| 59dd94d6e19fd961c16c53712e2c39190884218d |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 31dfd1db: Disable fast track log spam
* commit '31dfd1db7a4d2228d9642008af6f3dd744368eb6':
Disable fast track log spam
|
| ae07f8d4d492ca056276c8f7db691b14599350f1 |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 2409e433: Merge "Enable fast track for SoundPool" into jb-dev
* commit '2409e4337b1e5968cbf75a839778f849266b64d9':
Enable fast track for SoundPool
|
| 31dfd1db7a4d2228d9642008af6f3dd744368eb6 |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
Disable fast track log spam
except for "denied by client" and "denied by server"
Change-Id: I133ab747933729cc1f386813ee06ece055bdb294
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 2409e4337b1e5968cbf75a839778f849266b64d9 |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Enable fast track for SoundPool" into jb-dev
|
| 1477e92867a950016579a644e74f803ed1d90cbb |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
Enable fast track for SoundPool
Change-Id: Ia80b3a7738e4c5dbe2bd5b0f55f0ca49943e2f64
edia/libmedia/SoundPool.cpp
|
| 976e5b71af6dc9a03907a2d0c285a1db87f2223b |
01-May-2012 |
Andreas Huber <andih@google.com> |
am 6635c44c: Merge "Fix assertion triggered when mediaserver dies at roughly the same" into jb-dev
* commit '6635c44c27a8fc2f1eeaaefd5dfc2e65464bcb5d':
Fix assertion triggered when mediaserver dies at roughly the same
|
| 6635c44c27a8fc2f1eeaaefd5dfc2e65464bcb5d |
01-May-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix assertion triggered when mediaserver dies at roughly the same" into jb-dev
|
| 51057a4d0bda2b50eac85db0ce3f80bfcc664b4f |
01-May-2012 |
Andreas Huber <andih@google.com> |
am 8b6bacd0: Properly handle the case where a pending connection process is disconnected
* commit '8b6bacd02a0478ed51b3b15a9e997624c95a7564':
Properly handle the case where a pending connection process is disconnected
|
| 4f6eed0d1c7972a983c075bdcf03089569e13fe1 |
30-Apr-2012 |
James Dong <jdong@google.com> |
Impl for supporting two video scaling modes
o allows the video scaling mode to change at any time
o also remove the scaling mode logic in OMXCodec.cpp
o related-to-bug: 5454345
Change-Id: I6f1714eb0c2774591ce650d56c1e779b8afd085f
nclude/media/mediaplayer.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| b78ff5fb6f56c679bce936078180ce61a1e97288 |
01-May-2012 |
Andreas Huber <andih@google.com> |
Fix assertion triggered when mediaserver dies at roughly the same
time that a client attempts to explicitly free an OMX node.
Change-Id: I767e6af402801357da20b328611cc7cddeed0260
related-to-bug: 6012750
edia/libstagefright/omx/OMX.cpp
|
| 8b6bacd02a0478ed51b3b15a9e997624c95a7564 |
01-May-2012 |
Andreas Huber <andih@google.com> |
Properly handle the case where a pending connection process is disconnected
just at the time when the connection is established.
Change-Id: Icbae5a61edfd6a1336e4b8d3ee513337363c09ea
related-to-bug: 6154825
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/chromium_http/support.cpp
|
| cc4872f03f70fb02ff679c9804a81ceda73e4f56 |
01-May-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 508ae99ea7c74ebf47211b087c9a1fe68dd10f60 |
01-May-2012 |
James Dong <jdong@google.com> |
am 27431de0: Merge "Fix a bug on subtitle (SRT)." into jb-dev
* commit '27431de020e535c31365884316f656bc60b4fe4f':
Fix a bug on subtitle (SRT).
|
| 27431de020e535c31365884316f656bc60b4fe4f |
01-May-2012 |
James Dong <jdong@google.com> |
Merge "Fix a bug on subtitle (SRT)." into jb-dev
|
| 0a2f0e047a2e593c62f54b07b903baf4728b9d0a |
21-Apr-2012 |
Insun Kang <insun@google.com> |
Fix a bug on subtitle (SRT).
Bug: 6375542
Change-Id: Ic5dd5a1826b9f78ccbbddc4dec33b0e915b9329f
edia/libstagefright/timedtext/TimedTextSRTSource.cpp
edia/libstagefright/timedtext/TimedTextSRTSource.h
|
| 7f74221708929f518bc1d68cef666c194a88bc79 |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 04853745: Merge "Temporary fix for both normal tracks & fast tracks" into jb-dev
* commit '048537455e1f6fc400f484e44d88c5617960df6a':
Temporary fix for both normal tracks & fast tracks
|
| 048537455e1f6fc400f484e44d88c5617960df6a |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Temporary fix for both normal tracks & fast tracks" into jb-dev
|
| 810280460da5000785662f6c5b0c7ff3ee0a4cb3 |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
Temporary fix for both normal tracks & fast tracks
If there is at least one active fast track, it forces a mixer
status of ready, which messes up the logic for normal track underruns.
Change-Id: I9de2fcaef090e2c2f99682333af3d3dd618b0d6b
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 31b3a8c8d9bad3039dadeb03d14f6724b54479d7 |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 98f15309: Re-enable fast track for ToneGenerator
* commit '98f153091e8f4190b35b9ce15250f308baf4805c':
Re-enable fast track for ToneGenerator
|
| 98f153091e8f4190b35b9ce15250f308baf4805c |
25-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Re-enable fast track for ToneGenerator
Change-Id: If4152169778df124c750dc45023322ee23c80587
edia/libmedia/ToneGenerator.cpp
|
| 6751e68ed69418be9453d893c369a88ec2730e31 |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
am 6e66e4a9: Merge "Fix race condition for non-started fast tracks" into jb-dev
* commit '6e66e4a9ffcb202beb2bcedb85c7d6f9ff391b4c':
Fix race condition for non-started fast tracks
|
| 6e66e4a9ffcb202beb2bcedb85c7d6f9ff391b4c |
01-May-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix race condition for non-started fast tracks" into jb-dev
|
| 04df2522a520d5681f8044e4188f9e5ed003a4ab |
30-Apr-2012 |
James Dong <jdong@google.com> |
am a3cbc03f: Removed software video encoders that are not OMX-based.
* commit 'a3cbc03f7c646ad9b05d24e72a6d306cb457807c':
Removed software video encoders that are not OMX-based.
|
| a3cbc03f7c646ad9b05d24e72a6d306cb457807c |
28-Apr-2012 |
James Dong <jdong@google.com> |
Removed software video encoders that are not OMX-based.
o related-to-bug: 5933287
Change-Id: I63635375e2bef00733b61adc3fa12c29df7e2155
edia/libstagefright/Android.mk
edia/libstagefright/MediaCodecList.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/include/AVCEncoder.h
edia/libstagefright/include/M4vH263Encoder.h
|
| b0acd5c45f770d6f456b4e5f7b0444804bdff6a7 |
30-Apr-2012 |
Andreas Huber <andih@google.com> |
am 99bbaff7: Merge "Make the transport stream extraction code output ADTS AAC frames." into jb-dev
* commit '99bbaff7853eab325bd87b315d532909206592b1':
Make the transport stream extraction code output ADTS AAC frames.
|
| 99bbaff7853eab325bd87b315d532909206592b1 |
30-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Make the transport stream extraction code output ADTS AAC frames." into jb-dev
|
| 288ed2103d96f3aabd7e6bea3c080ab6db164049 |
26-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Fix race condition for non-started fast tracks
This required re-implementing how fast tracks are considered active.
Now, they use the same logic as normal tracks, except underrun is ignored.
Other changes:
- add framesReady() to AudioBufferProvider interface
- rebased
- add track underrun counter state to fast mixer dump state
- move dumpsys header to Track::appendDumpHeader()
so it closer to where tracks are dumped
- display track state in dumpsys as a character code
- measure and display warmup time and cycles in dumpsys
- copy in the presentation complete code
- add ExtendedAudioBufferProvider for framesReady() which returns size_t
- simplify underrun tracking
- deferred reset track after stop()
- add comments
Change-Id: I7db8821bc565230ec76da1f9380fe3fb09735e5b
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/ExtendedAudioBufferProvider.h
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixer.h
ervices/audioflinger/FastMixerState.h
ervices/audioflinger/SourceAudioBufferProvider.cpp
ervices/audioflinger/SourceAudioBufferProvider.h
|
| 21679c2a1b6fe4a1e61024343389ff7e96e58ebc |
30-Apr-2012 |
Dave Burke <daveburke@google.com> |
am 4c9cd95b: Merge "Added support for HE-AAC recording" into jb-dev
* commit '4c9cd95b27a638701be2ffa1713273ba2f624770':
Added support for HE-AAC recording
|
| 4c9cd95b27a638701be2ffa1713273ba2f624770 |
30-Apr-2012 |
Dave Burke <daveburke@google.com> |
Merge "Added support for HE-AAC recording" into jb-dev
|
| 56ad61a253a94586d946cc09ed814e7a95a40ca7 |
30-Apr-2012 |
Andreas Huber <andih@google.com> |
Make the transport stream extraction code output ADTS AAC frames.
Change-Id: I145f4b1265045750f1b0425269f3ffe5fb055f61
related-to-bug: 6419102
edia/libstagefright/mpeg2ts/ESQueue.cpp
|
| 1745e1e28c3a6064ebdc46921f74ec44f7f1c9fd |
30-Apr-2012 |
Andreas Huber <andih@google.com> |
am 0c0abd4a: Merge "Notify the client about an initial size of (0, 0) instead of (320, 240)." into jb-dev
* commit '0c0abd4ad26971b5fba94734137fe0bb1a590ab6':
Notify the client about an initial size of (0, 0) instead of (320, 240).
|
| 0c0abd4ad26971b5fba94734137fe0bb1a590ab6 |
30-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Notify the client about an initial size of (0, 0) instead of (320, 240)." into jb-dev
|
| 0b7c9a327f5d10b841a3aa2bbe103a2ca6dcac37 |
30-Apr-2012 |
Andreas Huber <andih@google.com> |
Notify the client about an initial size of (0, 0) instead of (320, 240).
which is documented as "we don't have that information just yet".
Change-Id: I158a53af83d526f713cd30372fce28558894b857
related-to-bug: 6293020
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
|
| 7452b1782adbe881cf26b2c01a6910305a9f7b32 |
30-Apr-2012 |
Marco Nelissen <marcone@google.com> |
am 8b71241c: Fix mono gapless playback for decoders that output stereo
* commit '8b71241ce7353731ab75322c46e090ee35014a33':
Fix mono gapless playback for decoders that output stereo
|
| 8b71241ce7353731ab75322c46e090ee35014a33 |
27-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Fix mono gapless playback for decoders that output stereo
The old AAC decoder always outputs stereo, even for mono source material, so we
need to use the number of channels of the output when calculating the number of
bytes to skip, not the number of channels in the source.
This makes OMXCodec skip the right amount of data, and prevents NuPlayer from
writing half a frame and then asserting when the AudioSink doesn't accept it.
Also move use of the SkipCutBuffer from NuPlayer to ACodec, so that it also
works when using the new Java APIs, and make SkipCutBuffer derive from RefBase.
b/774846
Change-Id: I34df9fea3e6730617eae559afaa556f4085ef0a0
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/SkipCutBuffer.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/OMXCodec.cpp
|
| f60c660f048d5f5e2458cff243c20400d73757a7 |
29-Apr-2012 |
Dave Burke <daveburke@google.com> |
Added support for HE-AAC recording
Fixed bug in decoder related to sample rates / channel counts
Made decoder follow Fraunhofer pattern
Log if bitrate not available
Bug: 6275957
Change-Id: I47a8e29358fa4a88ebc73fe02d46a2bfb96c64fe
nclude/media/mediarecorder.h
edia/libmedia/MediaProfiles.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp
|
| 1bd144f1043dd556dcc0a51106007887a9eb40c0 |
30-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 54a950f93f6f09d0a670d94c897f05f54e9da382 |
28-Apr-2012 |
Eric Laurent <elaurent@google.com> |
am 83faee05: AudioFlinger: fix stop detection for static tracks
* commit '83faee053cfd4251dbb591b62039f563ffdac399':
AudioFlinger: fix stop detection for static tracks
|
| 83faee053cfd4251dbb591b62039f563ffdac399 |
28-Apr-2012 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: fix stop detection for static tracks
The end of playback and end of presentation detection was broken for
static AudioTracks (tracks using shared memory buffers passed by client).
The mixer should not wait for a minimal amount of frames to be available to mix
a static track otherwise the last frames might never be consumed.
A static track should be removed from active list in case of underrun even if not
stopped().
Issue 6411521.
Change-Id: I66a2c1a77e98149e5049a223a6f04c3b8c5ad11a
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 516a318198044012b74258e48ab522e03c6c7f84 |
28-Apr-2012 |
James Dong <jdong@google.com> |
am 209ec37b: Fixed incorrect codec type in the output for profiles/levels in cmd stagefright
* commit '209ec37b27a4fb6c92005c91ecf993ec19a3d430':
Fixed incorrect codec type in the output for profiles/levels in cmd stagefright
|
| 209ec37b27a4fb6c92005c91ecf993ec19a3d430 |
28-Apr-2012 |
James Dong <jdong@google.com> |
Fixed incorrect codec type in the output for profiles/levels in cmd stagefright
o related-to-bug: 6401068
Change-Id: Icdc2cfa37ed053f53d1466d8b068f1d9973ed82f
mds/stagefright/stagefright.cpp
|
| 0e0156a1945068af1c2dc9a9eb6d311e47a51f18 |
27-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
am 300a2ee9: Fast mixer configuration
* commit '300a2ee9327c05fbf9d3a5fd595b558097c7c5e8':
Fast mixer configuration
|
| 300a2ee9327c05fbf9d3a5fd595b558097c7c5e8 |
25-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Fast mixer configuration
Add compile-time option for when to use fast mixer.
Double HAL frame count for fast tracks due to SRC, and make the normal
frame count multiplier an even number for compatibility. Sample rate
conversion can result in underruns if the HAL frame count is used as is,
due to jitter.
Change-Id: Ia1f8da1b8ac247d9807acfce3c318161db000905
ervices/audioflinger/AudioFlinger.cpp
|
| 0f881b4dd127799c4ec0c87fab952b1c5a00f81e |
27-Apr-2012 |
Marco Nelissen <marcone@google.com> |
am 9a025a92: Merge "Add option to stagefright for writing decoded PCM" into jb-dev
* commit '9a025a922c1fed5cb5d1956a55b7f69ad259abb3':
Add option to stagefright for writing decoded PCM
|
| 9a025a922c1fed5cb5d1956a55b7f69ad259abb3 |
27-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Add option to stagefright for writing decoded PCM" into jb-dev
|
| c434ac82b57108bd08f58612f6ac8cbc92dbd975 |
25-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Add option to stagefright for writing decoded PCM
b/774846
Change-Id: I8edce3e7d60b3f56b4eb1ed75ca80285c5ae3972
mds/stagefright/stagefright.cpp
|
| 5f40b1e73087a9c2a052f1469355fda9f27f0171 |
27-Apr-2012 |
Andreas Huber <andih@google.com> |
am d8b00037: Merge "Opt in to the WVM extractor\'s secondary (cryptoPlugin) mode." into jb-dev
* commit 'd8b0003739768953b6e28080f434fdadec55c0e3':
Opt in to the WVM extractor's secondary (cryptoPlugin) mode.
|
| d8b0003739768953b6e28080f434fdadec55c0e3 |
27-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Opt in to the WVM extractor's secondary (cryptoPlugin) mode." into jb-dev
|
| 176819f6bd9ad5e7fc21dacee268ceee3f3070f4 |
27-Apr-2012 |
Jeff Tinker <jtinker@google.com> |
am e6d7f46c: Merge "Expose an API to run the WV extractor in crypto plugin mode." into jb-dev
* commit 'e6d7f46c566d16792068f25ef479e3fbae7365b8':
Expose an API to run the WV extractor in crypto plugin mode.
|
| e6d7f46c566d16792068f25ef479e3fbae7365b8 |
27-Apr-2012 |
Jeff Tinker <jtinker@google.com> |
Merge "Expose an API to run the WV extractor in crypto plugin mode." into jb-dev
|
| a4a818ac582312b1893038ca05d21704d42fc5cb |
27-Apr-2012 |
James Dong <jdong@google.com> |
am 543f0fd4: Merge "Bug fix : enqueue one next subtitle for each subtitle." into jb-dev
* commit '543f0fd46b2355c0ffc22445c8594f6dcde6a388':
Bug fix : enqueue one next subtitle for each subtitle.
|
| 543f0fd46b2355c0ffc22445c8594f6dcde6a388 |
27-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Bug fix : enqueue one next subtitle for each subtitle." into jb-dev
|
| cd1af7d06fdb3d52c6794e508f99924e486d486b |
27-Apr-2012 |
James Dong <jdong@google.com> |
am e0c026e3: Merge "Handle the case when there is no timed text track" into jb-dev
* commit 'e0c026e32277de27627b2bc24e51f333a2f1c4ee':
Handle the case when there is no timed text track
|
| e0c026e32277de27627b2bc24e51f333a2f1c4ee |
27-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Handle the case when there is no timed text track" into jb-dev
|
| ed709d00ead015b8a0de50ebc410073f6a078fd5 |
26-Apr-2012 |
Jeff Tinker <jtinker@google.com> |
Expose an API to run the WV extractor in crypto plugin mode.
Provides compatibility with the MediaCodec model.
Change-Id: I76f2c7d1e9d2cfc3e76b531ac9b2cf66aa6a4327
related-to-bug: 5986621
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 94c1c8c99b70f2fdab87e131812eb253271e5500 |
27-Apr-2012 |
Andreas Huber <andih@google.com> |
Opt in to the WVM extractor's secondary (cryptoPlugin) mode.
Change-Id: If0abec6e34b20b59ee2fc5bd97573a73d68465f0
related-to-bug: 6276111
edia/libstagefright/NuMediaExtractor.cpp
|
| 34f729ef01b52482573019e00e89935afbcea18a |
27-Apr-2012 |
Marco Nelissen <marcone@google.com> |
am 41914bec: Account for new AAC decoder\'s delay
* commit '41914becfd019c619783d875c61ef71db0e67400':
Account for new AAC decoder's delay
|
| 41914becfd019c619783d875c61ef71db0e67400 |
26-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Account for new AAC decoder's delay
This drops the first block of decoded samples, and flushes the decoder
at the end of the stream to get the last bit of valid data.
b/774846
Change-Id: I1ae61b3e0619444441d160f33903eb61f57c6d31
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| 5132c56def7071b84030469defbb9b356d85082c |
26-Apr-2012 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: fix tracks ready for mixing logic.
Commit fec279f5 broke the logic allowing to wait for an application
to provide frames for mixing in the case of several active tracks.
This was causing audio gaps when playing music and superposing a
sound Fx (keyboard clicks...).
Issue 6185007.
Change-Id: Id0fad150d0b615646d6b1387c0de8ca944d228f6
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 4e37f824c23069a04860d5b17abe99e5cc29ea1c |
26-Apr-2012 |
Andreas Huber <andih@google.com> |
am 0756aa99: Merge "NuMediaExtractor API to unselect tracks and finer control over seeking." into jb-dev
* commit '0756aa99dffd5740d963fdda60699fdefe58ce85':
NuMediaExtractor API to unselect tracks and finer control over seeking.
|
| c83fc3e1020b26fc36e6a9cd1cdc352ee0374069 |
26-Apr-2012 |
Eric Laurent <elaurent@google.com> |
am 5a1a5a7b: Merge "AudioFlinger: fix tracks ready for mixing logic." into jb-dev
* commit '5a1a5a7b6494d2c96090ce6c76360a3367d0e65f':
AudioFlinger: fix tracks ready for mixing logic.
|
| 95c8b5a650c4e62f66c8f0e5490379247ceafdd6 |
26-Apr-2012 |
James Dong <jdong@google.com> |
am 209731c4: Merge "Add profile/level dump for encoders in cmd stagefright" into jb-dev
* commit '209731c4ae8c223e04e13717a4125907a67fcf4b':
Add profile/level dump for encoders in cmd stagefright
|
| 7823a6381ee6ebdf11b922123169d737921e6e22 |
26-Apr-2012 |
James Dong <jdong@google.com> |
am 2b095b74: Merge "Software MPEG4/H263 video encoder is now OMX-based" into jb-dev
* commit '2b095b74526cf5c9472131452600a02d8a66c32e':
Software MPEG4/H263 video encoder is now OMX-based
|
| 514bcaf1e842e8e90fbeabf35e7e654622b75b02 |
17-Apr-2012 |
James Dong <jdong@google.com> |
Handle the case when there is no timed text track
o also replaced mTimedTextLock with mLock, since there is no particular reason to use a separate lock for timed text
o related-to-bug: 6110705
Change-Id: Ia687e96956692c42d492e57992e5721ca1e8e18b
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 0756aa99dffd5740d963fdda60699fdefe58ce85 |
26-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "NuMediaExtractor API to unselect tracks and finer control over seeking." into jb-dev
|
| 9d07855aaff8a6b502a3ab058002cdd4a278b965 |
26-Apr-2012 |
Andreas Huber <andih@google.com> |
NuMediaExtractor API to unselect tracks and finer control over seeking.
Change-Id: I44d5a2b01d34b771bb0ff48b12829e33314c2374
related-to-bug: 6276111
nclude/media/stagefright/NuMediaExtractor.h
edia/libstagefright/NuMediaExtractor.cpp
|
| 5a1a5a7b6494d2c96090ce6c76360a3367d0e65f |
26-Apr-2012 |
Eric Laurent <elaurent@google.com> |
Merge "AudioFlinger: fix tracks ready for mixing logic." into jb-dev
|
| da747447c1d4b5205469b4e94485b8769df57a97 |
26-Apr-2012 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: fix tracks ready for mixing logic.
Commit fec279f5 broke the logic allowing to wait for an application
to provide frames for mixing in the case of several active tracks.
This was causing audio gaps when playing music and superposing a
sound Fx (keyboard clicks...).
Issue 6185007.
Change-Id: Id0fad150d0b615646d6b1387c0de8ca944d228f6
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 209731c4ae8c223e04e13717a4125907a67fcf4b |
26-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Add profile/level dump for encoders in cmd stagefright" into jb-dev
|
| 2b095b74526cf5c9472131452600a02d8a66c32e |
26-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Software MPEG4/H263 video encoder is now OMX-based" into jb-dev
|
| b421960ef62eb5c8335226c354d29311425f35e7 |
26-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| 0f7c0b43056fdc719662971bcde5d2c851e3981a |
26-Apr-2012 |
Dave Burke <daveburke@google.com> |
am 94033577: Handle reconfiguration properly.
* commit '940335776b6d4eb91b13c4e56bc20bed3ac0011b':
Handle reconfiguration properly.
|
| 940335776b6d4eb91b13c4e56bc20bed3ac0011b |
26-Apr-2012 |
Dave Burke <daveburke@google.com> |
Handle reconfiguration properly.
Bug 6388957.
Change-Id: I61a86ed6fdad99497535249acda5e4a325911918
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 02320e5a69c140d1f3f4e6eb69b4029151b7093e |
26-Apr-2012 |
Dave Burke <daveburke@google.com> |
am aeb8fd46: Add Fraunhofer AAC encoder with AAC-ELD support.
* commit 'aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b':
Add Fraunhofer AAC encoder with AAC-ELD support.
|
| aeb8fd460ed87d032b3fb8bb61e21eb542ce0f5b |
19-Apr-2012 |
Dave Burke <daveburke@google.com> |
Add Fraunhofer AAC encoder with AAC-ELD support.
Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
nclude/media/mediarecorder.h
nclude/media/stagefright/AACWriter.h
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libmedia/MediaProfiles.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AACWriter.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp
edia/libstagefright/codecs/aacenc/SoftAACEncoder2.h
|
| f0bcc5e1522d9176e2d3077eb9163ed5add7d819 |
26-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
am e0fa467e: Move frame count calculations for fast tracks
* commit 'e0fa467e1150c65a7b1b1ed904c579b40f97c9df':
Move frame count calculations for fast tracks
|
| 034b4c45a8774789883ca6920d533ef5e868d3c8 |
26-Apr-2012 |
Andreas Huber <andih@google.com> |
am e370bb62: Bump up the max number of items in an AMessage, remove overly stringent
* commit 'e370bb62b89d2f2980f519392010ea08a24c558e':
Bump up the max number of items in an AMessage, remove overly stringent
|
| c4ddeeb06a9defc359e99d1ce20882e1d688d1b3 |
21-Apr-2012 |
Insun Kang <insun@google.com> |
Bug fix : enqueue one next subtitle for each subtitle.
o Do not enqueue another subtitle when notifying a null message.
related-to-bug: 6401574
Change-Id: I366e643ffa1601c11a12e46fcf7c00a469c77448
edia/libstagefright/timedtext/TimedTextPlayer.cpp
|
| e0fa467e1150c65a7b1b1ed904c579b40f97c9df |
24-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Move frame count calculations for fast tracks
For fast tracks: move the default and minimum frame count calculations
from client to server. If accepted, the default and minimum frame count
is the fast mixer (HAL) frame count. If denied, the default and minimum
frame count is the same as it currently is for normal tracks.
For normal tracks: there is no change yet, preserve legacy behavior for
now but add a FIXME to change this later.
Bug fix: the test for buffer alignment matches channelCount was wrong.
Bug fix: check for 8-bit data in shared memory, which isn't supported.
Optimizations:
- in set(), only call AudioSystem::getOutputSamplingRate() when needed
- in createTrack_l(), only call AudioSystem::getSamplingRate() and
AudioSystem::getFrameCount() when needed
Change-Id: I79d2fe507db1a8f7bb094c71da8a129951dbb82f
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 1ab12519ec3d4922d1980f975fc884908879e0f0 |
26-Apr-2012 |
James Dong <jdong@google.com> |
Add profile/level dump for encoders in cmd stagefright
o related-to-bug: 6401068
Change-Id: I51e3eeb026aa75c4492d421f5f239dc9072a9c8b
mds/stagefright/stagefright.cpp
|
| 1700744ae0ce2fcf722816453ae0af2cd5646458 |
24-Apr-2012 |
James Dong <jdong@google.com> |
Software MPEG4/H263 video encoder is now OMX-based
o related-to-bug: 6401068
Change-Id: If8eccea060f38e42ad31eb6e91aaa832e67c5559
edia/libstagefright/codecs/m4v_h263/enc/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| e370bb62b89d2f2980f519392010ea08a24c558e |
25-Apr-2012 |
Andreas Huber <andih@google.com> |
Bump up the max number of items in an AMessage, remove overly stringent
CHECK() limiting us to just audio/* or video/* tracks.
related-to-bug: 6399405
Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
nclude/media/stagefright/foundation/AMessage.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/NuMediaExtractor.cpp
|
| 016dbeedb8afb07ef521eaa411430e93ca47b70e |
25-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Add option to stagefright for writing decoded PCM
Change-Id: I8edce3e7d60b3f56b4eb1ed75ca80285c5ae3972
mds/stagefright/stagefright.cpp
|
| b67ecca4fddb161ab223bcf65651e5480b4ab4cc |
25-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to jb-dev
|
| bb28e578c1eb95ab9b7ee2f8bde5a929ca10e5a2 |
25-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Move frame count calculations for fast tracks"
|
| e4f70a7ea72c2a9fca60e6b64a258604e9333580 |
25-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Software AVC encoder is now OMX-based"
|
| ab16fea045f2ec90a928a35f3c9c02da0a27252f |
24-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Move frame count calculations for fast tracks
For fast tracks: move the default and minimum frame count calculations
from client to server. If accepted, the default and minimum frame count
is the fast mixer (HAL) frame count. If denied, the default and minimum
frame count is the same as it currently is for normal tracks.
For normal tracks: there is no change yet, preserve legacy behavior for
now but add a FIXME to change this later.
Bug fix: the test for buffer alignment matches channelCount was wrong.
Bug fix: check for 8-bit data in shared memory, which isn't supported.
Optimizations:
- in set(), only call AudioSystem::getOutputSamplingRate() when needed
- in createTrack_l(), only call AudioSystem::getSamplingRate() and
AudioSystem::getFrameCount() when needed
Change-Id: I79d2fe507db1a8f7bb094c71da8a129951dbb82f
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| c1d8115e8a0bdaeb2b723d395b9a85a02c90c933 |
24-Apr-2012 |
Andreas Huber <andih@google.com> |
Make sure OMXCodec and ACodec both accept more than 2 channels of audio
and fill in the OMX channel mask properly.
Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| 5c61b361d1c55a93a215cfb2c325b4987f57f1c5 |
29-Mar-2012 |
James Dong <jdong@google.com> |
Software AVC encoder is now OMX-based
o related-to-bug: 6383440
Change-Id: I0b1ae50a704b0979857ea447585eabe86602149a
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp
edia/libstagefright/codecs/avc/enc/SoftAVCEncoder.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 1dc28b794587be22c90a97070d928f94586db638 |
24-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Use scheduling policy service
Change-Id: I3c09da1dc0de5039d0c15ce7fb2bc373fa398712
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/ISchedulingPolicyService.cpp
ervices/audioflinger/ISchedulingPolicyService.h
ervices/audioflinger/SchedulingPolicyService.cpp
ervices/audioflinger/SchedulingPolicyService.h
|
| c922b4208cc19167e292a06a5fb99ea751cf3d3e |
24-Apr-2012 |
The Android Automerger <android-build@android.com> |
merge in jb-release history after reset to master
|
| 9e786c78898d738b1cb21cd8bdfcc49dbcacfce6 |
24-Apr-2012 |
Mathias Agopian <mathias@google.com> |
Merge "remove dependency on SurfaceTexture::connect()"
|
| a636433cbd09c0708b85f337ef45c0cdef3bcb4d |
19-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Use C APIs instead of C++ APIs for policy
The C++ APIs are going away.
Note: we use tid == 0 which is not supported yet by the C APIs,
do not submit this until that is added.
Change-Id: I0e90789e6c81c69f2544e899c52421ea5d1342be
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| b657f7651c26aee59a80242cd72adfbda6948ce6 |
23-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Fix regression in AudioTrack::pause()
Bug: 6379646
Change-Id: I12b53bc4118499ddc73a53a981f3f56328140868
edia/libmedia/AudioTrack.cpp
|
| 7d351630d35fcfa5faaa3f39a1cb68c09babc98f |
23-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Fix ToneGenerator regression
Bug: 6378847
Change-Id: Ib3324c7a5951ac95f99993bfae27ea02bfda08ff
edia/libmedia/ToneGenerator.cpp
|
| 9adb12830ac2da72c91b842d24725ced6d236b16 |
24-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Downmix support for 5.1 and quad with side channels"
|
| db46b48d24e03f5bcb8de6d0ff852ec4153401e7 |
23-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Downmix support for 5.1 and quad with side channels
In DOWNMIX_TYPE_FOLD mode, add support for variants of quad and
5.1 channel masks where the "side" channels are used instead of
the "back" channels. These variants have the same channel order,
so they can share the same downmix function.
Change-Id: I5f9cb7cb120927189de680c2a968d6136dc1fc43
edia/libeffects/downmix/EffectDownmix.c
|
| adb6e8dc714f38e261b1593efa4eb17bac5e1678 |
23-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix regression in AudioTrack::pause()"
|
| 6f9add864e3513917fd35302b766e26aa40e6818 |
23-Apr-2012 |
Mathias Agopian <mathias@google.com> |
remove dependency on SurfaceTexture::connect()
Change-Id: I97ce29ecfde4df171120a3570db9575b32c8d362
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
|
| ca8b28013c0558a4a3323a1a0f58520277200086 |
23-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Fix regression in AudioTrack::pause()
Bug: 6379646
Change-Id: I12b53bc4118499ddc73a53a981f3f56328140868
edia/libmedia/AudioTrack.cpp
|
| 36513e357dfc6c53898d4b4f768c9fd4822f4653 |
23-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Make sure NuMediaExtractor is thread safe."
|
| dc7431e70b4b030b5f42d0dfc3ef244d4f583dd2 |
23-Apr-2012 |
Andreas Huber <andih@google.com> |
Make sure NuMediaExtractor is thread safe.
Change-Id: If261c4d87d5569a0d7cfd75afe311803a6ce0109
nclude/media/stagefright/NuMediaExtractor.h
edia/libstagefright/NuMediaExtractor.cpp
|
| 4a6c9c59a0297c3c6fcfadddaed7a9a976046daf |
23-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix ToneGenerator regression"
|
| 66e820f17ec112385602c29d0dae71418128ed5e |
23-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioFlinger normal mixer uses FastMixer"
|
| 1d685d767a5dd1003eb62f6ad1a26b39645a474f |
23-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Fix ToneGenerator regression
Bug: 6378847
Change-Id: Ib3324c7a5951ac95f99993bfae27ea02bfda08ff
edia/libmedia/ToneGenerator.cpp
|
| 58912562617941964939a4182cda71eaeb153d4b |
03-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger normal mixer uses FastMixer
Change-Id: I3131bb22d2d057e9197a2ebfa6aa1cfaab9e5321
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/Soaker.h
|
| 0818e739bdbcf16f6dfb21d507002ceaaf664ee4 |
23-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Make sure we restore our input buffer to its original state if we want to revisit it."
|
| a08f041125c7688aa33aef1b229278641ae1c375 |
22-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Configure policy of mediaserver threads"
|
| 3acbd053c842e76e1a40fc8a0bf62de87eebf00f |
28-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Configure policy of mediaserver threads
Change-Id: Ifd825590ba36996064a458f64453a94b84722cb0
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 3463fa2799a14631222c15245ac1ad85d19b77ca |
22-Apr-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Made AudioRecord a subclasss of RefBase"
|
| a0a98ca6ec9b599af79a597cb7c5350b61a77624 |
21-Apr-2012 |
Eric Laurent <elaurent@google.com> |
Made AudioRecord a subclasss of RefBase
Made AudioRecord a subclass of RefBase to allow using strong
references and solve concurrency issues.
Issue 6254582.
Change-Id: Ic1f3845958f477e8b2d23d3d25bf0f666addcb3b
nclude/media/AudioRecord.h
|
| f853499c6a088ef8506cacbb3ccdffa87e0cec3e |
21-Apr-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Add support for deep audio buffers"
|
| 6b7b8227cc8753fde4094ca8af2d381c2740826f |
21-Apr-2012 |
Andreas Huber <andih@google.com> |
Make sure we restore our input buffer to its original state if we want to revisit it.
Change-Id: Iab62562c4dea13520751c37c9448c0b19c82d739
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 1948eb3ea6eee336e8cdab9b0c693f93f5f19993 |
14-Apr-2012 |
Eric Laurent <elaurent@google.com> |
Add support for deep audio buffers
Allow AudioSink to use deep audio buffering when the
source is audio only and its duration is more than
a certain threshold.
This helps improve battery life but implies higher
audio latency.
Change-Id: Ie79915b61c370292f05aabda9779356570e03cbb
nclude/media/MediaPlayerInterface.h
nclude/media/stagefright/AudioPlayer.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
edia/libmedia/AudioTrack.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
|
| fc554559032e394de1b28b918efb8ba9f72162fd |
20-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Add the ability to query the amount of cached data to NuMediaExtractor."
|
| c95cfbb87d0ac5e773037019a96bfc29972d4b4e |
12-Apr-2012 |
John Grossman <johngro@google.com> |
TimedAudioTrack: Optimize the queue trim operation.
Hand merge from ics-aah
> TimedAudioTrack: Optimize the queue trim operation.
>
> Don't perform the end PTS calculation for each buffer during trimming.
> Instead, only calculate the ending PTS of a buffer if there is no next
> buffer in the queue. This optimization assumes that the buffers being
> queued are in monotonic media time order (a fair assumption for now)
> and that the timestamps in the audio are contiguous (not a requirement
> for this API, but a reality of how it is being used right now).
>
> In the case where the audio is discontinuous on purpose, it is
> that this optimization will cause the system hold one extra buffer
> which it could have safely trimmed. It should not be much of an issue
> since in real life the audio is almost always contiguous, and as long
> as the media clock is running and the mixer is mixing, the buffer will
> be used up and discard as part of the normal flow anyway.
>
> Change-Id: I00061e85ee7d5651fcf80751646c7d7415894a14
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I0054b58e1389fa005aa990cb5710caf4af7b706a
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
|
| 8d314b709fdd81bb64bdaa8d72a0b19c355cefb9 |
19-Apr-2012 |
John Grossman <johngro@google.com> |
TimedAudioTrack: Fix continuity threshold handling.
Hand merge from ics-aah
> TimedAudioTrack: Fix continuity threshold handling.
>
> Fix issues with continuity threshold handling; notably
> + If the steady-state continuity threshold is exceeded, be sure to
> clear the on-time flag. Failure to do this will result in the
> system picking a new mix point which simply satisfies the
> steady-state continuity threshold instead of the startup threshold.
> Since we are putting a discontinuity in presentation anyway, we
> really want to pick a perfect point, not just an OK point.
> + Tighten the steady-state continuity threshold. It was currently set
> to 100mSec which is enormous. 4mSec (the new setting) is much more
> appropriate. On systems with a VCXO (like tungsten) this should
> never be wrong by more than a sample. If TimedAudioTracks are ever
> to be used on VCXO-less systems, this threshold should probably be a
> a parameter configurable by applications on a track by track basis
> so they can make the tradeoff between allowed error and frequency of
> disruptive corrections.
> + Reset the on-time flag if the mixer provides no PTS during a mix
> operation. This makes for a convenient way for the HAL to reset
> timed tracks when it makes changes for delay compensation across
> multiple outputs.
>
> Change-Id: I2cb23de5a3d1f75618abc1c8ab903db883837aa8
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: Ibd28c9d290494b0b19eb01caf2d9bfdef606a9b4
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
|
| 21e8c50bd13ebe44f3088e26c9c6df0e163c469c |
12-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
FastMixer update
Updates:
- Add support for mono fast tracks
- Add support for optional sample rate conversion on fast tracks
- Log sample rate and frame count
- Enable statistics
Change-Id: Ife014edf4f452da361f3eaaae19209ef6ff6958b
ervices/audioflinger/Android.mk
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixer.h
ervices/audioflinger/FastMixerState.cpp
ervices/audioflinger/FastMixerState.h
|
| a53d87c7b1428fe02f535c31dafd64cb1362fde9 |
20-Apr-2012 |
Andreas Huber <andih@google.com> |
Add the ability to query the amount of cached data to NuMediaExtractor.
Change-Id: I0966270a2bd36698330beaa03f47d02fc6a40c44
related-to-bug: 6364341
nclude/media/stagefright/NuMediaExtractor.h
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| 8d6086781c79620ce6133df7bd27f0efdee6b4e6 |
19-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Allow propagation of error information and description from the CryptoPlugin to"
|
| 5b8987e7de9d04b09153f329c680d2316cdb44ec |
19-Apr-2012 |
Andreas Huber <andih@google.com> |
Allow propagation of error information and description from the CryptoPlugin to
the higher layers.
Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330
related-to-bug: 6365261
mds/stagefright/codec.cpp
nclude/media/ICrypto.h
nclude/media/stagefright/MediaCodec.h
nclude/media/stagefright/MediaErrors.h
edia/libmedia/ICrypto.cpp
edia/libmediaplayerservice/Crypto.cpp
edia/libmediaplayerservice/Crypto.h
edia/libstagefright/MediaCodec.cpp
|
| 1345ef0f49f83f37953e6d30616611a92294144a |
19-Apr-2012 |
Dave Burke <daveburke@google.com> |
Merge "Revert "Temporary revert of new AAC codec to fix build""
|
| eee7f9dd0d3410877dd58a14c4b80aacbeb32d72 |
19-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Make timed text source type explicit in TimedTextDriver"
|
| 05cd06e19f968c7320e8e85fc7122125f284741c |
19-Apr-2012 |
Dave Burke <daveburke@google.com> |
Revert "Temporary revert of new AAC codec to fix build"
This reverts commit f356cc9c9995ba292bf116f1cb28a6caa1b65fd2.
edia/libstagefright/codecs/aacdec/Android.mk
|
| fd9e14bc28f377065e43ec6833d754ca151b3941 |
19-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Turn off debug in downmix effect"
|
| 2d359a85ef5b72f1cb47df227b44fe4f3c5fbd60 |
19-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Add support for scaling mode parameter"
|
| 324c81a9f45614cb1d924ba0bcecddc120b2d69f |
19-Apr-2012 |
Dave Burke <daveburke@google.com> |
Merge "Temporary revert of new AAC codec to fix build"
|
| a43af9853f4dfdea03c01037f1c73cf29441f89b |
19-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Remove new camera connect API."
|
| f356cc9c9995ba292bf116f1cb28a6caa1b65fd2 |
19-Apr-2012 |
Dave Burke <daveburke@google.com> |
Temporary revert of new AAC codec to fix build
Change-Id: I5c7f0360883fc68e313d10b1aa5dac1463fae7fb
edia/libstagefright/codecs/aacdec/Android.mk
|
| c2dabeb11d625fadfd923e6461405f5fbf383320 |
19-Apr-2012 |
Dave Burke <daveburke@google.com> |
Merge "Make AAC 5.1 work Fix bug with pausing audio"
|
| 08ad5efcef90e24db2863c0f85972ed05fe848a2 |
18-Apr-2012 |
Wu-cheng Li <wuchengli@google.com> |
Remove new camera connect API.
Applications are not resumed under the lock screen now.
This API is not needed anymore.
bug:5584464
Change-Id: I115daf6b647348617ec0fc05b626878c945b9b29
amera/Camera.cpp
amera/ICameraService.cpp
nclude/camera/Camera.h
nclude/camera/ICameraService.h
edia/libstagefright/CameraSource.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| f28c8792f64e10c3c477d86bf4804a8566ff524e |
19-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Turn off debug in downmix effect
Change-Id: I4eda43166d23b3297cf769056a6db720401799aa
edia/libeffects/downmix/EffectDownmix.c
|
| 3476de62fb10e76412452ef4c6bd71936c9f7db1 |
16-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Add support for scaling mode parameter
Support VISUALIZER_PARAM__SCALING_MODE parameter.
Modify process() function to use new volume scaling parameter,
used to set whether captured values are maximized by current
headroom in the buffer (default existing behaviora) or left
as is and thus affected by volume.
Modify AudioEffect to allow subclasses to override the following
events: control status changed, enable status changed, command
executed.
In Visualizer class (a subclass of AudioEffect), reset the
scaling mode and capture size on the actual effect
as cached when control is regained.
This will allow the effect to be properly
configured whenever Visualizers with different scaling
modes or capture sizes are released (e.g. from java
release() method).
Change-Id: I05cb9f925a296dceca91bafa9fe294ef2b2c2bd5
nclude/media/AudioEffect.h
nclude/media/Visualizer.h
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/Visualizer.cpp
|
| 9bd23229fdec1657398abc682ccccfce1c95f8aa |
16-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix multichannel downmix pause bug on video player
Pausing a video player will cause the track audio mixer to be
disabled, which causes the downmixer to be deleted. When reenabled,
the track channel mask hasn't changed but the downmixer is there
anymore.
Fixed by:
- instanciating a downmixer when the AudioMixer track
gets initialized (in getTrackName(), now taking a channel mask
as input), and deleted when in deleteTrackName().
- when the channel changes on a track, check whether it
needs a downmixer or not. Preparing a track for downmix
automatically removes the old downmixer if there was one.
Also: initialize the track downmixerBufferProvider field
when AudioMixer is instanciated, so we can safely call
delete on it in AudioMixer's destructor, in case
deleteTrackName() wasn't called before the mixer was
destroyed.
Change-Id: I589b0781cda5b3c82f85b561c52b08546cac21f8
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/FastMixer.cpp
|
| 692ac36c4b6a09fed5113a4f45f00a041665a769 |
19-Apr-2012 |
James Dong <jdong@google.com> |
Make timed text source type explicit in TimedTextDriver
o related-to-bug: 5542712
Change-Id: Ifdc730e616336e8b16783e8a5766f27df62a0592
nclude/media/stagefright/timedtext/TimedTextDriver.h
edia/libstagefright/timedtext/TimedTextDriver.cpp
|
| 0ca3cf94c0dfc173ad7886ae162c4b67067539f6 |
18-Apr-2012 |
Eric Laurent <elaurent@google.com> |
rename audio policy output flags
Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioPolicyService.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/SoundPool.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AudioPlayer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| ee685f6d19a6cc3b0bf02e69eb5dea11a2aeb601 |
18-Apr-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Set gralloc consumer usage bits in SurfaceMediaSource."
|
| c34ee0429c4663a97f6a5c342633eeac46de081e |
18-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Some refactoring and cleanup of now obsolete crypto fields."
|
| f69e53033f23f9f70fcdb28a3c2e650de0147459 |
18-Apr-2012 |
Andreas Huber <andih@google.com> |
Some refactoring and cleanup of now obsolete crypto fields.
codec commandline tool no longer supports decryption.
Change-Id: I7b10be6524631b20ac5d361d47949b00addf4a93
mds/stagefright/codec.cpp
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/NuMediaExtractor.h
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
|
| e1083a99b6d4de9dbd4ee546324ef346380581ee |
18-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Configure the resampler with the correct channel count when downmixing"
|
| 13692a5d885405701a8a9b16af98a2e693085216 |
18-Apr-2012 |
Eddy Talvala <etalvala@google.com> |
Merge "Fixed leaks in SurfaceMediaSource_test"
|
| acb86cccbd9d245439a04cef0bcefa589addaa4c |
16-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Configure the resampler with the correct channel count when downmixing
When a track needs to be downmixed and resampled, it gets downmixed
first before being resampled. Therefore the resampler needs to
be configured with the channel count of the output of the downmixer
instead of that of the track.
Removed frame size checks that don't apply anymore now that we support
frame sizes that are not powers of 2 (e.g. 12 for 5.1 16bits), and
changed test performed for every buffer during playback into an
assert.
Change-Id: Ia220f00ee382f4f7848b661c58555bdca664e194
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
|
| 97b5d0d5b5ef766eb5dd680d05a5d199662d4ae0 |
24-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Fast mixer
Change-Id: I61552f83507e08e4c706076b9fb15362869e6265
ervices/audioflinger/Android.mk
ervices/audioflinger/FastMixer.cpp
ervices/audioflinger/FastMixer.h
ervices/audioflinger/FastMixerState.cpp
ervices/audioflinger/FastMixerState.h
ervices/audioflinger/StateQueueInstantiations.cpp
|
| 0845682ff93c9765b74b53dc404d0954efc28c2e |
18-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Add template class StateQueue"
|
| dc998c809e084b617990b281e2ed5271830cc2e0 |
24-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Add template class StateQueue
Change-Id: Iccc5eb42bc295a22b2e429a4551f083cd7b6831a
ervices/audioflinger/Android.mk
ervices/audioflinger/StateQueue.cpp
ervices/audioflinger/StateQueue.h
|
| 52bef17f5953cd07b1655a3371d833f4de01caae |
18-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Fix for multiple audio/timed track feature implementation - part one"
|
| 095c2da8d6c2058b02142c940f6e6346d6581780 |
13-Apr-2012 |
Dave Burke <daveburke@google.com> |
Make AAC 5.1 work
Fix bug with pausing audio
Change-Id: Icd6b095dac8d1a68b027de853d11ae02cc070b10
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| f7ffb8bf0a58037f0bc9662c5275005a4e539948 |
14-Apr-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: update to new audio HAL.
Updated audio flinger to new function prototypes
for open_output_stream() and open_input_stream().
Check audio hw device version when loading a module and
reject devices with a version different from current one.
Change-Id: I9d4c81a1f59a15db78b3989417c2a411c638fe88
ervices/audioflinger/AudioFlinger.cpp
|
| 4835705370584f6904c80afebcc6e8b9fdb110a5 |
18-Apr-2012 |
Andreas Huber <andih@google.com> |
NuMediaExtractor accidentally returned what looked like errors to the caller...
Change-Id: Iec0c62ba98c8a8afc5cb423a76b8f53778aeb867
related-to-bug: 6276111
edia/libstagefright/NuMediaExtractor.cpp
|
| 183058b1515e276a03d5aae28c7814f367a7b330 |
17-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Support widevine:// URLs in NuMediaExtractor / java MediaExtractor."
|
| 1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7 |
13-Apr-2012 |
Andreas Huber <andih@google.com> |
Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.
Allow anyone to talk to drm services.
Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392
related-to-bug: 6276111
rm/drmserver/DrmManagerService.cpp
edia/libmediaplayerservice/Crypto.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/WVMExtractor.cpp
|
| eee482b84bb456e87fa42e8ad02fd2d803839586 |
17-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "ToneGenerator requests fast track"
|
| 9d06df4ecfe39e7e46873f7cd75a71e32a01d4f7 |
17-Apr-2012 |
Daniel Lam <dalam@google.com> |
Fixed leaks in SurfaceMediaSource_test
mEglSurface was being reused which resulted in
EGLSurfaces being lost.
Change-Id: Ica07cd24b0e4f3d4b2156f55b7de8e83d5466136
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 4e2293f29f2e719af1245d365747ea06d074b345 |
12-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
AudioMixer new cmd: remove sample rate converter
Add a new command REMOVE to remove any sample rate converter
on a track, without having to delete the track name.
Add comments.
Remove some dead code.
Fix whitespace and comparison to NULL.
Change-Id: Id55a23ab5ee673189e99675b4e6fa5df7b617987
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 2120fe5bd4e14b53d8bef4a220e8a32830cf8cf9 |
11-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
ToneGenerator requests fast track
Also add comments to AudioTrack::set() parameter list
Change-Id: I28c76e9d813778d86b15d75cf7f01a17c258b6d9
edia/libmedia/ToneGenerator.cpp
|
| 99a80e10f2d0e88c0509a298bdd1df0308b55a7b |
16-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Order of evaluation of parameters is not specified"
|
| a5e821439996de6005b2fa36b3bdd31f003ce23f |
16-Apr-2012 |
Eric Laurent <elaurent@google.com> |
AudioMixer: fix crash in destructor
Commit deeb1282 made that track->resampler is only set to NULL when
getTrackName() is called. It remains uninitialized for all unused tracks
causing a crash when deleted by Audiomixer destructor.
Issue 6309441.
Change-Id: I49451387a6afe81299b8368ef206524df32f74c4
ervices/audioflinger/AudioMixer.cpp
|
| 8add6cf4976de9b7bca7b73b1473a1e5f7201087 |
14-Apr-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Set gralloc consumer usage bits in SurfaceMediaSource.
BufferQueue is no longer setting these for its endpoints; set the bits
to GRALLOC_USAGE_HW_VIDEO_ENCODER | GRALLOC_USAGE_HW_TEXTURE. In the
longer term, the set flags should be just
GRALLOC_USAGE_HW_VIDEO_ENCODER, but that requires other changes.
Change-Id: I4170658de49bf88d829d34605a15684e72a90706
edia/libstagefright/SurfaceMediaSource.cpp
|
| 77d837ae86c791c46ce019b58e09ac62780bf973 |
16-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Order of evaluation of parameters is not specified
Change-Id: Id545e54c2ec8ed2f70ede630542ed999a9b2c5e2
edia/libmedia/IAudioRecord.cpp
|
| eec46abb88dcc50621fd2d3f17a6b8d24fd07a19 |
12-Apr-2012 |
James Dong <jdong@google.com> |
Fix for multiple audio/timed track feature implementation - part one
o getTrackInfo now returns all tracks, rather than just the timed text tracks.
o the index of the track info is kept to the same as the track index if the
track is not from an external source
o correctly maps the selectTrack() and unselectTrack() calls to the right
track index
o TODO:
1) note that the selectTrack() and unselectTrack() only works for timed text
track at present; 2) the lock is timed text specific
o related-to-bug: 6110705
Change-Id: Ib1feeef2184bc992930ace0d1197b6c00a2636d7
nclude/media/stagefright/timedtext/TimedTextDriver.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/timedtext/TimedTextDriver.cpp
|
| a98db787397633155fd71b06ecaa765a7ad20cf2 |
16-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Change NuMediaExtractor's API to support different kinds of data sources."
|
| b388e531613730572067e193b6b66afb5d042233 |
14-Apr-2012 |
Eric Laurent <elaurent@google.com> |
Fix ALOG_ASSERT in AudioFlinger
Fix broken ALOG_ASSERT in updateFramesPendingAfterTrim_l() introduced by
commit 1c345196.
Change-Id: Ie1b2653069283f23ff0367f2628828e37fb0749c
ervices/audioflinger/AudioFlinger.cpp
|
| fbe308d428e42fe249ec317f76e3d11feb3264d5 |
14-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Make mediascanner use filedescriptors instead of paths"
|
| 25736fd247ba757feefe15d3071f7e747c64fea4 |
27-Mar-2012 |
Insun Kang <insun@google.com> |
To return default track info even if there's no metadata for a
subtitle track.
It would rather return empty data than return NULL data for an existing track.
Change-Id: Ie0c18e6851bfbe2c471041589670a3012605b584
edia/libstagefright/timedtext/TimedTextDriver.cpp
|
| db9b87e30a2ffe71554150e33066738ab134bc3c |
13-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Add external timed text source using a passed file descriptor"
|
| a28976b04c70cef3c8e79137478b6a7bc05608ac |
13-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Make mediascanner use filedescriptors instead of paths
Media scanner needs to open the files now, because media server doesn't
have the required permission.
b/6330061
Change-Id: I2364d93dcc0530c15676664fc4a8c306351dde08
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 613c8ae1b7a2b4f43b33a72dc2fff0bc8b7d4c6f |
13-Apr-2012 |
James Dong <jdong@google.com> |
Add external timed text source using a passed file descriptor
o Also fixed a minor issue where the file length should be of type off64_t rather than size_t
o related-to-bug: 5542712
Change-Id: I35fd8ceea0bc75e553b7f4a99932cf58ea560c4e
nclude/media/stagefright/timedtext/TimedTextDriver.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/timedtext/TimedTextDriver.cpp
|
| 918c7652b9a38c02e26c0c46541cea82070c0e43 |
13-Apr-2012 |
Andreas Huber <andih@google.com> |
Change NuMediaExtractor's API to support different kinds of data sources.
Change-Id: I080aa2ce28300a72a85751509334dbdc491936c6
related-to-bug: 6276111
nclude/media/stagefright/NuMediaExtractor.h
edia/libstagefright/DataSource.cpp
edia/libstagefright/NuMediaExtractor.cpp
|
| 1803c3ae573e5fa3f3a1abe24ae802e30e5d5495 |
12-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Add metadata keys to communicate encrypted fragments and associated info."
|
| 5892e3e173f20e01956f318ae7dce43d46c5fc1d |
12-Apr-2012 |
Andreas Huber <andih@google.com> |
Add metadata keys to communicate encrypted fragments and associated info.
Change-Id: I90a27c9bbe649328b88144b161c420916673846f
related-to-bug: 6275919
nclude/media/stagefright/MetaData.h
|
| d3030da2ac3c0ebb8b7bdf38418263caf405b863 |
12-Apr-2012 |
John Grossman <johngro@google.com> |
Fix the build
forgot to upload final fixup during merge. sry about that
Change-Id: I2ddd2c08d8efa83c0a8d1e378ae4c28686145154
ervices/audioflinger/AudioFlinger.cpp
|
| 1c345196edc61694f29307a1826a64a0d26028dc |
27-Mar-2012 |
John Grossman <johngro@google.com> |
TimedAudio: Track of the number of pending frames.
This is a manual merge from ics-aah
> TimedAudio: Track of the number of pending frames.
>
> Keep track of the number of frames pending in the timed audio queue so
> we can implement framesReady in O(1) time instead of O(N). This
> change partially addresses bug 6020970; the bug will be completely
> addressed once this change has been up-integrated into master.
>
> Change-Id: I599eb15ea1f6d715b97b30e65214fb6fadd169df
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I6cbbbc3afc8efd066fe94865326ede0c6b3db2bd
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 9fbdee13d09447550dd22ae72c2dbabdce7f0a80 |
27-Mar-2012 |
John Grossman <johngro@google.com> |
TimedAudio: Fix a cause of audio popping.
This is a manual merge from ics-aah
> TimedAudio: Fix a cause of audio popping.
>
> Fix an issue with buffer lifecycle management which could cause audio
> pops on timed outputs. There were two issues at work here.
>
> 1) During trim operations for the queued timed audio data, buffers
> were being trimmed based on their starting PTS instead of when the
> chunk of audio data actually ended. This means that if you have a
> very large chunk of audio data (larger than the mixer lead time),
> then a buffer at the head of the queue could be eligible to be
> trimmed before its data had been completely mixed into the output
> stream, even though the output stream was fully buffered and in no
> danger of underflow.
> 2) The implementation of getNextBuffer and releaseBuffer for timed
> audio tracks was not keeping anything like a reference to the data
> that it handed out to the mixer. The original architecture here
> seemed to be expecting a ring buffer design, but timed audio tracks
> use a packet based design. Pieces of packets are handed out to the
> mixer which then frequently will hold onto that chunk of data
> across two mix operations, using the first part of the chunk to
> finish a mix buffer and then using the end of the chunk for the
> start of the next mix buffer. If the buffer that the mixer is
> holding a piece of got trimmed before the start of the next mix
> operation, it would return to its heap and could be filled with who
> knows what by the time it actually got mixed. On debug builds,
> they seem to get zero'ed out as they go back to the heap causing
> obvious pops in presentation.
>
> This change addresses both issues. Trim operations are now based on
> ending presentation time for a chunk of audio, not the start. Also,
> when the head of the queue is in flight to the mixer, it can no longer
> be trimmed immediately, merely flagged for trim by the mixer when the
> mixer finally does call releaseBuffer.
>
> Signed-off-by: John Grossman <johngro@google.com>
> Change-Id: Ia1ba08cb9dea35a698723ab2d9bcbf804f1682fe
Change-Id: I2c5e2f0375c410f0de075886aac56ff6317b144c
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| b34364269683363ca54aeed4952937cf37da7e06 |
12-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Make it possible to pass empty opaque data as (NULL, 0) to ICrypto."
|
| 1fe40b374fc13c477d42b3fc59f3d21f1e552aea |
12-Apr-2012 |
Dave Burke <daveburke@google.com> |
Merge "Add support for a new AAC decoder library."
|
| 705868c0f2a6e85a39addefe4db9f2130627c219 |
12-Apr-2012 |
Andreas Huber <andih@google.com> |
Make it possible to pass empty opaque data as (NULL, 0) to ICrypto.
Change-Id: Ifee1744890b645e008c9aff3783625a7bfbcff27
related-to-bug: 6275919
edia/libmedia/ICrypto.cpp
|
| e5becb51c64cb8a3f6bbd8a417f54510567f37dd |
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Changes to add support for H263-1999/2000 formats for streaming"
|
| 9b8ae38ac8c5384d178bfe3f61907f973b98c740 |
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Better error logging during meta data retrieval. Fixed the stagefright"
|
| f4b7d94062c896dca565d849c6188cd3489be257 |
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Better error logging during meta data retrieval. Fixed the stagefright
commandline tool to open the file to extract thumbnails from itself since
mediaserver may not have permission to open files.
Change-Id: Iabe16b3248e9bb0f266b0866a8d2ccba2ab7d2a8
related-to-bug: 6321237
mds/stagefright/stagefright.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| b92dee530c72c3e22f2fee585e0cc53ae9c02f2e |
11-Apr-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audio pre processing: test code for dual mic"
|
| 3f9c84c0a5af83fceb8669390e2d71b75ec7b550 |
04-Apr-2012 |
Eric Laurent <elaurent@google.com> |
audio pre processing: test code for dual mic
Added functional test code to validate effect API for
multi mic simplementations.
Also fixed warning in AudioFlinger.
Change-Id: I07be4d2e4d17791d3626c804ba3e9f87ff26d05a
edia/libeffects/preprocessing/PreProcessing.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| f95439afa8eb2484969d4a928b0fdd6a4d3a38d7 |
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Changes to add support for H263-1999/2000 formats for streaming
contributed by sureshc@nvidia.com (and subsequently simplified)
Change-Id: Ia1c2ac9233f5414ce3e4a70e42e68c1c5c35eb9d
edia/libstagefright/rtsp/AH263Assembler.cpp
|
| b3eb2b7e0ad11bc03344e10cc5204bdb71f0686e |
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Cache the file size in favour of extraneous seek requests."
|
| 4ee31e2603b4019e4ae76e027115f80b818527aa |
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Cache the file size in favour of extraneous seek requests.
Change-Id: Ia922b13179c69749d09cd3fccbd5c30109c28bd7
related-to-bug: 6321952
edia/libstagefright/FileSource.cpp
|
| 2d531e1b5865d61d5ca25d77d53017b1ad180efa |
11-Apr-2012 |
Mathias Agopian <mathias@google.com> |
Merge "Refactored SurfaceMediaSource"
|
| d2469c3fe382203eb7cd5060c94ed204bec98116 |
10-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "AudioMixer uses downmix effect for multichannel content"
|
| bdddc659a941afdb7f4958f582c6901c07246097 |
31-Mar-2012 |
Daniel Lam <dalam@google.com> |
Refactored SurfaceMediaSource
SurfaceMediaSource takes advantage of BufferQueue to avoid
duplicated code.
Change-Id: I5e60b8eca21e6c3cf728d363cd8f3786125182d1
nclude/media/stagefright/SurfaceMediaSource.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| ed5b285520ae1ddad78b7c945d659a2c1f3140b8 |
09-Apr-2012 |
Ying Wang <wangying@google.com> |
You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a static library.
Change-Id: Ia2c4b4fb3b78cbe0d2856cec073b2c7f9c28d3cb
rm/libdrmframework/plugins/common/util/Android.mk
|
| 7d5b26230a179cd7bcc01f6578cd80d8c15a92a5 |
05-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
AudioMixer uses downmix effect for multichannel content
In the AudioMixer structure associated with each track, add an object
that acts as the buffer provider when the track has more than two
channels of input in the mixer. This object, DownmixerBufferProvider,
gets audio from the actual buffer provider of the track, and applies
a downmix effect on it.
The downmix effect is created and configured when the track gets
created in AudioFlinger, which causes AudioMixer::getTrackName()
to be called with the new track's channel mask. It is released
when the track is disabled in the mixer.
Change-Id: I05281ed5f61bef663a8af7ca7d5ceac3517c82db
edia/libeffects/data/audio_effects.conf
edia/libeffects/downmix/EffectDownmix.c
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 4b75a9c8b93a90749bc5d22912ad0d96c12f4ecf |
06-Apr-2012 |
Andreas Huber <andih@google.com> |
New API to support submitting encrypted buffers to the decoder.
Change-Id: I69dd60e43078c4211c6123cf6e0ce90e676bf873
related-to-bug: 6275919
mds/stagefright/codec.cpp
nclude/media/stagefright/MediaCodec.h
edia/libmedia/ICrypto.cpp
edia/libstagefright/MediaCodec.cpp
|
| 3f502bfc6d04d08369cf147284c5c4c2ac7c9a0e |
06-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Non-blocking audio I/O interface, WIP"
|
| 8d0648eff7a9a7bc7cd6318ba5fc96c759bef978 |
05-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Trust the Cues element"
|
| 5faee0829f673f6147636820eafae2c0fa238c77 |
05-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix a bug: WOULD_BLOCK handling in TimedTextPlayer."
|
| f02a7f5c42db707d20e59ff28f32d1eaebcc5429 |
05-Apr-2012 |
Johann <johannkoenig@google.com> |
Trust the Cues element
With the Cue based seeking we will get the closest previous key frame.
For audio, use the Cue file to find the Cluster with the video key frame
then incrementally look for the audio Block.
Change-Id: Idc934cca1286b1bb48ee7577b27903ca488a0610
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 4762a5164a986bd6a7ca0e7aba43881b64f146dd |
04-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Send video width and height to mediascanner
b/5820120
Change-Id: Ia5c48eb1ab15fe3bbe773131148470a06eb2b96d
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 99448608f375a7191c068c3bfd296f204b58a219 |
02-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Allow AudioTrack to start at nonzero position
When creating a new AudioTrack (not inheriting one from a previous play),
the AudioSink should take the AudioTrack's position as the initial starting
point for mBytesWritten, since otherwise NuPlayer's calculations will be off.
Normally this position will be 0, but if the test code for 32 bit wraparound
in AudioFlinger.cpp is enabled, it might be (much) larger.
Change-Id: I1e4f906d529861c3dea996de8afc6dbd491589af
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| f15cb4472aaca54c13f8250e4c7872470c4bed83 |
04-Apr-2012 |
Jeff Tinker <jtinker@google.com> |
Merge "frameworks/av/media portion of removing YouTube specific error codes"
|
| a4c5a550e2a3bc237179b8684e51718e05894492 |
29-Mar-2012 |
Eric Laurent <elaurent@google.com> |
audio policy: load audio hw modules.
Audio HW modules are now loaded upon request from audio policy manager
according to the configuration in audio_policy.conf.
Removed hard coded HW module loading by AudioFlinger at init time.
Added methods to IAudioFlinger and AudioPolicyInterface
to control the loading of audio HW modules.
Added methods to open an output or input stream on a specific hw module.
Change-Id: I361b294ece1a9b56b2fb39cc64259dbb73b804f4
nclude/media/IAudioFlinger.h
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
|
| 4e1c91dd07fad96ee2387eda510c6da45e5dff0a |
27-Mar-2012 |
Insun Kang <insun@google.com> |
Fix a bug: WOULD_BLOCK handling in TimedTextPlayer.
Bug: 6234756
Change-Id: I0fae6e5ad8607d472faad7dd680e020f20ac1669
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
|
| 1a9ed11a472493cac7f6dfcbfac2064526a493ed |
21-Mar-2012 |
Eric Laurent <elaurent@google.com> |
audio policy: add configuration file
removed outputs to stream mapping cache in audio system: the output for a
given stream type must always be queried from audio policy manager as the cache
is not always updated fast enough by audioflinger callback.
removed AudioFlinger::PlaybackThread::setStreamValid() not used anymore if
stream to output mapping is not cached.
Change-Id: Ieca720c0b292181f81247259c8a44359bc74c66b
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
|
| 8f883be3bd1fffd4e30bc7298c34085a4055be2b |
04-Apr-2012 |
Jeff Tinker <jtinker@google.com> |
frameworks/av/media portion of removing YouTube specific error codes
Change-Id: Id0d84d3aaaf340cd5287611c9dc7cb8d11466772
related-to-bug: 5883949
nclude/media/stagefright/MediaErrors.h
|
| 290ca3a767a974ce9d041e5bcb0c69153f7851d5 |
03-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "fix crash with cues at the beginning of the file"
|
| 1bd139a2a68690e80398b70b27ca59550fea0e65 |
03-Apr-2012 |
Andreas Huber <andih@google.com> |
New Crypto services talking to the new crypto "HAL".
Change-Id: I69ed31e7a8b4d69d1209d2d516f94d258f072566
related-to-bug: 6275919
mds/stagefright/SimplePlayer.cpp
mds/stagefright/codec.cpp
nclude/media/ICrypto.h
nclude/media/stagefright/MediaCodec.h
edia/libmedia/ICrypto.cpp
edia/libmediaplayerservice/Crypto.cpp
edia/libmediaplayerservice/Crypto.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/MediaCodec.cpp
|
| be7ac3d682729048af27871311808a76c618abdb |
03-Apr-2012 |
Johann <johannkoenig@google.com> |
fix crash with cues at the beginning of the file
previous implementation tried to be clever about economizing Cue loads.
however, files with the cues at the beginning missed the initial load in
the seek function and would crash with a null pointer.
Change-Id: I49c15d6688909cd13afabf33a54d9f5896aab7cd
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| d22da88fd555f1262357c7dcdeface8445e3a012 |
03-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Use Cues to seek Matroska files"
|
| 4a446bd090efb36ce06ae8966d42357fd5472715 |
03-Apr-2012 |
Andreas Huber <andih@google.com> |
Merge "Add a few more APIs to MediaCodecList."
|
| b7ddcc9460f488f0b032aeb27b52a423318a97ea |
02-Apr-2012 |
Dave Burke <daveburke@google.com> |
Add support for a new AAC decoder library.
Change-Id: I867bf95f7c20503e55b38d0087ac027647834f37
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacdec/SoftAAC2.cpp
edia/libstagefright/codecs/aacdec/SoftAAC2.h
|
| 69829f3bd09ee4e6be49fee8795c5df24c4da70e |
30-Mar-2012 |
Andreas Huber <andih@google.com> |
Add a few more APIs to MediaCodecList.
Change-Id: I5ac193cd40c82bbcd87c1e55003b78102e8d4674
nclude/media/stagefright/MediaCodecList.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/MediaCodecList.cpp
edia/libstagefright/OMXCodec.cpp
|
| 10f0fe7bcd60bdb0eceb905e84ac11555e8c1b9d |
30-Mar-2012 |
Johann <johannkoenig@google.com> |
Use Cues to seek Matroska files
On the first seek, load the Cues element. Parse it incrementally until
the desired seek point can be located.
This allows files to begin playing immediately. However, the Browser
still seeks to 0 before playing embedded YouTube files. Because YouTube
stores the cues at the end of the file, this causes it to seek, load the
cues, then begin playing. It is still better than the previous behavior
which blocked until the entire file was loaded.
BUG=5921311
Change-Id: Iad2abc64ded3b4e2c2d2c478a969f68450754282
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 73d227557ba5192735356bacab9f77b44980793b |
19-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger track flags and server's fast policy
Change-Id: I72358c8e6829d173b3e60ced8a8babc089869fac
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 2d6486f9112a6f0d23f17eaaad94bac62e16caab |
02-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Update AudioParameter"
|
| dca856f5cb849b8feab2d24f3248f25d887211ee |
02-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioTrack client fast policy"
|
| 49a692c3a659aee0a065304d1f845ee1290687ca |
02-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "const methods and comments"
|
| 0bf65bdde04b8e66c998ff37e2b2afafddddfa33 |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
const methods and comments
Change-Id: Ifd16750174fdb15b72507787502b587562ffc99e
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 0513cb3996bca2edf2aebfbead81a5041cd2d3e4 |
02-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Add gapless playback support for NuPlayer"
|
| 4110c101c3d0dd8dbc44c8d2d0edd3e2e7d6652f |
29-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Add gapless playback support for NuPlayer
This makes NuPlayer use a SkipCutBuffer when needed, and adds a new
AudioSink method to retrieve the number of frames written so far, so
NuPlayerRenderer can calculate how much data it can write without blocking.
Also make some more methods const.
Change-Id: Id7d253ad8a7b85e9a84ca2baafbe32817b16c744
nclude/media/MediaPlayerInterface.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
|
| 010662326b9c43c703725f933e95e0897f8a6bdd |
27-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Non-blocking audio I/O interface, WIP
Yet another abstraction similar to AudioTrack::Buffer and AudioBufferProvider,
but with support for streaming, non-blocking, and eventually PTS.
This is intended to be used as follows:
- primary HAL output stream implements a Sink
- primary HAL input stream implements a Source
- Pipe implements a Sink
- PipeReader implements a Source or TimedSource (not shown yet),
which supports "read at PTS"
- fast AudioTrack on server side will implement a Source using cblk
- normal AudioTrack on server side will not be changed initially
- fast AudioRecord on server side will implement a Sink using cblk
- normal AudioRecord on server side will not be changed initially
- fast mixer thread will read from Sources and write to a Sink,
or (unlikely) implement a Source and multiple Sinks
- Visualization and PCM logger will read from Source or TimedSource
- A2DP normal mixer will be connected directly to its output stream
and there will be a kind of OutputTrack for duplication that will
read from a Sink with non-blocking write fed by the fast mixer.
Patch set 3 changes:
- Add more implementations of NBAIO interfaces:
added SourceAudioBufferProvider, MonoPipe, MonoPipeReader.
- Added Format_sampleRate and Format_channelCount.
- Extract out the roundUp() method.
- Respond to most comments from previous code review.
- The new classes are untested.
Patch set 4 changes:
- Fix bugs in MonoPipe::write() and MonoPipeReader::read()
- Fix bug initializing mFrameBitShift too early
- renamed roundUp() to roundup()
- Fix Android.mk
- Add LOG_TAG an LOG_NDEBUG, use ALOG_ASSERT and utils/Log.h instead of assert
- Fix build warnings
- Move constructor and destructor bodies from .h to .cpp
- Line length 100
- Following naming conventions for #include double-include protector macros
- Include what you use
- More NBAIO logging
- MonoPipe write can be blocking
Patch set 5 changes:
- Address code review comments
- Use a static library so unused implementations don't take memory
- Comment out libsndfile dependency
- Remove debugging LOGV and LOG_NDEBUG
Patch set 6 changes (would be 6 at old location, actually 2 at new location):
- Address code review comments on patchset 5
- For MonoPipe, allow the full pipe to be used, no need to omit one slot
- Don't do atomic releasing stores unless needed
Still to do:
- I'm not happy with the Pipe class names
- Update build/ for new static library?
Change-Id: Ie6c61f05ce06b676b033be448a8ef9025a2ffcfd
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProviderSource.cpp
ervices/audioflinger/AudioBufferProviderSource.h
ervices/audioflinger/AudioStreamInSource.cpp
ervices/audioflinger/AudioStreamInSource.h
ervices/audioflinger/AudioStreamOutSink.cpp
ervices/audioflinger/AudioStreamOutSink.h
ervices/audioflinger/LibsndfileSink.cpp
ervices/audioflinger/LibsndfileSink.h
ervices/audioflinger/LibsndfileSource.cpp
ervices/audioflinger/LibsndfileSource.h
ervices/audioflinger/MonoPipe.cpp
ervices/audioflinger/MonoPipe.h
ervices/audioflinger/MonoPipeReader.cpp
ervices/audioflinger/MonoPipeReader.h
ervices/audioflinger/NBAIO.cpp
ervices/audioflinger/NBAIO.h
ervices/audioflinger/Pipe.cpp
ervices/audioflinger/Pipe.h
ervices/audioflinger/PipeReader.cpp
ervices/audioflinger/PipeReader.h
ervices/audioflinger/SourceAudioBufferProvider.cpp
ervices/audioflinger/SourceAudioBufferProvider.h
ervices/audioflinger/roundup.c
ervices/audioflinger/roundup.h
|
| 4a4a0959bca78e03e3c3f486ba17829c28314d8c |
19-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
AudioTrack client fast policy
Change-Id: I42ce691df3f586ac061b62237f35a263a0116f1f
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| deeb1282621f3177ad667360b40eef8e4fedb298 |
25-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
AudioMixer default track parameters
Move the default initialization of track parameters from the AudioMixer
constructor to getTrackName(). This fixes a bug where the defaults were
only valid the first time a name was allocated.
Also added a switch case for parameter FORMAT.
Change-Id: I07abd3aaf7f4efe9825a761d2bc662aaee2c6db0
ervices/audioflinger/AudioMixer.cpp
|
| edf47a8cba2d1d8985b64bf4a4fac661ba34f35a |
01-Apr-2012 |
Glenn Kasten <gkasten@google.com> |
Update AudioParameter
Use definitions for AUDIO_PARAMETER_STREAM_* from <hardware/audio.h>
instead of repeating these constants.
String constants are const char * const.
Change-Id: I1c9ebe0bc9c827d719d3181aea55251c6db28ec4
nclude/media/AudioParameter.h
edia/libmedia/AudioParameter.cpp
|
| a1472d9883e35edd280201c8be3191695007dfd4 |
30-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Make AudioTrack/AudioRecord handle more than 2^32 frames
b/6160363
Change-Id: I471815012c6a113ec2c4dd7676e8fa288a70bc76
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 40a1da57d21bbc883630e7a854a279685fe1fa61 |
31-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "implemented synchronous audio capture"
|
| 42c56b364a0fcd93568f85b63d52a871a756184c |
31-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Copied MODULE_LICENSE_APACH2 and NOTICE from frameworks/base to frameworks/av"
|
| a011e35b22f95f558d81dc9c94b68b1465c4661d |
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: I51f1167290d9cafdf2fbcdf9e4785156973af44c
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/IAudioRecord.h
nclude/media/ToneGenerator.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/IAudioRecord.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| df7e6ea0c755fb95a77d21010105e3a2eac69ff8 |
30-Mar-2012 |
Mathias Agopian <mathias@google.com> |
reduce IPCs in BufferQueue
Change-Id: I1f8c32a771a411476d225adc62d1f07c24f39a3e
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| ecdd39c5af016e2fa57cbfd837aa670b706dabd3 |
29-Mar-2012 |
Andreas Huber <andih@google.com> |
Implementation of a raw audio "decoder".
Change-Id: Ie89f01e59dd8106883937188afbb407550f0ac92
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodecList.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/raw/Android.mk
edia/libstagefright/codecs/raw/SoftRaw.cpp
edia/libstagefright/codecs/raw/SoftRaw.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 9d309ba6ba8a4b456ba3af35dbdf06ff0a478413 |
29-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Add ABuffer support to SkipCutBuffer"
|
| cb5b766bb0a3ed992998a5bd66de0ee1d2223b81 |
29-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Add ABuffer support to SkipCutBuffer
Add support for ABuffer to SkipCutBuffer, and make it (re)allocate an
appropriately sized buffer when needed, rather then relying on the
caller to tell it ahead of time how big the buffers are going to be.
Change-Id: I8b5c9ba5dd2fc13ef8870b7d4fe93a1bfdc7a626
nclude/media/stagefright/SkipCutBuffer.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SkipCutBuffer.cpp
|
| 6826bfc75b1bfed59120ec2606e0d024654f95b0 |
29-Mar-2012 |
James Dong <jdong@google.com> |
Copied MODULE_LICENSE_APACH2 and NOTICE from frameworks/base to frameworks/av
Change-Id: I48c927b9690bf902ab167d60171c0ee7995687e0
ODULE_LICENSE_APACHE2
OTICE
|
| b4c0c4b800332fe55c60aa328ece8d849cee3a4d |
29-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Removed unnecessary include JNI from two drm Android.mk files"
|
| cec40f97a8c0b9a43a78ae98fc35fcc80d6f6c4f |
29-Mar-2012 |
James Dong <jdong@google.com> |
Removed unnecessary include JNI from two drm Android.mk files
Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
rm/libdrmframework/plugins/common/util/Android.mk
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
|
| d8973a71a3d1dd670e5dcdf6e94ec0cd45444eec |
28-Mar-2012 |
Keun young Park <keunyoung@google.com> |
Fix deadlock in camera destruction after client app's crash
* why deadlock happened: when an app (CTS camera test) crashes while using
camera, its binder is closed and reference counter is decreased. If camera
is inside callback, sp<Client> inside callback will hold the Client instance,
and Client instance is destroyed when the callback ends as sp<Client> to hold
it no longer exists. The destructor of Client instance tries to clean up
camera H/W which tries to stop threads created by camera HAL including the
thread context where the callback is running. This causes deadlock where the
callback thread itself is waiting for itself to terminate.
Note that the deadlock will not happen if camera callback is not active. In
that case, closing of binder will force the destruction of Client instance,
and the destruction happens in binder thread.
* Fix: Forces Client descruction in binder thread
- remove sp<Client> from callbacks to prevent destruction in callback context
- add client lock to allow callback to use raw pointer safely. This prevents
the destructor from deleting the instance while callback is using it.
- add status change inside destructor with client lock to safely destroy Client
Bug: 6214383
Change-Id: Ic6d6396d4d95ce9e72a16ec2480ae65c100fe806
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 559bf2836f5da25b75bfb229fec0d20d540ee426 |
28-Mar-2012 |
James Dong <jdong@google.com> |
AV Android make files changes
o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc
Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
mds/stagefright/Android.mk
rm/common/Android.mk
rm/drmserver/Android.mk
rm/libdrmframework/Android.mk
rm/libdrmframework/plugins/common/util/Android.mk
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
rm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
rm/libdrmframework/plugins/passthru/Android.mk
nclude/media/SoundPool.h
nclude/private/hwui/DrawGlInfo.h
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/PreviewRenderer.h
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
edia/libaah_rtp/Android.mk
edia/libmedia/SoundPool.cpp
edia/libmedia/SoundPool.h
edia/libmedia/SoundPoolThread.h
edia/libmediaplayerservice/ActivityManager.cpp
edia/libmediaplayerservice/ActivityManager.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/amrnb/enc/Android.mk
edia/libstagefright/codecs/amrwb/Android.mk
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/g711/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/Android.mk
edia/libstagefright/codecs/mp3dec/Android.mk
edia/libstagefright/codecs/on2/dec/Android.mk
edia/libstagefright/codecs/on2/h264dec/Android.mk
edia/libstagefright/codecs/vorbis/dec/Android.mk
edia/libstagefright/foundation/Android.mk
edia/libstagefright/httplive/Android.mk
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/tests/Android.mk
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/tests/Android.mk
edia/libstagefright/timedtext/Android.mk
edia/mediaserver/Android.mk
ervices/camera/tests/CameraServiceTest/Android.mk
|
| b0b2b4d890cf3bfb274797a759642b4e733343d7 |
28-Mar-2012 |
Anatol Pomozov <anatol.pomozov@gmail.com> |
Merge media files with history from frameworks/base.git
|
| 5a5491c17d74bd2c80cf451c6ddbba22d5d5f08a |
27-Mar-2012 |
Romain Guy <romainguy@google.com> |
Merge "Use a status_t return type for GL functors"
|
| 00a10e8eb39526df06779e0cdb6e6871752934d7 |
27-Mar-2012 |
Romain Guy <romainguy@google.com> |
Use a status_t return type for GL functors
WebView needs more fine-grained control over the behavior of the
framework upon execution of the display lists. The new status_t
allows WebView to requests its functor to be re-executed directly
without causing a redraw of the entire hierarchy.
Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
nclude/private/hwui/DrawGlInfo.h
|
| 4116807a35a27abf635bf6199ed9ad8703c9e94d |
24-Mar-2012 |
Colin Cross <ccross@android.com> |
stagefright: compile without chromium for pdk builds
Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
edia/libstagefright/Android.mk
edia/libstagefright/chromium_http/Android.mk
|
| 15147270aa1c56503902b424f946389294875665 |
26-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Provisional support for secure decryption of media streams."
|
| b14f18245d64b38aae1c02db79b2ad516d69891c |
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"
|
| 48a98a55465764f377bd612a4883d6e01d95965b |
26-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "fix visualizer inactivity detection"
|
| ed3e3e046840d5bf1ca84a8c0cc097425e89d6d6 |
26-Mar-2012 |
Andreas Huber <andih@google.com> |
Provisional support for secure decryption of media streams.
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
mds/stagefright/codec.cpp
mds/stagefright/sf2.cpp
nclude/media/ICrypto.h
nclude/media/IMediaPlayerService.h
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MediaCodec.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/NuMediaExtractor.h
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/foundation/AString.h
edia/libmedia/Android.mk
edia/libmedia/ICrypto.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/Crypto.cpp
edia/libmediaplayerservice/Crypto.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.h
edia/libstagefright/foundation/AString.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
|
| 131c36ef343a604e9aee10c830ebe9c55a743379 |
26-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "reorganize SoundPool and JetPlayer code."
|
| 1f08900408927bd2b3bef59aaa15ab68ec765c06 |
26-Mar-2012 |
Colin Cross <ccross@android.com> |
Merge changes Ib4d0e0c0,Iea8f4a23
* changes:
libmedia: remove skia include
stagefright: remove dependency on skia
|
| 6eb463b1d07492bf5a89e1cd8a2a131c7bba5bfb |
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
edia/libstagefright/TimedEventQueue.cpp
|
| 183dc7772d7eba127aab63829c7ca0359d817593 |
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
edia/libeffects/visualizer/EffectVisualizer.cpp
|
| 2e66a7896c9a9da3a15fc6cff9be28b4174d8719 |
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
nclude/media/JetPlayer.h
edia/libmedia/Android.mk
edia/libmedia/JetPlayer.cpp
edia/libmedia/SoundPool.cpp
edia/libmedia/SoundPool.h
edia/libmedia/SoundPoolThread.cpp
edia/libmedia/SoundPoolThread.h
|
| cc1110dc92e53e9cc0afbb043e6ef8295bd9c5d5 |
19-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Add TRACK_FAST for IAudioFlinger::createTrack
Currently not implemented by client or server
Change-Id: Ib11dda57db3eeb871bcc7b546e340078776875f5
nclude/media/IAudioFlinger.h
|
| b83d38feeeb88a8a2a6219e1fca2480b5a14fb0d |
26-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "IAudioFlinger::createTrack and openRecord flags"
|
| 60d3a4160f3edb38fa6168237f3275f4d6d9e019 |
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
edia/libmedia/IMediaMetadataRetriever.cpp
|
| 26a417f68526fee861bb527f1a4e3ed548979f93 |
24-Mar-2012 |
Colin Cross <ccross@android.com> |
stagefright: remove dependency on skia
skia is only used to write a jpeg file, link directly to libjpeg
instead.
Change-Id: Iea8f4a2347c38328776541d2b74bcbdea3f62041
mds/stagefright/Android.mk
mds/stagefright/jpeg.cpp
mds/stagefright/jpeg.h
mds/stagefright/stagefright.cpp
|
| 8f7f7ad54c698cb57a2a369cf1ae5b917853917b |
24-Mar-2012 |
Colin Cross <ccross@android.com> |
remove jni.h include from IOMX.h
jni.h is not used in IOMX.h and is not available in pdk builds,
remove it.
Change-Id: I9bc8fd70f617942712d9f684c6fc927bf18be753
nclude/media/IOMX.h
|
| f500abaa4a1456dfb0a269b9ca97d8e27562c09c |
24-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files."
|
| 3ee26944b082def647fe5bb2b75116ffb0267059 |
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
mds/stagefright/Android.mk
edia/libmedia/Android.mk
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/httplive/Android.mk
edia/libstagefright/matroska/Android.mk
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/tests/Android.mk
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/timedtext/Android.mk
|
| be9b24b86d2c84f2dc45bb8c8d1578b55cbd151d |
24-Mar-2012 |
James Dong <jdong@google.com> |
Fixed missing return value from a method should have returned status_t
Change-Id: I83ad2735eaf8a8dfa5f8f29f30aec1311b3222de
nclude/media/stagefright/SurfaceMediaSource.h
|
| 51f8eec23a2bcc2cc190373cdd1195972d9b8804 |
24-Mar-2012 |
James Dong <jdong@google.com> |
Resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni
o move VideoEditorMain.h to /frameworks/av/libvideoeditor
o removed JNI related C_INCLUDE in some Android.mk files
o related-to-bug: 6214141
Change-Id: Iadd01eef701deb728fbac1a3f524ea1db72f6b48
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| ef36d496477d1e2ae99c3cd43eee5cf7e82b0883 |
23-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Revert "Split libmedia into libmedia and libmedia_native""
|
| 78b5e82f421bfdf5c1c72bd0ca2fb7f3bc1a45ff |
23-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Revert "Split libmedia into libmedia and libmedia_native"
This reverts commit 0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb
edia/libmedia/Android.mk
edia/libmedia_native/Android.mk
|
| fdac94af1d925a983f63aa50d50f1e1559844928 |
23-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Revert "AudioFlinger does not need libmedia any more""
|
| d12c68ad699ce0ed822a4d4db86e8e02324c6b03 |
23-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Revert "AudioFlinger does not need libmedia any more"
This reverts commit c920dee060ac69684be33210ee44b99a5fc3e8b2
ervices/audioflinger/Android.mk
|
| bc8b5faec8a0a9ad7c8d94945e7b000d63f0afe6 |
23-Mar-2012 |
Andreas Huber <andih@google.com> |
Fix the file mimetype reported by the mpeg4 extractor.
Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b
related-to-bug: 6217289
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaDefs.cpp
|
| ecb3110adc6db7334ca4be6d5b3c130f38f5fa51 |
23-Mar-2012 |
James Dong <jdong@google.com> |
Make file change because libvideoeditor source files moved
o related-to-bug: 6214141
Change-Id: I3ef60ca7670df37d7e43546e244cfe6a33093ba9
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/3gpwriter/src/Android.mk
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
|
| 529127450abdeddf5d2467c7973e779a6b1376ea |
22-Mar-2012 |
Mike Lockwood <lockwood@google.com> |
Merge "Merge remote-tracking branch 'goog/ics-aah-exp' into merge"
|
| d71fb1be1c25e5eca1dfab97a89e7848ed25e65d |
22-Mar-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah-exp' into merge
|
| 4f5da11df06802856bf526f16563df7d5755f653 |
22-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger does not need libmedia any more
Change-Id: Ifd2c61882109ec36ca68072a2bf6506e08c8cf34
ervices/audioflinger/Android.mk
|
| ab55517549170b0def3d7b625324b6a44b60d5ae |
22-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Use NuPlayer for media playback everywhere"
|
| afed0e1fa37473a4cd30018577b560acc79d9a3f |
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
mds/stagefright/sf2.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/GenericSource.cpp
edia/libmediaplayerservice/nuplayer/GenericSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
|
| f4a9fb6d90c442e648367063d73f2c236342e73f |
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>
edia/libaah_rtp/aah_tx_player.cpp
|
| a411f779465504ff3e1a59c8ffa43d18385852b8 |
22-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove enforceFrameCount"
|
| a98478bfbcc0f7fb4b164d3dce40ca96df75667d |
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
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/SkipCutBuffer.h
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SkipCutBuffer.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.h
|
| 898b11f2aeaaa2bed84d963a3fcfd3b229e00b99 |
22-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Split libmedia into libmedia and libmedia_native"
|
| 19ba8b4a85842a8aeaa9e785e5d4558bc4e8e32e |
22-Mar-2012 |
Mike Lockwood <lockwood@google.com> |
Merge remote-tracking branch 'goog/ics-aah-exp'
empty merge -s ours
Change-Id: Icaa928cc62272dad788a80b769b8a745e08cf2ca
|
| c524ffda17017d8467a237a1eddfd7e7c03c6617 |
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
edia/libmedia/Android.mk
edia/libmedia_native/Android.mk
|
| 291f4d505aff81969e6666049d3cc3446f836af2 |
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
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| 2f694b3ef6af235e7ba850d57538eece9f136499 |
21-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Add MetaData::dumpToLog"
|
| feba11fd788c99b0b63e0bce724730817688d82f |
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
nclude/media/stagefright/MetaData.h
edia/libstagefright/MetaData.cpp
|
| 29f0c3786f7e4793e9f512fc41864280d7e6fb7e |
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
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
|
| 6373153c49b1ac88169a9c047451617be0b2b138 |
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>
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_tx_group.cpp
edia/libaah_rtp/aah_tx_group.h
edia/libaah_rtp/pipe_event.cpp
edia/libaah_rtp/pipe_event.h
edia/libaah_rtp/utils.h
|
| f4d5e646d1618d82d07289fa5440e81e4021615a |
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>
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_tx_group.cpp
edia/libaah_rtp/aah_tx_group.h
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/utils.h
|
| 011a306aa4fa1be539c04a4cb892ed0068de4fe2 |
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
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_group.cpp
edia/libaah_rtp/aah_tx_group.h
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/utils.cpp
edia/libaah_rtp/utils.h
|
| f4c715600bf16656f7298adbf494ee70eb1806fa |
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
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_tx_group.cpp
edia/libaah_rtp/aah_tx_group.h
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
|
| 4949c36978b844f65abf84027e1cf2dcf82c1184 |
21-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Parse gapless info from mp4 files"
|
| f209ed70de9325f4b32bce4c15a1948ec35581eb |
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
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_tx_group.cpp
edia/libaah_rtp/aah_tx_group.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
|
| 5d2f8ba30c24ea597d54468cda01c7ec5f6a0e66 |
20-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Parse gapless info from mp4 files
Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| d2d24d8c0d36305bc89ab1626ed58e3aa9af41bb |
21-Mar-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am fcf2f4b1: am 98e1b541: Reconcile with ics-mr1-release
* commit 'fcf2f4b17338501d8498a2a16eb832445b293e8f':
|
| ad9c8528feedd06542c817de3e094534c59ed847 |
21-Mar-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 98e1b541: Reconcile with ics-mr1-release
* commit '98e1b541f271e92b9dc25d54e275c28102746b04':
|
| 044773292b82db6575b2234962564b5706aa1cf3 |
21-Mar-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Id19190393a665dd1b07c073970925758aa383691
|
| bcd5944578ee3c8803243ed60334f817968fe603 |
21-Mar-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am a4a09465: am 35a8f94d: Reconcile with ics-mr1-release
* commit 'a4a09465569d0f4cce36f089fa02d5ef9b95db81':
Fix 5960562: Show emergency button on PukUnlock screen
|
| c5c49398584f2399af905a931e556ed6e0a29cd4 |
21-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Clean up Track constructor"
|
| 0ff7b8ee7f619f54464d5d3002769c746f6062a9 |
21-Mar-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 35a8f94d: Reconcile with ics-mr1-release
* commit '35a8f94da6a8a3a6757e5663bfcbcd044f72a92a':
Fix 5960562: Show emergency button on PukUnlock screen
|
| b6bf4cc62db7835fcdaa6243d5bf975a18a4fcd1 |
21-Mar-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
|
| ccf89b54f973f11082150d02ed957f7e967fbc8b |
21-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioMixer can be configured for fewer max tracks"
|
| 63c1faa8dea7feb90255d31ef2a133d8f2818844 |
21-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Update comments"
|
| 7153494670bdac8b650cb10b8b1838651e0ca418 |
21-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Whitespace"
|
| a26ff6f22f4e86d09514c2819237bd9748455018 |
21-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "new doesn't fail on Android"
|
| 903626bd3cf03920f2ca8ce8ce5cca2874d5e02d |
21-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am d58b6cd1: am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit 'd58b6cd1e3fdf3deb5147daec556fe424a568732':
|
| 9a5f413a21b320fea0607e653bc75b1a4f0e7a2e |
21-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am a48285c4: am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit 'a48285c4f22ffc43f1771ebd1ff35dcec48db2c7':
audioflinger: fix issue with camcorder and A2DP
|
| 65b5a46b4387e064d1bfb2ae9e8a1aa523b20f41 |
21-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 044e7503: am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '044e7503ccdcd81adb69b5218b3b92ede47b005a':
|
| 286df86540d638e30359642068f1022c583e823e |
21-Mar-2012 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of ec94ecad to master
Change-Id: I13bc9671cc1ef02bede7e83253aa8a005367fa0c
|
| e9ddbf9466a64e211e518efa2f2058f8bbb4d513 |
21-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Handling end times of subtitles."
|
| bae00e73c6d1d87cc5fd42b50f95d1d9572162ea |
14-Mar-2012 |
Insun Kang <insun@google.com> |
Handling end times of subtitles.
Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
edia/libstagefright/timedtext/TimedText3GPPSource.cpp
edia/libstagefright/timedtext/TimedText3GPPSource.h
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
edia/libstagefright/timedtext/TimedTextSRTSource.cpp
edia/libstagefright/timedtext/TimedTextSRTSource.h
edia/libstagefright/timedtext/TimedTextSource.h
|
| efbdae278103028aa981eebd5e328aa8e3cb54f3 |
21-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am eb99cacc: am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
* commit 'eb99caccd7165385fc83b0175c6d176c990f179b':
|
| 59a142337b023ecdef4e0ec2768cee289af34b39 |
21-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 04353390: resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp
* commit '04353390722b9195434cc86af4414004eff058e8':
AudioTrack: relax check on minimum buffer size
|
| 5c94b6c7689a335e26a86e8a0d04b56dc627738e |
21-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
AudioMixer can be configured for fewer max tracks
Change-Id: I371b17cef071d083eecf35cd3627a3adff907a33
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| f99590187e2e3f1cf6f093063170edec269cac5d |
19-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Clean up Track constructor
The 'thread' parameter can never be NULL.
Use constructor initialization list when possible.
Make more members const.
Only put the relevant code under "if (mCblk != NULL)".
Add comment about track name leak.
Change-Id: Ib963390a69bed1999638cc982a759edd1d5f4712
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 16252eb65e873420d47bd2e0fb6a2a7877342224 |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Add libmedia_native
Change-Id: I4bff781a26d01023d23d5285a8aa83dbce46c629
ibvideoeditor/lvpp/Android.mk
|
| 4dceed6d2a13ff88942d01a4e99daab9b3aaca9f |
20-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Add libmedia_native"
|
| f6e7ad1543ce19f05600d9414360c74c83e467bb |
20-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Move COM tag parsing to constructor"
|
| 092406a2568316bbe5ed1ec6335e6f1d128ebf8e |
20-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Move COM tag parsing to constructor
Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
edia/libstagefright/MP3Extractor.cpp
|
| 6da08fc33642b832d1cde2e46815a5fd67dd0016 |
20-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Parse mp3 encoder padding/delay"
|
| b636abde14f2612ea236257846b9ab15d87d4623 |
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
nclude/media/stagefright/MetaData.h
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/XINGSeeker.cpp
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/include/ID3.h
edia/libstagefright/include/XINGSeeker.h
|
| fa6494d086e697543efa3d16440647e14ea09f30 |
20-Mar-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Do not set camera preview display if the surface is null."
|
| ea7939a079b3600cab955760839b021326f8cfc3 |
14-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Whitespace
Fix indentation, and add blank lines in key places for clarity
Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
nclude/common_time/local_clock.h
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
|
| 2ee367e444e7b62e02bde8a2e47603a9ad342c6e |
20-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Add libmedia_native
Change-Id: I3ac357c78fb89f108d15c6e5b9fa317de0e9fb9a
ervices/audioflinger/Android.mk
ervices/camera/libcameraservice/Android.mk
|
| 1bb8e81b066a2311fd238fc6dae8f026e33ed99e |
20-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Add libmedia_native"
|
| 17a736c3e1d062d7fc916329eb32aef8935614af |
14-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Update comments
Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/JetPlayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| a03567676e8766828ff970b87e13bc4c97b23473 |
19-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
new doesn't fail on Android
Change-Id: I5079a3bf31097dd0807b2d806d5f8d3cff2077ab
ervices/audioflinger/AudioFlinger.cpp
|
| a075db4ff9b086ac2885df77bb6da0869293df92 |
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
nclude/media/AudioRecord.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| da394bb36de36c52db24fe6b6250d1c623aa5626 |
19-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit 'cbc90453248bd3f9a11fdbc07e544d4a39592934':
|
| f607e2e488ad0438bf6d4a4cd841ba1f902206c7 |
19-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '165ee4c53da462b1b6d131e25456dade51c18496':
audioflinger: fix issue with camcorder and A2DP
|
| 9d7b4c074205609271f61e1a4741ac0c524a1795 |
19-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
audioflinger: fix issue with camcorder and A2DP
|
| 0f5591d80245500b98f2d8d7477248a30a7b0473 |
19-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
audioflinger: fix issue with camcorder and A2DP
|
| 5616e66477953a011429ff71a4fd1ddc4968928f |
19-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
audioflinger: fix issue with camcorder and A2DP
|
| 4ade00863737a82bb41f289a6a40893ceefca43e |
19-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
|
| 1746929ddc7592ab397c402724a61352e45df093 |
19-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "audio_channel_in/out_mask_from_count"
|
| 8e0792bb55a604ffcd4aa90fdb4419d8b3c6ad24 |
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
edia/libstagefright/CameraSource.cpp
|
| 89d94e79dad032fb18ddc655e6068e4231d3f0aa |
17-Mar-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix issue with camcorder and A2DP
Some audio HALs do not support well a device selection of 0 (no device)
received on an input stream.
This can happen because of a problem in the audioflinger code that handles
the forwarding of the output device selection to the record thread for use by
the pre processing modules that need it. If the output device is 0 (meaning
no op, which happens when stopping playback over A2DP) audioflinger could not
detect it was an output device selection and would forward it to the input
stream (see AudioFlinger::setParameters() and RecordThread::checkForNewParameters_l().
Issue 6179641.
Change-Id: Idae534521866538e0d12ba259a2834f402a922e2
ervices/audioflinger/AudioFlinger.cpp
|
| bd98366df5cac3b7ea5b3cecde5fcb4d2731a145 |
17-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| eb47ddf8e410b2848e86e2be5ba442d82aa36362 |
17-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit 'eaa08d35154b0b9d62098c80c75f2deeadf72b9e':
|
| bfc4cdf402546278f0835f94c7990b42a0566bb0 |
17-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am b1853f70: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit 'b1853f706371b5050cd8184f5c33955c2f5ae36a':
MediaPlayerService: fix AudioSink latency
|
| 7d372bd9a6dd7c2174519a8c575011109a949ebb |
17-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
|
| c7c8375bad086263ca1e14d08e03a69e4a3b1651 |
17-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
* commit 'b388138ff2986d6883fa9331fa91ae5e18ae81a0':
|
| e341547e2931b4aae4681053491ba5ccbab06e6f |
17-Mar-2012 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp
Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
|
| 9c450b31c18d0995ded7aae7552a0db36654c62e |
17-Mar-2012 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
|
| eb76ff27c13386eb5a2dad73b1a8366f80eb0ff7 |
16-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Report an error instead of waiting for EOS indefinitely in sf2."
|
| 156a8b1c7a997a614902392d82a3528efbc858c8 |
16-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
|
| ab8aa6aa0a71884406f9d79bcd0cfdc717995bb3 |
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
|
| 2661809ffd8a026c9cebc716c93f96d0a7aaa70e |
16-Mar-2012 |
Eric Laurent <elaurent@google.com> |
am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
|
| 9a55cd24e8b1175b604ba098e6b3a090591c93a3 |
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
|
| f5e376fb8f2c30f82b7548241ca6b24f92ff8914 |
16-Mar-2012 |
Andreas Huber <andih@google.com> |
Report an error instead of waiting for EOS indefinitely in sf2.
Change-Id: Id7bcfb90a3b6a61f0df8bd8f39ea4ffa3c433d87
mds/stagefright/sf2.cpp
|
| a673ba75ab58aaf380ca2420b1d63d3639cf1960 |
16-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "ACodec is a little more aggressive in its error checking now."
|
| ca0928da9afc905e62e4bdd0e283d223db786978 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/AudioPlayer.cpp
|
| de61a78a1c7903efac9d26a2de0fd8db14cd7760 |
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
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| c5255ac5b1bd313dcb50159566163b24dce7483f |
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
edia/libstagefright/codecs/g711/dec/SoftG711.cpp
|
| b12153e36ae5e514d96c77d660b327d1a8f5000f |
16-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Add libmedia_native
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
mds/stagefright/Android.mk
edia/libaah_rtp/Android.mk
edia/libmedia/Android.mk
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
ervices/audioflinger/Android.mk
ervices/camera/libcameraservice/Android.mk
|
| 6469edeeac6079b118e8f81252116c40574c9841 |
16-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Remove obsolete software codec header files and amr encoders."
|
| ded61aa958278147b5a150c189f86d025165f095 |
16-Mar-2012 |
Andreas Huber <andih@google.com> |
Remove obsolete software codec header files and amr encoders.
Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/Android.mk
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/include/AACDecoder.h
edia/libstagefright/include/AMRNBDecoder.h
edia/libstagefright/include/AMRNBEncoder.h
edia/libstagefright/include/AMRWBDecoder.h
edia/libstagefright/include/AMRWBEncoder.h
edia/libstagefright/include/AVCDecoder.h
edia/libstagefright/include/G711Decoder.h
edia/libstagefright/include/M4vH263Decoder.h
edia/libstagefright/include/MP3Decoder.h
edia/libstagefright/include/VPXDecoder.h
edia/libstagefright/include/VorbisDecoder.h
|
| 0893d312070143e45c630d4a212df187b99a0e3e |
16-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Skip XING/VBRI frame when decoding"
|
| 19dd09bcab75e23afa08ded1caece433266d3c23 |
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
|
| 51011e8de5a37b3912ab0c40e407b60e64a908ee |
16-Mar-2012 |
Glenn Kasten <gkasten@android.com> |
am aa1bd6de: am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location"
* commit 'aa1bd6dec676ab81e14ca428427d2b8c627c83fa':
Add empty libmedia_native in old location
|
| 0fce406301b24dafb98dff8f9cab3873e5398728 |
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
|
| ce40e081de3ecb5aa1c49d98775c99975710aed2 |
16-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Remove obsolete OMXComponentBase class"
|
| cc3190bcd4bd9321a68fb726b055c45b35229ec1 |
16-Mar-2012 |
Andreas Huber <andih@google.com> |
Remove obsolete OMXComponentBase class
Change-Id: I701ff5a57b0ab49cc772c4f82d03b5005e54ec6f
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMXComponentBase.cpp
edia/libstagefright/omx/OMXComponentBase.h
|
| 9e50385f34676d8fcb3b473ec4c9f5c388a4c887 |
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
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/XINGSeeker.cpp
|
| 7c5afe93c9ca2f9f3958663bc3fa9649ec2f5331 |
15-Mar-2012 |
Insun Kang <insun@google.com> |
Fix a bug in MediaPlayer's addExternalSource().
Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/timedtext/TimedTextDriver.cpp
|
| f281c227ee4b5732df3af8c7d4f43ab0e65cabfd |
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
|
| 49f306f863b14f8bfc3b405ebfd3a2fb2b403c15 |
16-Mar-2012 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add a new camera open API that allows taking the ownership."
|
| 2ae5a73d4994bd294ee17b8bfb8d722ef9a2564a |
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
edia/libmedia_native/Android.mk
|
| ab334fd351ae5a0e18903da123d63e565b536874 |
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
mds/stagefright/SimplePlayer.cpp
mds/stagefright/audioloop.cpp
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libmedia/JetPlayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AudioSource.cpp
|
| 2f70d9f89a0461cafdbd84a3d8d65062f420d77a |
15-Mar-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Move CameraParameters.h to frameworks/native."
|
| 3c5bbaee376d235404f267fbe1693d1960bfaaef |
15-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dependency on audio_* location"
|
| 2fd2440d0175ca3e196b01b7541a9e0d4ed9a694 |
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
amera/Camera.cpp
amera/ICameraService.cpp
nclude/camera/Camera.h
nclude/camera/ICameraService.h
edia/libstagefright/CameraSource.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| cbcd6e869dd41158076e742a31c1ee410fc0c713 |
15-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks."
|
| 54cb278c03dc72b7a1ba1ac6f7ecb1ee6939acb6 |
15-Mar-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Move CameraParameters.h to frameworks/native.
CameraParameters.h is indirectly required to implement the Camera
HAL. Move it to frameworks/native.
Bug: 6171735
Change-Id: I1bf4db228333be16fc7caa3c51280a9495293011
nclude/camera/CameraParameters.h
|
| 213744c53992ba183809b30980f57d25dc8bd967 |
15-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Fix Xing seeking when TOC[0] == 0"
|
| 33b383948e8f270bff30378476f00dce289004eb |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dependency on audio_* location
Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
edia/libeffects/downmix/Android.mk
edia/libeffects/factory/Android.mk
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/preprocessing/Android.mk
edia/libeffects/testlibs/Android.mk_
edia/libeffects/visualizer/Android.mk
edia/libmedia/Android.mk
ervices/audioflinger/Android.mk
|
| 5102400104ce1f0a6de7bf913381a91e4f18a22a |
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
edia/libstagefright/XINGSeeker.cpp
edia/libstagefright/include/XINGSeeker.h
|
| f9d660a5e0196240add5daf0199f128d471e592c |
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
nclude/media/mediaplayer.h
nclude/media/stagefright/MediaDefs.h
nclude/media/stagefright/timedtext/TimedTextDriver.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/timedtext/TimedText3GPPSource.cpp
edia/libstagefright/timedtext/TimedText3GPPSource.h
edia/libstagefright/timedtext/TimedTextDriver.cpp
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
edia/libstagefright/timedtext/TimedTextSRTSource.cpp
edia/libstagefright/timedtext/TimedTextSRTSource.h
edia/libstagefright/timedtext/TimedTextSource.cpp
edia/libstagefright/timedtext/TimedTextSource.h
|
| dfaf549e3e310bc22444f4404b19f4907b24c286 |
15-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioFlinger playback thread CPU measurement in Hz"
|
| 190a46f7c84e160386610c0c4cecb9767fb5503b |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger playback thread CPU measurement in Hz
Log statistics on CPU usage in Hz in addition to wall clock time
Use CPU statistics for all playback threads, not just MIXER
(but they are disabled by default by a compile-time debug macro).
ThreadCpuUsage library:
- Move statistics out of the library and leave that up to the caller
- Add API to determine a CPU's frequency
Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
ervices/audioflinger/AudioFlinger.cpp
|
| c1e3ed15d86337361c11fc4bb425ae252eceb946 |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Fix LOCAL_C_INCLUDES and correct #include syntax
Change-Id: I522861043cc2ee905258a2ae409bf9dddbe452dc
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/NativeWindowRenderer.h
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| 3b229ed97c0dfc85a8cf881341e29e595e0edea7 |
14-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: more info in dumpsys"
|
| 612bbb57c59397a540e96f06bdd16e437a583af5 |
14-Mar-2012 |
Eric Laurent <elaurent@google.com> |
audioflinger: more info in dumpsys
Added TID and io handle to AudioFlinger threads dump.
Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
ervices/audioflinger/AudioFlinger.cpp
|
| 7734b0297330ab45c114c3d129152b14ffeb26cd |
14-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Break circular dependency on media player service"
|
| 8e5b72c39cf0e4d4bec6f843bb54f6409b073c64 |
14-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Prepare frameworks/native/services/audioflinger"
|
| d191213ab0146526541913f3fed2d5aa95f58899 |
14-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use correct syntax for #include <> """
|
| 39485a9071b06ab8bb390844ae39f783d6c0ed25 |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Prepare frameworks/native/services/audioflinger
Part of this change will be reverted after the move is complete.
p.s. this dependency on AudioFlinger should be removed
Change-Id: Ib29d413b74a6dc1babe7a33471128be11304ce56
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/vss/src/Android.mk
|
| 27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e |
14-Mar-2012 |
James Dong <jdong@google.com> |
Merge "make sure that lower-case mime and file suffix is used to check against the supported ones"
|
| 75979dc147c4d2f832730da2e9b68d93ce892ba3 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"
|
| edc8a8e6054d67b22ec27d62f0abfdafafd66b76 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Turned off log spamming from DrmPassthruPlugin"
|
| 35250664455c9642cc14d3831b663880637a7d70 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Fixed a buffer overflow bug in DrmPassthruPlugin
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 0a38af09ebbacdc9aa0d5ecb24e2f0484bf4f191 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Turned off log spamming from DrmPassthruPlugin
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| d3cee2f0f649c01e1153d593cbe723887b8e0ba0 |
14-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Break circular dependency on media player service
Bug: 6165157
Change-Id: I3c85bbcaf31f3cb9a009e273f7b6284015eb3bd8
ervices/audioflinger/AudioFlinger.cpp
|
| b4d307481960b6b348fae4b4e8edefd003c3d36c |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Use correct syntax for #include <> ""
Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
nclude/media/JetPlayer.h
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/mediaserver/main_mediaserver.cpp
|
| 0e9350254736c4aea154a7a871dd212038050f70 |
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
edia/mediaserver/Android.mk
|
| ad6ec91c0bca37587e28bf72dfc38cde1b90544f |
13-Mar-2012 |
James Dong <jdong@google.com> |
make sure that lower-case mime and file suffix is used to check against the supported ones
Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| abf0610a8cea021548f2909e1d47d656206f641c |
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
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab |
13-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Gapless playback, step 1."
|
| 6b74d671a1321a6ecc4a40b6c87beedfecc1ec44 |
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
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/AudioPlayer.cpp
|
| 5e7616cc0e5493241211333134555d74aec89982 |
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"
|
| e53b9ead781c36e96d6b6f012ddffc93a3d80f0d |
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
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
nclude/media/IMediaMetadataRetriever.h
nclude/media/IMediaPlayerClient.h
nclude/media/IMediaRecorderClient.h
nclude/media/JetPlayer.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/MediaProfiles.h
nclude/media/MemoryLeakTrackUtil.h
nclude/private/media/VideoFrame.h
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IEffect.cpp
edia/libmedia/IEffectClient.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/IMediaRecorderClient.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/MediaScannerClient.cpp
edia/libmedia/Metadata.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/Visualizer.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.h
ervices/audioflinger/AudioResamplerSinc.cpp
|
| b87396f9ebabbb7b47683bceca96cbe635a1ca00 |
13-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Fixing coding style : Indentation"
|
| fd83fbf5ead098070bae674b20e6f87f45ab5d4c |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Clean up assertion checks"
|
| 083c271152f2d930f259816d52327ed47e022780 |
13-Mar-2012 |
Insun Kang <insun@google.com> |
Fixing coding style : Indentation
Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
edia/libstagefright/timedtext/TimedText3GPPSource.h
edia/libstagefright/timedtext/TimedTextSRTSource.h
|
| 6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb |
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
mds/stagefright/Android.mk
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/MetadataBufferType.h
nclude/media/stagefright/OMXPluginBase.h
nclude/media/stagefright/openmax/OMX_Audio.h
nclude/media/stagefright/openmax/OMX_Component.h
nclude/media/stagefright/openmax/OMX_ContentPipe.h
nclude/media/stagefright/openmax/OMX_Core.h
nclude/media/stagefright/openmax/OMX_IVCommon.h
nclude/media/stagefright/openmax/OMX_Image.h
nclude/media/stagefright/openmax/OMX_Index.h
nclude/media/stagefright/openmax/OMX_Other.h
nclude/media/stagefright/openmax/OMX_Types.h
nclude/media/stagefright/openmax/OMX_Video.h
edia/libaah_rtp/Android.mk
edia/libmedia/Android.mk
edia/libmedia/MediaProfiles.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/amrnb/enc/Android.mk
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/g711/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/Android.mk
edia/libstagefright/codecs/mp3dec/Android.mk
edia/libstagefright/codecs/on2/dec/Android.mk
edia/libstagefright/codecs/on2/h264dec/Android.mk
edia/libstagefright/codecs/vorbis/dec/Android.mk
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/httplive/Android.mk
edia/libstagefright/matroska/Android.mk
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMXMaster.h
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/SoftOMXPlugin.h
edia/libstagefright/omx/tests/Android.mk
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/tests/Android.mk
|
| aa4397f07c43bd83bc3100b749401dc3d15e7622 |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Fix bug where mMixerStatus was set to IDLE
Change-Id: I55df1738fb7ba17ba6caeea6a17557526eac17a7
ervices/audioflinger/AudioFlinger.cpp
|
| b240013c30a8be4dffc678a350c80205b5f4696d |
12-Mar-2012 |
James Dong <jdong@google.com> |
Switched to use header files in /frameworks/native
o related-to-bug: 6044887
Change-Id: I3a1143b09560a6b8fd67d23bbb375c83442a12e9
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| 5798d4ebf236357a4b13246f40e52b90a34d09a4 |
08-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Clean up assertion checks
Use ALOG_ASSERT instead of assert.
Use compile-time asserts where appropriate.
Fix typo in an ALOGV.
Change-Id: I58f1c1ffc14319a022c88b5a88b8d0368660da8b
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
|
| 73f4bc33e0d458933460250a47c64aa868c05f97 |
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Inline applyVolume() into threadLoop_mix()
Also the declaration of applyVolume in PlaybackThread was dead.
Change-Id: I4b1a9848d07d3d7f340baea05b17f667c78df868
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 470aa50c36089fbe0427557f7cf4464dd26a1c52 |
12-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove unnecessary friend declarations"
|
| 2d6ef93773465cd3e66146fac35050a472c589f7 |
12-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove virtual from methods that don't need it"
|
| 022484535d60499e7429ac8fcf52d8278405704e |
12-Mar-2012 |
James Dong <jdong@google.com> |
Swtched to use header file in /frameworks/native
o related-to-bug: 6044894
Change-Id: I192f0436572d240fd2fb88446f6fa63ba0128d7e
ibvideoeditor/include/II420ColorConverter.h
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| 0643d428cebcfe885ec2777253d45ee6e05da6fe |
12-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Merge dup code at thread entry and param change"
|
| 4a47e1a47e56fc0b9612c538001e49ebb4ab0e0f |
12-Mar-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Extend WAV extractor for multichannel"
|
| f67fdc6d8bb31226ffeeecbff6aca610befd0110 |
12-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Avoid checking supported mime types or file suffixes in multiple places"
|
| 75dd1750a3b7b1b4a519c33fc055e9d09dd7031c |
12-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Refactored MediaBufferPuller class from VideoEditorVideoEncoder class"
|
| 66fcab972e9218d47c58a915f391b2f48a09903a |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge dup code at thread entry and param change
This CL is mostly just cleanup, but there are a couple of fixes marked
"FIX" below.
Merge the duplicate code that was at the beginning of threadLoop() and
after a parameter change. cacheParameters_l() is now called at entry to
threadLoop() and after any parameter change. It re-calculates all values
that are derived from parameters, and caches them in instance variables.
updateWaitTime_l():
- FIX activeSleepTime depends on mWaitTimeMs, which was initially set
to infinity. updateWaitTime_l() was not called at entry to
threadLoop(), so activeSleepTime was not set correctly before the
first parameter change.
- FIX reversed the order of calls after parameter change
for the same reason so that updateWaitTime_l() is called before
calculating values that are derived from wait time.
- marked it private since now it's only called from DuplicatingThread
Change-Id: If2607d2ed66c6893d910433e48208a93c41fb7e9
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 18f1ff3f42aa6de3b8a5311c8886ef48980fa65f |
11-Mar-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Update build dependency on AudioMixer header
VideoEditorSRC doesn't need to include AudioMixer.h.
VideoEditorResampler includes AudioMixer.h, which requires
system/media/audio_effects/include in the include path.
Change-Id: Ibf6194831aeb91e788ce0a3b1282a0d930ee6e48
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/vss/src/Android.mk
|
| 1be92616b4794ad09ae84a8ea5fa703dac035745 |
10-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
edia/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
|
| 6f23abfc7b913d0311498eb36771d497e898e458 |
10-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
edia/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
|
| bd2f13ddbe7a9e7550205f6b53880329e09b9457 |
10-Mar-2012 |
James Dong <jdong@google.com> |
Avoid checking supported mime types or file suffixes in multiple places
Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngineConst.h
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 3bed68cb3d43af40475f56211869c40470c1fb4d |
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
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/include/WAVExtractor.h
|
| d64f3a376536a993fe6d81730b8b7b738500435e |
10-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Added an failure log message when the fwdlock engine fails to open a given file."
|
| 18868c5db2f90309c6d11e5837822135e4a0c0fa |
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
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AudioPlayer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| f2015b625cd6bea86da7401e725332c35b90e7cf |
10-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use AudioRecord::record_flags consistently"
|
| 5e9ce08417c36aa572c3f18b40ff9335d409b1e9 |
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
|
| ca17672e75faf59492527a5b168cc01db8badabb |
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
|
| 26d24395b4a7afbbf8d799295c0d89a42f6d44de |
10-Mar-2012 |
Conley Owens <cco3@android.com> |
am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit 'c24f5ba4ee2873d6fd980229f0d24c80104d3558':
stagefright amrwbenc: Simplify the definition of static_vo
|
| 5d181e4260c96ae244deb89043b963f69f5834e2 |
10-Mar-2012 |
Conley Owens <cco3@android.com> |
am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '66da3fdce4dc61f7d1c125eda9b2e065658cc0e5':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
|
| ec431bbd9c7ab07c61290b12d41d9995794e0f61 |
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
|
| 62dac15d10f940b3bdb9f78d79cdc3e793ff63dd |
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
|
| c98c8831388d206f3883767fda3e9c0e5b2e816b |
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
|
| 9045f8d6bf6f052b8fa0e34de2d703e8bff75a95 |
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
|
| 824ab1a4138faa7a2dda1571282f0938e4b6cc40 |
09-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix memory leak when carrying ABuffer* in AMessages."
|
| bdaa29a9bc63d8d0d86879e40286a06655623322 |
09-Mar-2012 |
Andreas Huber <andih@google.com> |
Fix memory leak when carrying ABuffer* in AMessages.
Change-Id: Icb4770ca238d316e6dd2d89159357a8fdb504ea9
edia/libstagefright/foundation/AMessage.cpp
|
| d69549665d412f1f6ebad48ad8cd05133ada8728 |
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Replace hard-coded 3 by FCC_2 to simplify searches"
|
| 9c78e8681dafcdf265bc733875bad436ef9ec220 |
09-Mar-2012 |
James Dong <jdong@google.com> |
Added an failure log message when the fwdlock engine fails to open a given file.
Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
|
| 688aac7675f18bdd7bff13334759e20bc4e6c390 |
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Remove virtual from methods that don't need it
Change-Id: I30e17e61aae25b036436c0e270313c80c43e5f06
nclude/media/IAudioFlinger.h
ervices/audioflinger/AudioFlinger.h
|
| 887c5d2ac34d81bde66dadbd7b2ff07501744778 |
09-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Improve AudioPlayer position reporting"
|
| e7d0c712f1c9fa0b0e413b8eb729049995290aee |
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
edia/libstagefright/AudioPlayer.cpp
|
| 1998661fdb6b0b5ae103e047e3d653c5da1b99e3 |
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Remove unnecessary friend declarations
Add comments to the remaining friends, so we know what is left if we
decide to remove them later.
Change-Id: I1de929257dc4700960f77902cda3d303177c72cf
ervices/audioflinger/AudioFlinger.h
|
| 5aaeb0d64fc98f9b019a4378eb39f0ee49ee6ec4 |
09-Mar-2012 |
Andreas Huber <andih@google.com> |
fix EOS handling in codec test.
Change-Id: I5eb6d00aa0c1a728a951c7ffa4faebcadd7b14a6
mds/stagefright/codec.cpp
|
| dc1696c890698d55aade9dbadf3148c2fac01cd0 |
09-Mar-2012 |
Conley Owens <cco3@android.com> |
Merge "stagefright amrwbenc: Simplify the definition of static_vo"
|
| 1f7e2d9906d25b4e709c247d78537ee826d31051 |
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
|
| 083c154162c88a9f63aeaa10a4b52dd454bda9ff |
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Don't ask policy manager about invalid stream type"
|
| b3dfcf483a96816fe2e949dd86fed26e52ad7404 |
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioPolicyService InputDesc minor cleanup"
|
| d0051df7abefd2885f5888f0b794efbd197404c3 |
09-Mar-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 679ab0b0792846a89162ce41c953819d70030112 |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Use AudioRecord::record_flags consistently
Change-Id: I6f369a2b99eb515603bc7d5629a07db2b96783fe
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
edia/libstagefright/AudioSource.cpp
|
| a19ffb656616feec70613ba67ddfe15a504a4e76 |
09-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audio policy: use audio_devices_t when appropriate"
|
| 09e1ef282e7b2df400a9f35feb47b48b67af0f3b |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_policy_output_flags_t consistently
Change-Id: I425cfd442257560dcf141d3d8599ddc7d21c1d13
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
|
| 5e5631bbf2403b8242e77977792318d65362ed91 |
09-Mar-2012 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix videos app bandwidth accounting for 4G streaming"
|
| 81872a2ce65653ae980621ba2907da56a83ba9a7 |
08-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
AudioPolicyService InputDesc minor cleanup
Add a non-default constructor to set the mSessionId, and make mSessionId const.
Remove explicit clear on mEffects - it is automatically cleared by the destructor.
AudioPolicyService::setPreProcessorEnabled:
- parameter is const *
- use an alias instead of making a Vector copy
Destructor doesn't need to be virtual since there are no subclasses.
Change-Id: Ibc3c3bea8259839430b1cf5356186c7d96f1082f
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 53d76dbe7c55821e89d9da02e7a563f7fb45de87 |
08-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Replace hard-coded 3 by FCC_2 to simplify searches
Change-Id: I92881d04e8378307f849fb343071a58d181a68b4
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 6374252107fd6539397598195ea6defd5870fafb |
08-Mar-2012 |
Eric Laurent <elaurent@google.com> |
audio policy: use audio_devices_t when appropriate
Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| f3c2e3bd65449b413c378219e08c71bf744cfbf3 |
08-Mar-2012 |
Mathias Agopian <mathias@google.com> |
Merge changes I140d291e,Id443ec5c
* changes:
remove files that moved to frameworks/native
fixup hardcoded include paths for new project
|
| 51ec58b9a0c290bf1b8eb0b5620a7f022372a97d |
08-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Added better codec statistics to evaluate performance."
|
| fec279f5a0bfaa2a42e91ab6dfa0282baeee308b |
08-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Mixer status cleanup
Use mPrevMixerStatus for DirectOutputThread also.
Remove the MIXER_CONTINUE logic and use MIXER_IDLE instead.
Rename the field mixerStatus to mMixerStatus.
Rename local variable back to mixerStatus.
Change-Id: I0a8145fc856c6c5ff8b784b6176ef3c4d8eb7408
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 3dbe8acdeb2309eab0c22dd1c8d732c7e94d3413 |
08-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Cleanup DirectOutputThread::mActiveTrack"
|
| 9f08fa0c5bd9353720feeb989a3af4610c929ca6 |
08-Mar-2012 |
Mathias Agopian <mathias@google.com> |
remove files that moved to frameworks/native
Change-Id: I140d291e520097b1148930f736823650e08488f7
nclude/private/binder/Static.h
nclude/private/binder/binder_module.h
nclude/private/gui/ComposerService.h
nclude/private/gui/LayerState.h
nclude/private/gui/SharedBufferStack.h
nclude/private/ui/RegionHelper.h
nclude/private/utils/Static.h
|
| b071e9bc248865ef87a339044c0c5cbabfac175c |
08-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Cleanup DirectOutputThread::mActiveTrack
Rename activeTrack to mActiveTrack.
Release the reference earlier, at the end of threadLoop_mix().
This allows the field to be made private and to
move the declaration from PlaybackThread to DirectOutputThread.
Change-Id: I02be7a254638f7d85e92aaf0002d20ca0092a5c3
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 19866e2f820c44854175fbfb7e9a33bd877c025b |
08-Mar-2012 |
Dirk Dougherty <ddougherty@google.com> |
am 391bb522: am 859717ad: am 4d7bc655: Doc change: String changes for Android Market
* commit '391bb522013fab16b28dd8304530778114b448ce':
|
| 381f475475b11a552a5233c48947cc570c28b1d8 |
08-Mar-2012 |
Dirk Dougherty <ddougherty@google.com> |
resolved conflicts for merge of 532679a5 to master
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
|
| 639dbee79140956c43926344c23af765f6e0c9a5 |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Don't ask policy manager about invalid stream type
Change-Id: If50fbff9d34045d1398984da48da7e6428a74491
ervices/audioflinger/AudioFlinger.cpp
|
| b279312a9038b9c5b9b05b31b1b1db86f748efd8 |
08-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "IAudioFlingerClient::ioConfigChanged param2 const"
|
| bae6f72d16a1cfc2122b4ce9b484c026ecd896b1 |
07-Mar-2012 |
Andreas Huber <andih@google.com> |
Added better codec statistics to evaluate performance.
Change-Id: I9a1e4a803502329e0342ddde07b6df6b3761afd8
mds/stagefright/codec.cpp
|
| da6dd679c196f1e342ce41ee9839e87309563e13 |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Isolate references to outputTracks/mOutputTracks"
|
| f2eda12fb968829ee6f67e9b45e01eb4e2105c09 |
07-Mar-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Effect for multichannel PCM downmix to stereo"
|
| fa26a859bacb597587a8f49acfc3127351fa688c |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Isolate references to outputTracks/mOutputTracks
Move all references to DuplicatingThread::outputTracks and
DuplicatingThread::mOutputTracks from the common threadLoop() into
virtual methods. This allows them to be moved from PlaybackThread to
DuplicatingThread, and to be marked private.
Also use vector assignment to copy mOutputTracks to outputTracks.
Change-Id: Ieb1cf1ad36b8a65143e61e6c92a65fb43427e5e2
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| a13ad6e84db128eadf23b154d3346f0bb473a5f7 |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Make applyVolume private to DirectOutputThread"
|
| d4513b09123deebf8023b73a82d2d46d35806cea |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Make applyVolume private to DirectOutputThread
Change-Id: I7ca4a59505857cbd106b6f274c66e9580dead271
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| a3707a280177e934a1e0a15660d9176663b7fc17 |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Add comments about sequence for setting parameters"
|
| 04c1e531b5913c09aa9b2e59e2b8ed9b4d8a4cba |
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
edia/libeffects/downmix/Android.mk
edia/libeffects/downmix/EffectDownmix.c
edia/libeffects/downmix/EffectDownmix.h
|
| 1465f0c3df04c3166155a852a6a5c10069c1fd0a |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge the calls to prepareTracks_l
Change-Id: I1dd759581333e2908d980180d44db7bf5ed6591d
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| b81cc8c6f3eec9edb255ea99b6a6f243585b1e38 |
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
nclude/media/AudioSystem.h
nclude/media/IAudioFlingerClient.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlingerClient.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| f8edf68a1e39da273eafe8c85bdbedc26636c4ec |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Rename fields of AudioSessionRef"
|
| cbc52bfb3b51c81c945b1e35990324bde892829a |
01-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Add comments about sequence for setting parameters
Change-Id: Iffa59a34c3c47bdc1d3234cdcb4d8ff99c102825
ervices/audioflinger/AudioFlinger.h
|
| 92b8360fe9c3174dc0edaaab4b746d8a3d3f831f |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix indentation for re-organized code"
|
| 7d010baec6d5514b938b90545ff447366ddf1158 |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Rename updateWaitTime since a lock is held"
|
| 438b036deaf4413503567a75a2861c000d21da5b |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Rename updateWaitTime since a lock is held
Change-Id: I9bb978cbd0debf5b21676467060f72eebafea3e6
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 952eeb27682a9b2ddfa761f24b6eb5e18fe5d814 |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Fix indentation for re-organized code
Change-Id: I63471cebdbd095b7ad4e481611b785f9b02c7941
ervices/audioflinger/AudioFlinger.cpp
|
| 427e38084a16ec063983346347decf3ec461eed1 |
06-Mar-2012 |
James Dong <jdong@google.com> |
Refactored MediaBufferPuller class from VideoEditorVideoEncoder class
o MediaBufferPull class will be useful for the audio encoder also once we switch
to use OMX-based audio encoder.
o This is the part one for fixing bug 5947347
Change-Id: Icddfeb636f7a59ad766220ef0d3155abace73ad3
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/MediaBufferPuller.cpp
ibvideoeditor/vss/stagefrightshells/src/MediaBufferPuller.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 012ca6b4f69fb24385025c0e84b8f816525a3032 |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Rename fields of AudioSessionRef
Change-Id: I9f2a66094135c4ac6bec2d3e9db3ac5fbf988ede
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 6556e5bb99bda64f3ab92e8b540fccdd59e9ed8d |
06-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "MediaPlayerService: fix AudioSink latency"
|
| 22f9dd98d9c4c3e0e58586cf6a6008ca6ee946e5 |
06-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "AudioTrack: relax check on minimum buffer size"
|
| 56617834920554fc68a818da17b56e0c2ad8f254 |
06-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Remove unused code - MediaSourceSplitter"
|
| 70a1577d42c6e222c98f0245e7b81b0e8bc238f7 |
06-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove references to sched_policy.h"
|
| a8806396a9f8644ac84ab7668d4e67c1b9fcf1a5 |
06-Mar-2012 |
Dirk Dougherty <ddougherty@google.com> |
am 859717ad: am 4d7bc655: Doc change: String changes for Android Market
* commit '859717ad627374c6e6ceae9f7cccf73084cb5fae':
|
| 6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a |
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
|
| 958d5b6a79b97ac2b151e48371cf2829a1a302b0 |
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
|
| fd588e27e3f95e0d251ff212dda8c1de853bf4f7 |
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
|
| 083644fee99d23491554484301943e6a7daf262b |
28-Jan-2012 |
Dirk Dougherty <ddougherty@google.com> |
Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
edia/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
|
| 054a5a69374efae97924c83c2ee7ec7210bf3283 |
06-Mar-2012 |
James Dong <jdong@google.com> |
Remove unused code - MediaSourceSplitter
Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
nclude/media/stagefright/MediaSourceSplitter.h
edia/libstagefright/Android.mk
edia/libstagefright/MediaSourceSplitter.cpp
|
| c236eb8ae848997d47b47371f86c37389eef013e |
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
edia/libstagefright/TimedEventQueue.cpp
|
| db354e58e65592777aa17caa47933e14838b8b35 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/AudioPlayer.cpp
|
| d8d6185c978c9b27ca69e7791785e0983ed9e8b8 |
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
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| eb7de4504bdb3a0182021ca6f022cccca01dbf1e |
05-Mar-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Add channel mask in AudioSink"
|
| cdfc4fcd2a1fd8436700c1197a9ff098ac1f625e |
05-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "threadLoop merge"
|
| 000f0e39b4d0c88441297a05ab5f8da6832c1640 |
02-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
threadLoop merge
Change-Id: Id8e6330ac6be76f9c2debba94f856de87e2d98f7
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 8162c1a9f4df4bf4733e78f5b03398b2991ba79a |
02-Mar-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Set channel mask when opening audio sink
Update the code to use the AudioSink::open() interface that
takes a channel mask as an additional parameter. The code
is only stereo, and returns an error when attempting to create
a video editor audio sink with more than two channels.
Change-Id: Ib9bba067da0b286c08656976b89fba7c8b42f99f
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
|
| 786618ffe881aceb64d65a6a2e2d76ede6e01ec0 |
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
nclude/media/MediaPlayerInterface.h
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/AudioPlayer.cpp
|
| 985ed9a1a22ec7e6e245d3fb8e93d3a23bdc539b |
02-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix typos and line length in AudioRecord comments"
|
| e7c795f3300814aa3f26ceb845f29695383c7edc |
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
edia/libeffects/data/audio_effects.conf
|
| 4bce61f407d43b216c288a8d7b26fb5519853dba |
02-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Remove hacks that worked around issues in OMX components several releases back."
|
| 79967af7ba8fb2ddd3a106afc0361f3ad836c174 |
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
|
| 6c1f1cb5bd2b22f8b21b78ea020a0b6370f5b9ff |
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
|
| 25a9ce1b1fea65341299c262b944825d233006f6 |
02-Mar-2012 |
Andreas Huber <andih@google.com> |
Remove hacks that worked around issues in OMX components several releases back.
Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
edia/libstagefright/OMXCodec.cpp
|
| c795b64060c3af9d7961fc1371e4ccfa8ee3e450 |
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>
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 4b77dc28097288cb062fce6bf5de0fb3394877a9 |
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>
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
|
| f08d7d0ee19c225d5b67fb49046290adfd9ab4bc |
01-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Instead of hardcoding OMX component names in our code, support"
|
| afc16d667afa23f5aa00154ccad62f8c45cf5419 |
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
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MediaCodecList.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/Android.mk
edia/libstagefright/MediaCodecList.cpp
edia/libstagefright/OMXCodec.cpp
|
| 5c28615c285ec720b0777fa21139e07e48f9f621 |
01-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "renamed audio policy output flag."
|
| 3030fcefcfcfc48789612659206b957cd0489a54 |
01-Mar-2012 |
Eric Laurent <elaurent@google.com> |
renamed audio policy output flag.
Renamed AUDIO_POLICY_OUTPUT_FLAG_INDIRECT to AUDIO_POLICY_OUTPUT_FLAG_NONE
which is more appropriate.
Change-Id: Ia14d60397df0f2dcd9bea0186400a09da35bc104
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
ervices/audioflinger/AudioPolicyService.h
|
| df94a547d8036619d15975873a1ff5736b0f14fe |
01-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Added permission check for all sensitive drm API calls"
|
| d1aeb29912c93863a05b8023bc30cd139c97c5f5 |
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
|
| 769501aad4e1c69af713b27dada849f99db22914 |
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
|
| e8286332f3817a8b7cc4cfd8f6450a3913533660 |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Shorten thread names"
|
| 848b6a8a4ccff424e382ce5e1d946da6ede580a0 |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Prepare for threadLoop merge - active tracks"
|
| 3e07470f3b122097cacfe5b85cdb1359279a2f33 |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Prepare for threadLoop merge - active tracks
Continued work on making the copies of threadLoop more similar:
- Remove alias for mActiveTracks in MixerThread and DuplicatingThread.
- Pull in declaration of activeTrack in DirectOutputThread.
- Remove redundant parameter of prepareTracks_l().
- Comment prepareTracks_l().
Change-Id: If1087c1902b454acec01ddfdd9f055f0ca7abf04
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| ec539ae64d8a3eadf9115ec7ebe31e4e47788a2e |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioRecord const methods"
|
| bc4b08ba67a0245e092aee8f08ba30ef22d421bf |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Update AudioFlinger comments"
|
| 91cda8bdf8358a8b977a44e016b60a70bc1a5ee9 |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Pull in declaration of effectChains to inner block"
|
| 9f422f59fcb74283fa52c3bfd0a2665ec9ce9e10 |
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
|
| de99ee3d507bf1284fdb5d6b84a32f4227f16a6f |
29-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Safeguard against overwriting bits"
|
| 73ca0f5837d5448f7a5eb159a09cd0ebe82b4de9 |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Pull in declaration of effectChains to inner block
Change-Id: I09eacf72124942abd604132b9f4e774b1236fcf3
ervices/audioflinger/AudioFlinger.cpp
|
| c455fe9727d361076b7cead3efdac2d32a1a1d6d |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
mSuspend comments and usage
Emphasize that playbackthread::mSuspend is a counter, not a bool
Change-Id: I7188e56814e1c54dbc65e560f3627f138257d644
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 8b20e9272d2f8d5160494de3212d66a399b3637f |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Mark similar and different sections in threadLoop"
|
| 688a64030834ea2f52cc9765676ddf6aa34df767 |
29-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Mark similar and different sections in threadLoop
Most of these comments will be removed after the threadLoop merge.
Note: the trivial change in assignments to mixBufferSize, and the
comments about "tracks to remove" is to make them all identical.
Change-Id: I3b1a33a7f2cd12ad557a1986bb71f6171161974a
ervices/audioflinger/AudioFlinger.cpp
|
| 5687da3359c7939dbd982de9fa2e5f19e41ae411 |
29-Feb-2012 |
Andreas Huber <andih@google.com> |
Merge "Separate the notion of "stop" from that of "release", i.e."
|
| d805b718b1fd2d5407ef665c8d4bb42e63dc71a9 |
25-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Update AudioFlinger comments
Add comments to enum mixer_state
Note side-effect of lockEffectChains_l
Fix a typo
Change-Id: Ibd51678bac2193201cbcbe081ff5664046fbc494
ervices/audioflinger/AudioFlinger.h
|
| 328745b130c1c59e53d68a9a3c71675d3932d34b |
28-Feb-2012 |
James Dong <jdong@google.com> |
Added permission check for all sensitive drm API calls
o all drm calls using a DecryptHandle now check the permission before proceeding
Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
rm/drmserver/DrmManagerService.cpp
nclude/drm/drm_framework_common.h
|
| 41acadea86b763f4cc6f7aeb292f943d4570ac90 |
29-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."
|
| 480b46802bef1371d5caa16ad5454fce04769c57 |
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
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
|
| c95c2ddcdfc974f42408a377fbe2de51b94a8c94 |
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
mds/stagefright/SimplePlayer.cpp
mds/stagefright/codec.cpp
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MediaCodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/MediaCodec.cpp
|
| 0f7affe1716dfd6687262008120ed128df1af214 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Remove unnecessary header file includes for drmserver"
|
| 606ee61616efdba4696ae591ad10a4be33d8c946 |
25-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
AudioRecord const methods
Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| a3873833d518e032138cf70188b6f33cd7acec3d |
28-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Unlock effect chains in the middle of two if's"
|
| 3e9c3a1d34960cd258f294d31135ab6bf76179d5 |
28-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Simplify removeNotificationClient"
|
| a17c820c556fddf7ddd96b82b3e9874e340ffafd |
28-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioFlinger const methods and parameters"
|
| 3f791be1032e6c4cc499598dd2be116db6fb33c3 |
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
|
| cfbd62616ab2b12f0fee603658f04e5827cc7f8f |
28-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix theoretical race condition in addOutputTrack"
|
| fadb2c73fce479205432652530663e1e90fd546c |
28-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioBufferProvider comments and cleanup"
|
| d907e9451ec3c7b2244dd5605f1a26ab23466a7a |
28-Feb-2012 |
James Dong <jdong@google.com> |
Remove unnecessary header file includes for drmserver
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
rm/drmserver/main_drmserver.cpp
|
| 77f70f7de1977d7b0a9f9c37a25e34db16feb7b4 |
28-Feb-2012 |
Mathias Agopian <mathias@google.com> |
remove dependency on unneeded headers
Change-Id: I890f40c430beca055bedd95c878eb68b42f232c2
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 279612dd95acc127e41b8a7aa3277f3ffacaa849 |
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
|
| 400ef2023badece85a18accb94194ed601ba6d72 |
28-Feb-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audio preprocessing: fix multiple enable problem"
|
| bc303ed5fd25228b8523adbfcc9c007e73bc04ea |
28-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
|
| 843a12d146bd64642bf85a4e56c274246e3893a6 |
27-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix tracking of hardware state for dump"
|
| acb364073e62acddced517f2edfe0326245b2af9 |
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
|
| 7b419b45b4c810c0c7ebcca5d613cd9356fa4939 |
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
|
| d6b15d3d101b2fb253895e611e081c82afe6d9e2 |
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
|
| 7b65e71b662ce3bd7983fbfb62e8dafade5ccc55 |
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
|
| d7fe790fe59089394ee01f5d56106c0f488aad0a |
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
|
| bf9fc69dd171c99794725171c38f65a3c6f6e544 |
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
|
| 14f94704418852fe83eabd3e0e13288951fee574 |
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
|
| 54fd89aec2b34f6ea14d7b93b34a4a7a69ab0278 |
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
|
| f2f4a649d71aea5066d609c10cd9449df9abd453 |
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
|
| c0502b930651092683a5f47c55159b559fae7727 |
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
|
| 021c841c460993c0db515826a17460fc36eaf744 |
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
|
| 1b1123d45da74ae4916e12b119a6ad5458dea5a2 |
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
|
| 67caa6dfef0b98235616102eb5c503f84782bbed |
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
|
| c6531cfdf04db7f75de3fe82697149f6e28b94e1 |
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
|
| 43a1734eba6f409f9982d2e35dde6a869dbbdc90 |
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
|
| 30a186e062e6301d54cf3140275fff866237c5fd |
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
|
| ea6293131b72a65afabef16e18874c535f061d0a |
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
|
| 30e927947126e87f4865b626ffe17bec74ff5ffe |
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
|
| 59e82a04949ffca325508f5ebf43fdb8657e350c |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
|
| 7917b452eae7340fcab09b7b406d9d8ca28a4a87 |
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
|
| df712ea86e6350f7005a02ab0e1c60c28a343ed0 |
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
amera/Camera.cpp
amera/ICamera.cpp
mds/stagefright/codec.cpp
mds/stagefright/sf2.cpp
mds/stagefright/stagefright.cpp
mds/stagefright/stream.cpp
nclude/camera/ICamera.h
nclude/private/gui/LayerState.h
nclude/private/gui/SharedBufferStack.h
nclude/private/surfaceflinger/LayerState.h
nclude/private/surfaceflinger/SharedBufferStack.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/IOMX.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| d3393c35259588e8ad61a43d1d1aa1568e943307 |
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
libagl shouldn't export anything
Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
nclude/private/opengles/gl_context.h
|
| 61d07fbe79533517dbd4390d90206badd8df4641 |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
|
| 94530642d4a742888363d90875a9b44498100658 |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrwb: Make local const arrays static"
|
| 9d0e88ca1ceee29e4bc4f38fb0897c53cb79b1e9 |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrwb: Change a C++ style cast into a C style cast"
|
| f27422a71112e77af77de0da2e60d4deb94a9375 |
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
edia/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp
edia/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp
edia/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
|
| fbaf72b701316c8050d73690ff387e62f724f216 |
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
|
| 7c7674ea2d7ba099b5afd3badf4d69da55b377dd |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Simplify the definition of __inline"
|
| e98a953903240da9e5118594b6e4f454dcd2c123 |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrwbenc: Remove a useless check"
|
| 7d8e0f1ae48058ac1613272fd66e4d8335adbb93 |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Remove a stray semicolon"
|
| a4999a9f0fb1a5690d967c08c7c6216221bc028a |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrwb: Make a global const array static"
|
| d78b7149dd619c73b1160ba68a7e05ffdd50cb0c |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrwbenc: Change keyword ordering"
|
| 5b9c33c7239c996135c0021ec9a0d9afedd81a78 |
27-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
|
| e628d515888baadba75442128678e747e930ed58 |
27-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Make threadLoop() logs identical"
|
| d3cee0b1f77baa4fb7a049eb757e9f5006890726 |
27-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Move declaration of mixerStatus to inner block"
|
| 3254b25e8b0f674ccc2226609e01dd86a600802e |
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
nclude/media/stagefright/timedtext/TimedTextDriver.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/timedtext/Android.mk
edia/libstagefright/timedtext/TimedTextDriver.cpp
edia/libstagefright/timedtext/TimedTextDriver.h
edia/libstagefright/timedtext/TimedTextPlayer.cpp
|
| 90b6191067990a7a3ee947d7ce08c64f780f0de7 |
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
fix location of libgui headers
Change-Id: I0d203f4e7aa83e0449f7ebb9f3cafe021e38fc2f
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 1843df5b4f8f8f8394a96bcaeb5836d720ae9cf5 |
25-Feb-2012 |
Mathias Agopian <mathias@google.com> |
Merge "remove dependency on android_native{s_priv|buffer}.h"
|
| 9eeafeb52fecf90882e9b44eeefcb7c3e16aa915 |
25-Feb-2012 |
Mathias Agopian <mathias@google.com> |
remove dependency on android_native{s_priv|buffer}.h
Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
nclude/media/stagefright/HardwareAPI.h
nclude/private/ui/android_natives_priv.h
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/SoftwareRenderer.h
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| ff63ae394b51682f5d36f3413c8f9d7367b8412e |
25-Feb-2012 |
Mathias Agopian <mathias@google.com> |
remove dependency on android_native_buffer.h
Change-Id: I720d5e6ac7e4455d7ab59eab7e9c2478b911228a
ibvideoeditor/lvpp/PreviewRenderer.h
|
| a3b09254d44cd8d66ec947abe547538c4cfeaa89 |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Simplify removeNotificationClient
No need to check for presence of item before removing
(but we do lose the log of the previous value).
Change-Id: I2838430824de5f257f2ee15db0c22b1920c67d08
ervices/audioflinger/AudioFlinger.cpp
|
| 02fe1bf923bbe5789202dbd5810e2c04794562e6 |
25-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger const methods and parameters
Change-Id: I93ec28024005ed23aa141518092a012a4a7c44c5
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| c0b52836d07f823732f0ff98ca5ca9d7f5730cb8 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Make threadLoop() logs identical
Change the wording of the logs in the various copies of threadLoop()
to be identical. This will make it easier to merge them soon.
Change-Id: Idfa181e437738712c784dc7f746cac79f83d2931
ervices/audioflinger/AudioFlinger.cpp
|
| 5d4eeeaf76ebe177b43e87b2a9df5e55e39021f0 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Move declaration of mixerStatus to inner block
mixerStatus was being declared (and initialized) too early,
which also resulted in a duplicate initialization. Moved
the declaration into the block where it is actually used.
Change-Id: Ifdcfefe362a5efe3493dd616cdb44645c6f9aed5
ervices/audioflinger/AudioFlinger.cpp
|
| 37d825e72a6c606553a745da1212590a425996d3 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Pull out duplicated copies of silent mode check
Also fix the error handling for the property_get.
This is part of preparation for the threadLoop() merge.
Change-Id: I6405190ea18146d1271575e1dfe9f279e8f36b17
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 04743e99e71c0da012508c7119f414027654ee94 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Unlock effect chains in the middle of two if's
As part of the upcoming threadLoop() merge, this CL makes it clearer
what are the similar and different parts before and after unlocking
effect chains.
In each threadLoop(), the old code was:
if (sleepTime == 0) {
// A
unlockEffectChains(effectChains);
// B
} else {
unlockEffectChains(effectChains);
// C
}
The new code is:
if (sleepTime == 0) {
// A
}
unlockEffectChains(effectChains);
if (sleepTime == 0) {
// B
} else {
// C
}
Also this is slightly slower by one "if", it has the advantage of making
it much more obvious about what is done before and after the unlock,
and also to see the similarities and differences among the various
copies of threadLoop().
Change-Id: I7bf4369d2dcb072573ec43b7e52c637f0097dc00
ervices/audioflinger/AudioFlinger.cpp
|
| 5ce96d97feafc6989f6141bb2633eae3d87ddf28 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Pull CPU statistics code out of threadLoop()"
|
| b6b740629c9f11535086e744465bada03f26df11 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Fix theoretical race condition in addOutputTrack
This is not a real race, because addOutputTrack was only called in two
places, and in both places there could be no other threads referencing
the DuplicatingThread instance.
Those two places are:
- the DuplicatingThread constructor, which is of course safe
- openDuplicateOutput - this is safe because it's called immediately
after the new DuplicatingThread, and there are no sp<> either in the
constructor or here which could cause onFirstRef() to do Thread::run().
But for safety in case addOutputTrack is ever called somewhere else,
or there are sp<> created earlier, it is safer to take the thread lock.
Change-Id: I1502d014fa37ec5dbf4bf40d3e2884af311cd5e9
ervices/audioflinger/AudioFlinger.cpp
|
| 7fb5e8832f582ec515550696e9dabc3a8d9de14d |
24-Feb-2012 |
Andreas Huber <andih@google.com> |
Merge "Make sure we return input/output buffers to the codec not just while"
|
| 7348f1e937c249b221c7ce9edf241e898d37f190 |
24-Feb-2012 |
Andreas Huber <andih@google.com> |
Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm"
|
| 8b2a453ab6698eae4560389c6e8f6ecab2643218 |
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
edia/libstagefright/MediaCodec.cpp
|
| 83efdd0fc08cd5aedf50b45741a8a87be8dc4b41 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Pull CPU statistics code out of threadLoop()
This is to prepare for the threadLoop() merge
Change-Id: I118c7d5c6b011b5d5b95ec7d63fb03feb166a9cf
ervices/audioflinger/AudioFlinger.cpp
|
| bf6c85a013fb14960bac147c1ffd0a02a8d5f148 |
24-Feb-2012 |
Andreas Huber <andih@google.com> |
Fix two more locations that use the old setObject("buffer", ...) paradigm
that I'd previously missed.
Change-Id: Ifbdbfb94d1bc1cbe8c0a403fed05ce99fca8397b
mds/stagefright/codec.cpp
mds/stagefright/sf2.cpp
|
| 01c4ebf6b794493898114a502ed36de13137f7e5 |
22-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
AudioBufferProvider comments and cleanup
Add comments about which methods implement the AudioBufferProvider interface.
Simplified the definition of kInvalidPts. <stdint.h> is very hard to work
with, there seems to be no way to use it reliably to get INT64_MAX without
having a separate source file, which is ugly because it means kInvalidPts
is not a compile-time constant. So I just deleted AudioBufferProvider.cpp
and used a hard-coded constant instead.
Added a default constructor for Buffer so that the fields aren't random
(especially .raw which is used to determine if the buffer is valid).
Make the pts for getNextBuffer default to kInvalidPTS so code that
doesn't need a pts doesn't have to specify a value.
Rename the parameter to AudioMixer::setBufferProvider to make it clearer.
Change-Id: I87e7290884d4ed975b019f62d1ab6ae2bc5065a5
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.cpp
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
|
| 8abf44d2f2bcd20a2835570efe89d89c19db426a |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Fix tracking of hardware state for dump
At end of AudioFlinger::onFirstRef(), the hardware status was being left
in wrong state. It should be AUDIO_HW_IDLE but was AUDIO_HW_INIT.
mHardwareStatus was being set to AUDIO_HW_OUTPUT_OPEN too early, and so
a return would leave it in the wrong state until next hardware operation.
Take the hardware lock for dev->get_parameters, and update mHardwareStatus
before and after.
Keep hardware lock only for the duration of the dev->set_parameters.
Rename two constants in enum hardware_call_state to have the prefix
AUDIO_HW so they follow the naming conventions.
Add comments.
Change-Id: I6c7450b11f9b13adaeef9cec874333e478a58fc0
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 8d9cbfd83350c1bb1e780460fbdae2028fe65a28 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove TrackBase::mFlags"
|
| 5cf034d92d901169ca6e36c90475f40715827fcd |
21-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Remove TrackBase::mFlags
The bit-field TrackBase::mFlags was supposed to have track-specific
flags in the upper 16 bits, and system flags in the lower 16 bits.
The upper 16 bits of mFlags were initialized in the TrackBase
constructor from the flags parameter of IAudioFlinger::createTrack()
and IAudioFlinger::openRecord(), and the lower 16 bits were cleared.
However, the upper 16 bits of mFlags were never acccessed again.
So really there are no track-specific flags. I left the flags
in the parameter list of createTrack() and openRecord() but made a
note that these should be removed eventually as they are dead.
This leaves only the one system flag "step server failed". I replaced
the bit-field mFlags by bool mStepServerFailed, which is simpler and
slightly faster.
Change-Id: I6650f5487be72791b4a67d73adcd10ffa04e2aa5
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 1ead790eadd0e09a118308caccc7ac37d36f43f3 |
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
edia/libstagefright/codecs/amrnb/common/src/bitno_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/bytesused.cpp
edia/libstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/gray_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/grid_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/log2_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/overflow_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/window_tab.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp
edia/libstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp
|
| d95a8462c367a7bea1b4aee24917d3e9ed7e2a48 |
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
edia/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/grid_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/log2_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/window_tab.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp
|
| 93eec2bc24e3782420d76df52586c84a03669087 |
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
edia/libstagefright/codecs/amrnb/common/include/az_lsp.h
edia/libstagefright/codecs/amrnb/common/include/inv_sqrt.h
edia/libstagefright/codecs/amrnb/common/include/log2_norm.h
edia/libstagefright/codecs/amrnb/common/include/pow2.h
edia/libstagefright/codecs/amrnb/common/include/sqrt_l.h
|
| 034816f92436de28071652d88975a5fcef317acd |
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
edia/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
|
| 46f715e1150b02b00b16620f92a84c74aba43b47 |
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
edia/libstagefright/codecs/amrwb/src/homing_amr_wb_dec.cpp
edia/libstagefright/codecs/amrwb/src/isp_isf.cpp
edia/libstagefright/codecs/amrwb/src/phase_dispersion.cpp
|
| ffa34edd0fd50d558f9bc7a650d959b4d3d29123 |
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
edia/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
|
| 417c27304c67057779693007a7bc08e4dd80c262 |
24-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Fix typos and line length in AudioRecord comments
Change-Id: I85cfb9a2b9b3ade098161aa7687b4d4f7eb226ea
nclude/media/AudioRecord.h
|
| 1e07b508b4f9d5031e17cde7701ad656824816f1 |
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
|
| 9a2af4508c27affc0e4a7440f8e5694ec3f0bec6 |
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
|
| 338b9c9020ca6be98f30670cf307ad8553f1b4c9 |
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
edia/libstagefright/codecs/aacenc/src/qc_main.c
|
| 8a3b3707a6e320ba75f4ecd47fdc001f16c15cb8 |
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
edia/libstagefright/codecs/aacenc/src/transform.c
|
| b0238c30a22778bdb4ac7c86a1eb65e50e32f2ec |
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
edia/libstagefright/codecs/amrwbenc/inc/isp_isf.tab
|
| c4ef4bb50d1407aec63358d4c14d1007ae0c4c1d |
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
edia/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
|
| fc237e5453333c3e0a31da3562f26ca8639d7951 |
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
|
| 837b1e098a3b321bf1b19f22189d8c8bcdd509a6 |
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
|
| b86b3c8f976b70635770d93217132d4023ecf33f |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
|
| 5b823b4cca17de5249fbbd774541c69b970e8da8 |
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
|
| 391906630443d7bd1d3a34e34535d93113723316 |
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
|
| c6a8eec53535fcb074989b5966baec48628a6f94 |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Fix an inline asm constraint"
|
| dab48426d9b2becf45bef409f607045f066d6f72 |
24-Feb-2012 |
Andreas Huber <andih@google.com> |
Merge "Small fix to MediaCodec"
|
| de8b924a7f7d104af4243b1dfaef6f4480f93eea |
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
|
| a118abebce9aa2bdd8fa4a7251875c5049082434 |
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
|
| 90b8ca7c29d75a265faaa9386d556d41ca5be538 |
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
|
| d38faa28eb767a108a7a9467c1a481957531d2af |
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
|
| 80d4b8903ed09d2cf9ac35391f04eb8619f47a1e |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Zero-initialize a struct"
|
| 142ce9a65b7505819e1205ad5bfa5d63843c7f43 |
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
|
| b20a352b7e4eb6690e86e0dcf9d58d73640dc874 |
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
|
| 9884ee5920da4976a4de809567ad8fcbe8608433 |
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
|
| ccdf9e6e3dc929a9ffee7ed2aab57115ef810527 |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
|
| 042d1b44537eeb3ead09778f4284a35be9e9f5d3 |
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
|
| 0db280176bd3277e3256252d063f3712b1905ba9 |
24-Feb-2012 |
Andreas Huber <andih@google.com> |
Small fix to MediaCodec
Change-Id: I6bcbfd35fdf5a2b0260b8f07a630a5b380e139a0
edia/libstagefright/MediaCodec.cpp
|
| aa1639aeb42e7c403315319bf55632de93d3c8d9 |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Add const declarations to some pointers"
|
| db7670ab7a884efb64f0e7a20425b6445d749822 |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
|
| 3e4d4efcaf00c8263c7bcd651e453e93b60535da |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Fix inline asm"
|
| 54263bcfa6e9ad2fcb3e89617240f4ec0b3a2f99 |
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
|
| 7ce8b8c79c866fd787f3b4628abf5028207312e6 |
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
|
| 6dfeab4ddf3fcb82483f29d146329aa959fc0c82 |
24-Feb-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Fix inline asm constraints"
|
| afc08acfae7946ab3305feede3a96bc6441be75f |
24-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Changed TimedTextInBandSource to TimedText3GPPSource."
|
| 04394b1c83d56e2956ba84aa9cb4b5d3b01d8ae8 |
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
edia/libstagefright/OMXClient.cpp
|
| 68f0945a72378e777276a90c1c31c39b470ca9f9 |
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
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| e98f8c04faf27df3b1829d336299ad51dad569cf |
23-Feb-2012 |
Andreas Huber <andih@google.com> |
Be more greedy when it comes to gathering input and output buffers.
Change-Id: I54c4f608e5155917ca35eba5655b4c06357fb112
mds/stagefright/SimplePlayer.cpp
mds/stagefright/codec.cpp
|
| 4f898a911e26ad8bb667ef390c41247dbe87da46 |
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
nclude/media/IMediaPlayer.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 16d3dfb5710290b334a07aadeb7d3620c7624e7c |
23-Feb-2012 |
Andreas Huber <andih@google.com> |
Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass"
|
| 7fd1703162a6ff694b03f6fd0a8c9f3525f6d9a4 |
23-Feb-2012 |
Steve Block <steveblock@google.com> |
Merge "Drop support for Android HTTP stack"
|
| 25eefbedf4b0ba6aea38605f4ba19c75a40810d1 |
23-Feb-2012 |
Insun Kang <insun@google.com> |
Changed TimedTextInBandSource to TimedText3GPPSource.
Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
edia/libstagefright/timedtext/Android.mk
edia/libstagefright/timedtext/TimedText3GPPSource.cpp
edia/libstagefright/timedtext/TimedText3GPPSource.h
edia/libstagefright/timedtext/TimedTextInBandSource.cpp
edia/libstagefright/timedtext/TimedTextInBandSource.h
edia/libstagefright/timedtext/TimedTextSource.cpp
|
| 2d8bedd05437b6fccdbc6bf70f673ffd86744d59 |
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
mds/stagefright/SimplePlayer.cpp
nclude/media/stagefright/foundation/AMessage.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/MPEG2TSWriter.cpp
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/foundation/AMessage.cpp
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/AAVCAssembler.cpp
edia/libstagefright/rtsp/AH263Assembler.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARawAudioAssembler.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 79af02c6a813b5d31fba3e7b72686a02f0ae7e0f |
23-Feb-2012 |
Andreas Huber <andih@google.com> |
Merge "Implementation of a java media codec interface and associated tools."
|
| 5778822d86b0337407514b9372562b86edfa91cd |
21-Feb-2012 |
Andreas Huber <andih@google.com> |
Implementation of a java media codec interface and associated tools.
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
mds/stagefright/Android.mk
mds/stagefright/SimplePlayer.cpp
mds/stagefright/SimplePlayer.h
mds/stagefright/codec.cpp
mds/stagefright/sf2.cpp
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MediaCodec.h
nclude/media/stagefright/MediaErrors.h
nclude/media/stagefright/NativeWindowWrapper.h
nclude/media/stagefright/NuMediaExtractor.h
nclude/media/stagefright/foundation/AMessage.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/Android.mk
edia/libstagefright/MediaCodec.cpp
edia/libstagefright/NuMediaExtractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/foundation/AMessage.cpp
|
| d6fd85a157ce2054b2304e6d171fa87ae09c363d |
22-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Avoid wp<>::unsafe_get() with a few exceptions"
|
| 9eaa55756c5b245970447019250ce852f5189525 |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Avoid wp<>::unsafe_get() with a few exceptions
Avoid using wp<>::unsafe_get() except in a log, and other specific cases
when it's known to be safe.
Use more specific subclass types for parameters to avoid down-casts.
When a constructor or method parameter is "this" of an object that is
currently being constructed, it's better to use a raw pointer rather
than either sp<> or wp<>.
Using the raw pointer is safe, provided either:
- it is "this" of an object being constructed (which has sp<> refcount of 0),
- or the caller already holds an sp<>
The raw pointer is simpler and faster, and it avoids the problem of the
sp<> reference count being incremented and then decremented to zero on
scope exit, which would cause the object's destructor to run while the
object is still being constructed.
Also removed some dead code per a review comment.
Change-Id: I7375f64da3aec11b928c33cb01faff186252ef5e
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 42539cb5d02f0cbaedba2de6ad6be42a0d7a9a9a |
22-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix build warning"
|
| f063b49e95c28d63a58215ebda892a5fee4204cc |
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
edia/libmedia/AudioEffect.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 2e77ad2a9f7afb57b6f9127dd7c229e774baa9c8 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 43b1d8ad30bcd61c8cc62fce52fdc6d8381e5732 |
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
edia/libstagefright/Android.mk
|
| a1152ccc094ade5809aa5f48140fe6d1252c6c54 |
19-Feb-2012 |
John Grossman <johngro@google.com> |
LibAAH_RTP: Add support for AAC in MP4.
Change-Id: Ie8298eb9d253fc6ede448da87660a60d23170987
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
|
| c33305c5dd4cc06e71eb0c66a7150aa6ab647c99 |
21-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Limit the amount of audio record data in each buffer"
|
| b9c769aa8ec26e25a7a61e14a9d521c2adf5b68d |
17-Feb-2012 |
Steve Block <steveblock@google.com> |
Update stagefright makefile after dropping support for JSC
Bug: 5495373
Change-Id: Ibb81196edd3a6eaa4999cf0e30a78368afb66360
edia/libstagefright/Android.mk
|
| dcdfc1ad27cb64bcb51a864b020b846ba22ce2a7 |
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
edia/libstagefright/codecs/aacenc/src/adj_thr.c
|
| 01e29ede19cd7d85bfef38896de8e71e569cd211 |
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
edia/libstagefright/codecs/aacenc/src/adj_thr.c
|
| 76533e94500e5d221ec4a1a5d9c97ea3d75860e4 |
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
edia/libeffects/preprocessing/PreProcessing.cpp
|
| 3b81acab52b7140c1b8b20be2d67be3e221637e7 |
28-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Remove bit fields to improve performance
uint16_t enabled is (mostly) changed to bool in a separate CL
Change-Id: Ied9f8c034b2479cee9a8778cee7b8ff92ae75b7b
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 1b094ee8f7fe7eca65bf3d2f983ba95eef6db93d |
17-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Simplify code"
|
| a111792f1314479c649d1d44c30c2caf70c00c2a |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Simplify code
Use DefaultKeyedVector::valueFor to avoid extra test
Make local variables as local as possible
No double parentheses
No typedef for single use
No parentheses around indirect function call
No AudioFlinger:: prefix when not needed
Remove unnecessary casts
Remove block with only one line
Saves 128 bytes
Change-Id: I3a87430eeb01b81e7b81a1c38f6fdd3274ec48f3
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioPolicyService.cpp
|
| 29dcfcd66d884801e9907d04e81d407ee770802c |
17-Feb-2012 |
Mike Lockwood <lockwood@google.com> |
Merge "Put a bandaid on a segfault in timed audio track handling."
|
| fe5b3ba4b332d5fc9aa4f453434329b9f38768c2 |
13-Feb-2012 |
John Grossman <johngro@google.com> |
Put a bandaid on a segfault in timed audio track handling.
Add a bandaid to prevent a segfault which can occur while handling
timed audio buffers. There is a deeper problem which should
eventually be addressed, but for now this fix should prevent any
crashing.
The deeper problem is as follows.
When the AudioFlinger mixer gets data to mix from an AudioTrack, it
ends up getting a structure filled out which points into an IMemory
region owned by the AudioTrack. Unfortunately, this structure is not
holding a refcount on the IMemory which it points into. If the
IMemory refcount hits 0 and the chunk of RAM is retuned to the binder
heap it came from, there can still be a Buffer object being held by
the AudioFlinger mixer which points into the region of memory which
was retuned to the binfer heap. If AF reads from this buffer, it
could read corrupt data (if the region of memory gets handed back out
to a writer), or it could segfault (if the heap has been freed and the
pages unmapped). Similar problems could happen if AF attempts to
write to the buffer, heap corruption in one case, segfaulting in the
other.
In the past, this has not been an issue for AF, because tracks
allocate a single IMemory (which serves as a ring buffer) and the
IMemory lives for as long as the track lives. As an artifact of the
way the code came out, the mixer cannot be holding a Buffer structure
pointing into the IMemory which used to be owned by a track if the
track no longer exists. Tracks cannot come into or out of existence
during a mix operation, which is the only thing which makes this safe.
TimedTracks work differently, however. Timed tracks each allocate a
small binder heap, and then hand out IMemory instances broken out of
this heap. The heap lives as long as the track, so the worst which
could happen here is that a TimedTrack's IMemory gets returned to the
heap while there is still a buffer structure in flight pointing into
the memory region, then the region gets handed out again and
overwritten by new data causing the mixer to mix the wrong audio. The
timing to cause this to happen is very difficult to encounter, and you
to generate the timing conditions required, you need to be in a pretty
bad failure state where audio is already breaking up and skipping, so
its unlikely that anyone would notice (which is why I'm band-aiding
the segfault and letting the deeper issue slide for now).
In general, however, it might be a good idea to revisit this buffering
design. On principal, if someone is going to hold pointers into a
refcounted object, they should be holding a ref on the object at the
same time. Failure to do this will usually lead to a situation where
there are corruption or segfault issues, or to a system where the
refcounted object's lifetime must be implicitly managed very carefully
in ways which are usually non-obvious and are easy to break by new
engineers on a project.
Change-Id: Ib391075395ed0ef46a03c37aa38a82d09e88abeb
ervices/audioflinger/AudioFlinger.cpp
|
| 9fda4b87441fe17d90d8144639c9de6d9022c3c0 |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Fixed possible heap corruption in EffectDesc
"EffectDesc *effect = new EffectDesc(*effects[i]);" was relying on the
default copy constructor for EffectDesc, but the default copy constructor
does a member-by-member copy. This works OK for mUuid, but a member
copy of mName and mParams shares pointers. This could result in heap
corruption later on due to a double free. Changed to add an explicit
copy constructor that does a deep copy of both mName and mParams.
A malloc() and strdup() were being freed by delete, but the correct
matching API for these is free(). Fortunately our current memory runtime
implementation ignores the difference. Changed to use free().
EffectDesc and InputSourceDesc member fields were being torn down by
the code that does delete. Changed to do the tear-down in ~EffectDesc()
and ~InputSourceDesc().
Added constructor EffectDesc() with name and UUID parameters, rather
than having caller fill in the object after construction.
Made ~EffectDesc() and ~InputSourceDesc() non-virtual to save memory,
since they have no subclasses.
Change-Id: Ibb5cc2e6760d72e0c4cf537068ac4432c717bafd
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 761defc341c5ce9019a42919c441f035f665ec0d |
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>
nclude/media/MediaPlayerInterface.h
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
edia/libaah_rtp/pipe_event.cpp
edia/libaah_rtp/pipe_event.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| ef7740be67a4d7b6b033ebed59c3d4a9c74a2c18 |
09-Feb-2012 |
John Grossman <johngro@google.com> |
Fix a segfault in AudioFlinger.
Check the string returned by a HAL's implementation of get_parameters
for NULL before attempting to make use of it. That way, we won't
bring down the mediaserver because of a poorly written HAL.
Change-Id: Ic99d7b004520d7d6347842a681c0595e889b68ea
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
|
| af7d8189f91c45ab919a6c9ac386b268c8d91168 |
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>
edia/libmedia/AudioEffect.cpp
edia/libmedia/IEffect.cpp
edia/libmedia/Visualizer.cpp
|
| 4ff14bae91075eb274eb1c2975982358946e7e63 |
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>
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioTrack.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioTrack.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.cpp
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/audioflinger/AudioResamplerSinc.cpp
|
| 951bd8d1ad9581a414e171ad8605a9515d0ad667 |
15-Aug-2011 |
Mike J. Chen <mjchen@google.com> |
Upintegrate the common_time service from ics-aah.
Move the common_time service developed in the ics-aah branch back into
master.
The common_time service is a small service build to synchronize an
arbitrary timeline amongst peers on a local sub-net. While running
and configured, the service will elect a master from the set of
available devices within the subnet, define a relationship between the
common_time timeline the local time timeline (provided by the local
time HAL), and then attempt to maintain synchronization between common
and local time by controlling the frequency of the local time clock
via the HAL, or by disciplining local time in the digital domain if
the local time HAL implementation does not support HW slewing.
On its own, the native common time service will do nothing until it is
configured. The CommonTimeManagementService (running out of the
system server process) is responsible for implementing policy
regarding configuration and operation of the common_time service and
will be added in a subsequent CL.
Change-Id: I71292f9b9b1797665865689c4572c9d3a0552f64
Signed-off-by: John Grossman <johngro@google.com>
nclude/common_time/ICommonClock.h
nclude/common_time/ICommonTimeConfig.h
nclude/common_time/cc_helper.h
nclude/common_time/local_clock.h
edia/common_time/Android.mk
edia/common_time/ICommonClock.cpp
edia/common_time/ICommonTimeConfig.cpp
edia/common_time/cc_helper.cpp
edia/common_time/local_clock.cpp
edia/common_time/utils.cpp
edia/common_time/utils.h
|
| b575ddce78d266fa218006f90306158dda5c8f56 |
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
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AudioSource.cpp
|
| dce4161f7d4d39498f69591e876f5fecdde95833 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 6dad4378f2a78d967defc8912ecf47f6ed117584 |
14-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix races related to volume and mute"
|
| d9b9b8d09e7471b0ffa21cfa9f944ef4ad300a71 |
14-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Update comments"
|
| 99e53b86eebb605b70dd7591b89bf61a9414ed0e |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Update comments
We no longer put the filename at start of file.
Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/EffectsFactoryApi.h
nclude/media/IAudioTrack.h
nclude/media/MemoryLeakTrackUtil.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediaplayer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| ed15977476a3d53103866e6d527fa3fb65d4166c |
14-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead code AudioTrack::getLoop"
|
| 8d6a2449a91f5116d7243ab039393195ebd663fe |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Use size_t and ssize_t with Vector
Use size_t with size() and ssize_t with indexOfKey(). Exception:
use ssize_t for backwards loops, and indices that are overloaded as a
marker or error code.
Change-Id: Ibf2a360af4539b72b09c818dda22ea2a0de92431
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 6dbc1359f778575d09d6da722b060a6d72c2e7c5 |
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
nclude/media/AudioRecord.h
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 7a8b0ed6419e57dd8b41d3806893d63d3df91aab |
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
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
nclude/media/stagefright/AudioPlayer.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
|
| 1f5ce8b0941c9c6baadd40d151634145f6d5a35c |
13-Feb-2012 |
Eric Laurent <elaurent@google.com> |
Merge "Fix audio preprocessing library wrapper"
|
| 44deb053252a3bd2f57a007ab9560f4924f62394 |
06-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Factor out and speed up permission-checking code
Use the caching permission check for dump to save IPC.
Cache getpid() to save kernel call for other permission checks.
The C runtime library getpid() can't cache due to a fork
race condition, but we know that mediaserver doesn't fork.
Don't construct String16 on the stack.
Change-Id: I6be6161dae5155d39ba6ed6228e7683e67be34ed
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/ServiceUtilities.cpp
ervices/audioflinger/ServiceUtilities.h
|
| 428975efd7c4f22f430410b32b3026ecd961d1bd |
13-Feb-2012 |
John Grossman <johngro@google.com> |
Put a bandaid on a segfault in timed audio track handling.
Add a bandaid to prevent a segfault which can occur while handling
timed audio buffers. There is a deeper problem which should
eventually be addressed, but for now this fix should prevent any
crashing.
The deeper problem is as follows.
When the AudioFlinger mixer gets data to mix from an AudioTrack, it
ends up getting a structure filled out which points into an IMemory
region owned by the AudioTrack. Unfortunately, this structure is not
holding a refcount on the IMemory which it points into. If the
IMemory refcount hits 0 and the chunk of RAM is retuned to the binder
heap it came from, there can still be a Buffer object being held by
the AudioFlinger mixer which points into the region of memory which
was retuned to the binfer heap. If AF reads from this buffer, it
could read corrupt data (if the region of memory gets handed back out
to a writer), or it could segfault (if the heap has been freed and the
pages unmapped). Similar problems could happen if AF attempts to
write to the buffer, heap corruption in one case, segfaulting in the
other.
In the past, this has not been an issue for AF, because tracks
allocate a single IMemory (which serves as a ring buffer) and the
IMemory lives for as long as the track lives. As an artifact of the
way the code came out, the mixer cannot be holding a Buffer structure
pointing into the IMemory which used to be owned by a track if the
track no longer exists. Tracks cannot come into or out of existence
during a mix operation, which is the only thing which makes this safe.
TimedTracks work differently, however. Timed tracks each allocate a
small binder heap, and then hand out IMemory instances broken out of
this heap. The heap lives as long as the track, so the worst which
could happen here is that a TimedTrack's IMemory gets returned to the
heap while there is still a buffer structure in flight pointing into
the memory region, then the region gets handed out again and
overwritten by new data causing the mixer to mix the wrong audio. The
timing to cause this to happen is very difficult to encounter, and you
to generate the timing conditions required, you need to be in a pretty
bad failure state where audio is already breaking up and skipping, so
its unlikely that anyone would notice (which is why I'm band-aiding
the segfault and letting the deeper issue slide for now).
In general, however, it might be a good idea to revisit this buffering
design. On principal, if someone is going to hold pointers into a
refcounted object, they should be holding a ref on the object at the
same time. Failure to do this will usually lead to a situation where
there are corruption or segfault issues, or to a system where the
refcounted object's lifetime must be implicitly managed very carefully
in ways which are usually non-obvious and are easy to break by new
engineers on a project.
Change-Id: Ib391075395ed0ef46a03c37aa38a82d09e88abeb
ervices/audioflinger/AudioFlinger.cpp
|
| 860936d780d98a5968f40e66ca6ae800c67adbc3 |
11-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Change the signature of method addTextSource() in AwesomePlayer"
|
| 2b213bc220768d2b984239511cd4554a96bc0079 |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
mAudioHwDevs and related cleanup
Inline AudioFlinger::initCheck and remove unnecessary lock.
Remove redundant check of mAudioHwDevs.size().
No need to lock mHardwareLock for each device separately
during initialization.
Use size_t not int to loop through Vector, since size() returns size_t.
Add missing hardware lock for get_mic_mute() and get_input_buffer_size().
Add comments.
Change-Id: Iafae78ef78bbf65f703d99fcc27c2f4ff221aedc
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| b6333aa8317ce5162ab006c4baed6b0890936dc7 |
11-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Simplify ThreadBase::exit() aka requestExitAndWait"
|
| 3a144d08b713e3c0f6b7b8e95bc42cef5886f4fa |
11-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Disable HQ resamplers for now until qualified"
|
| 0d9302d7830b46542821b3e5f3e4f96942bd3cb3 |
11-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Move header declarations around for clarity"
|
| 858df80948ee64f478782a6a6c06533ba1651ef1 |
11-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Camel case readability & private disconnect(bool)"
|
| 95a87908ddf240760e8e8b35a6cafcc149c7f33f |
11-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove aliasing"
|
| c8ad36bbb30e99e49026cba78e5e0f83db5cb0f6 |
11-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use mul from audioutils"
|
| 31f0acff69efd46897221d847becca79ab15105f |
11-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Mark fields const if only set in constructor"
|
| b28686f95daee16edeb5f39af2cd5274ac3dc99f |
06-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Simplify ThreadBase::exit() aka requestExitAndWait
We can remove mExiting and use Thread::exitPending() instead.
The local sp<> on "this" in exit() is not needed, since the caller must
also hold an sp<> in order to be calling us. (Unless it was using a raw
pointer, but that would be dangerous for other reasons.)
Add comment explaining the mLock in exit().
Change-Id: I319e5107533a1a7cdbd13c292685f3e2be60f6c4
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 9f1d4448050a4df7118c90c0c0d3e6f9c4b82f3b |
10-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Move away from MediaDebug and use ADebug instead"
|
| 9d1f02d74fd395ec4de6861147da289423f0ab6f |
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
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/ToneGenerator.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 7719f633bd8747b2f56c7be0f102ff131c074c2e |
10-Feb-2012 |
John Grossman <johngro@google.com> |
Update method sigs.
Update the getNextBuffer signatures to have an additional (but
ignorable) parameter used to implement timed audio output.
Change-Id: Icb98e4af4d136c234ae8c5cbb4a5de4350b436bb
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| 0ba18ec1b343a8de70924f87630dd1f329b00fe6 |
10-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "No newline or space at end of ALOG format string"
|
| 12018d80add66f5558675614d73fa6549150806e |
10-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Move declaration of stream_type_t up earlier"
|
| 8b5980798ca06e57b1284e6e23fa220e1207bf41 |
10-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix typos in ALOG for pid vs tid"
|
| 5a4b1aaee6109252e268b1e5d0c15b59e21ce993 |
10-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Rename type() to streamType()"
|
| f1d5aa162c02a16b7195a43a9bcea4d592600ac4 |
07-Feb-2012 |
James Dong <jdong@google.com> |
Move away from MediaDebug and use ADebug instead
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
mds/stagefright/Android.mk
mds/stagefright/SineSource.cpp
mds/stagefright/audioloop.cpp
mds/stagefright/record.cpp
mds/stagefright/recordvideo.cpp
nclude/media/stagefright/MediaDebug.h
edia/libmedia/MediaProfiles.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AACExtractor.cpp
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/JPEGSource.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/MediaBufferGroup.cpp
edia/libstagefright/MediaSourceSplitter.cpp
edia/libstagefright/MetaData.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/ThrottledSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/VideoSourceDownSampler.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/colorconversion/ColorConverter.cpp
edia/libstagefright/id3/Android.mk
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/id3/testid3.cpp
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXComponentBase.cpp
edia/libstagefright/omx/OMXMaster.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/tests/Android.mk
edia/libstagefright/omx/tests/OMXHarness.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
edia/libstagefright/timedtext/TimedTextInBandSource.cpp
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/yuv/YUVCanvas.cpp
edia/libstagefright/yuv/YUVImage.cpp
|
| 49f000409c48afd40366baef2e8fc8ea838b782f |
10-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Move away from MediaDebug and use ADebug instead"
|
| cdf2158f3b9498d6cd0eb228d8bee16e32399e16 |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Disable HQ resamplers for now until qualified
This saves about 6500 bytes.
Change-Id: I87102fe561c95c19c9e615dea3de914f96639257
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioResampler.cpp
|
| 7c5b72c1ea1a7a8ec40c1364e5e32043799c811f |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 2f732eb768004c6362fae8a02c60b69c9400b032 |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Move header declarations around for clarity
Put IAudioFlinger methods in binder opcode order.
Move hardware call state closer to where it is used.
getMode() and btNrecIsOff() are private.
Change-Id: Ie50340b396c39c763f2b155cbc08da8a0d0f2424
ervices/audioflinger/AudioFlinger.h
|
| ff65330bfdd2841110d8ff2a1aba3543b2cb3156 |
10-Feb-2012 |
James Dong <jdong@google.com> |
Fix green frame issue
When the transition clip is generated: two clips in general are involved.
The second clip was assigned the incorrect effect number when a transition was coupled with a color effect
o patch contributed by Hong Teng <hongteng@nxp.com>
o related-to-bug: 5713461
Change-Id: I61b497620264692b331da8b8e7753240edc5d1aa
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| 004f719467c498942c40de9f260be601ee45e630 |
30-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Mark fields const if only set in constructor
Change-Id: Iacd06bb9efaf708cf965033be1f2297b58f7f75c
ervices/audioflinger/AudioResampler.h
|
| d198b61603d5fa9298edea4ddb5852ea45159906 |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Remove aliasing
Code was aliasing mBuffer as buffer, but continuing to use both buffer
and mBuffer after that point. This was at best misleading, and at worst
could confuse the compiler into generating bad code. There was no
performance advantage to the alias, in fact removing it saves 16 bytes.
Change-Id: I55023ddba465d9be82f66745b088d18af658ac60
ervices/audioflinger/AudioResamplerSinc.cpp
|
| 58123c3a8b5f34f9d1f70264a3c568ed90288501 |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Camel case readability & private disconnect(bool)
Change-Id: If66516ed2703e048c5e6ccc6cd431446a024f4a1
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 5b9ff43995f6a6b819d9ad37dd8cdc5ad4a088d7 |
09-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Use mul from audioutils
I verified that the disassembled output is identical.
Change-Id: I34a76f0842ebc4aef2c923e079e38d0bc1f98b5c
ervices/audioflinger/AudioFlinger.cpp
|
| 23d82a9bc9a43b49ba684ba40875b91db310d3b9 |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Fix typos in ALOG for pid vs tid
Change-Id: I6dc70f137d0ff8a86427ab8882a81886e1de0782
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 43089daaf82bd2b8e5f9a29b80af5abaae4657b3 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 5ec58d925520e6913fba3fc54413881af751c610 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 45e9efb9f75f85be6b8b03c130bc5c9e1080f7a6 |
09-Feb-2012 |
John Grossman <johngro@google.com> |
Fix a segfault in AudioFlinger.
Check the string returned by a HAL's implementation of get_parameters
for NULL before attempting to make use of it. That way, we won't
bring down the mediaserver because of a poorly written HAL.
Change-Id: I45f0fd3de003151f98acf32c36c42f58d053f3a0
ervices/audioflinger/AudioFlinger.cpp
|
| 90bebef5669a9385c706b042d146a31dca2e5d9b |
28-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
No newline or space at end of ALOG format string
Change-Id: I0bef580cbc818cb7c87aea23919d26f1446cec32
edia/libmedia/AudioEffect.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/MediaScannerClient.cpp
edia/libmedia/ToneGenerator.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResamplerCubic.cpp
|
| 6637baae4244aec731c4014da72418d330636ae1 |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Fix races related to volume and mute
Fix race conditions when setting master volume, master mute, stream
volume, stream mute for a playback thread, and when reading stream
volume of a playback thread. Lock order is AudioFlinger, then thread.
Rename streamVolumeInternal to streamVolume_l, comment, and use it to
implement streamVolume().
Code size reduction:
- Remove dead code: AudioFlinger::PlaybackThread::masterVolume, masterMute, streamMute.
- Change return type of non-binder methods that always succeed from status_t to void.
- Remove virtual from volume and mute methods that don't need it.
This change saves 228 bytes but decreases performance of binder operations
due to the added locks.
Change-Id: Iac75abc1f54784873a667d1981b2e08f8f31e5c9
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| c4689fae1bdb8d1c94eb28af1b2a1f30d2b1a3da |
08-Feb-2012 |
James Dong <jdong@google.com> |
Move away from MediaDebug and use ADebug instead
Change-Id: I307b3f565808ec8e3b9a4d944c6c0d1f603b04c9
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 38f5d71e72f3b76c5b519614d27f051d53cd2712 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead code AudioTrack::getLoop
Change-Id: I868329c52f31bc20125f068500d8f892b4ec9796
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| b7bf796b758e144f94f6ed4d16c21bf22a118fb3 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Move declaration of stream_type_t up earlier
stream_type_t is used by AudioFlinger class, so it should be declared there.
This way we don't have to peek into PlaybackThread to get the declaration.
Change-Id: Ie08bab1604699214d1e8df2d48d3fbfbbc436e96
ervices/audioflinger/AudioFlinger.h
|
| 02bbd20cece1785c223ac4ca2ddc635931a80673 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Rename type() to streamType()
This avoids possible confusion with thread's type().
Also remove redundant cast "(audio_stream_type_t)".
Change-Id: I320b9177b6c267a102d215f002228bcf988c437a
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 7ae4a2c130ec2cb5dec69d095b810698acc543b3 |
08-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Enable B frame support in MPEG4Writer"
|
| 98ec94c5854daccc3474758524e7f4adfe535ce0 |
25-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Combine duplicate code & document wp<> in mClients
Change-Id: Iea8cfe8e57563337fb2484a1246ef79d6ad3db18
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 72ef00de10fa95bfcb948ed88ab9b7a177ed0b48 |
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
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| dbfafaffe2e97eaf8d74ec6b6c468418a1ad2443 |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Simplify destructors
Remove explicit clear() when the order doesn't matter.
Change-Id: I5931bc7ef5f681c7ce329aa9ec0a6e46d34a56c5
ervices/audioflinger/AudioFlinger.cpp
|
| 5e92a7861196ddae14638d4b7a63fc4892b7ef59 |
30-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Effect UUID inputs passed by pointer are const
Change-Id: I1f5c338bcb7368e3dd8cd5f804b2e6d9fbe087f8
nclude/media/AudioEffect.h
nclude/media/EffectsFactoryApi.h
nclude/media/IAudioFlinger.h
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/testlibs/EffectReverb.h
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 0a20fa9c41c96e31fa20e071074a4b6e7f6c41c3 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use pid_t not int"
|
| b61ec89bb0c701b3bd06eb658f854230681f8b39 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Don't double destruct audio_track_cblk_t"
|
| 63d2daed17ab749baa80bc808fb5083b688b771b |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioFlinger methods const and inline"
|
| 4f9b0c54011eb8fd2ccfb393c2dcd51cd07800e0 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
|
| 86feafe15b3f9609e1e9f64184688c2b6f2e4834 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use virtual destructors"
|
| e616d4e6de6d53ddebbc3d7fb381af94589c2232 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Improve performance for sp<> on stack"
|
| f22147e5d2982e0c461f7ce8058c2d596d518bd4 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioTrack declare more methods const"
|
| 1579d7948117e3e6541b0cfda02cc5234a3280ea |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use 0 not NULL for sp<> and wp<>"
|
| b5a66e15f371143f48665bbd462d75309582845d |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use bool instead of int"
|
| e98bbd36d67243fe987b09904956550a68af1cc7 |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Declare more IAudioFlinger methods const"
|
| dfa75555098a385ac8f4d29a73b32d66501f133d |
08-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead code"
|
| 000e18370baae60ffd9f25b509501dd8c26deabf |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| f83463148fbe344989ee1da07d15b94c38a61582 |
07-Feb-2012 |
Andreas Huber <andih@google.com> |
Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
|
| df49efa896688d6cd1e9d1f193d5f5c65b8974f8 |
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
nclude/common_time/cc_helper.h
edia/common_time/cc_helper.cpp
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 94fef38613962c983c46ab0b97c58f5373412d2d |
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
edia/libeffects/preprocessing/PreProcessing.cpp
|
| 60c2b4ece6528d6d3f4e9e2c7e45772b65c4b87d |
04-Feb-2012 |
James Dong <jdong@google.com> |
Don't call virtual function in destructor of SurfaceMediaSource
Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 0a684cc5346e7d95acd3c3c0582c2b0161815fb0 |
05-Feb-2012 |
James Dong <jdong@google.com> |
Removed unnecessary memset before an immediate memcpy
Change-Id: I447057f861bb6b7977de48a598fd5bed7e75460b
ibvideoeditor/lvpp/VideoEditorTools.cpp
|
| f9289a4ca88d8f72cb0d6b3ca16fbc44ef4a2aeb |
04-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Don't call virtual functions in the destructor for audio and camera source classes"
|
| 7151529aa72f5743947e3f4f4f450e43fc07be9f |
19-Jan-2012 |
John Grossman <johngro@google.com> |
Add native common time config service.
Define a native service interface for configuring and controlling the
common time service. Implement the native marshallers and stub the
implementation of the new interface.
Change-Id: Ia6a6a20ef3d221e8829c55be1dd5f98ed996c610
nclude/common_time/ICommonTimeConfig.h
edia/common_time/Android.mk
edia/common_time/ICommonTimeConfig.cpp
|
| 8823b08bea7ae8dcb64c414377e08d5e320c5558 |
18-Jan-2012 |
John Grossman <johngro@google.com> |
Add marshallers for the new common clock methods.
Add marshallers and stub implementations for new methods in the common
clock interface to support new functionality being added in the
process of integrating the common time service more closely with the
Java level of Android.
Change-Id: Iac2d3fb405d1b64cea1d8e13f988160afb76a06d
nclude/common_time/ICommonClock.h
edia/common_time/Android.mk
edia/common_time/ICommonClock.cpp
edia/common_time/utils.cpp
edia/common_time/utils.h
|
| fa5643ffb4f16a68ad355a191383bf2b1a21d468 |
17-Jan-2012 |
John Grossman <johngro@google.com> |
Change ICommonClock marshallers to return explicit error codes.
Change the ICommonClock marshallers to return an explicit error with
each transaction. This makes it easier to disambiguate between binder
errors (dead object due to the service crashing) vs. runtime errors
(cannot return common time due to lack of sync)
Change-Id: I2182cf0cfb2e11b4669f392554f104ef7c4bca8b
edia/common_time/ICommonClock.cpp
|
| 1e41d7016ce710df3b9689f20862a984f5f20f08 |
17-Jan-2012 |
John Grossman <johngro@google.com> |
Move the definition of time server state.
Move the State enum up to the ICommonClock interface so it can be
returned for status/debugging up to clients.
Change-Id: I81fef5b96ffc69a4f2e9801b3744feea099ccd47
nclude/common_time/ICommonClock.h
|
| bd0856245d557ab2f09be4f4b514842fba52e3bd |
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
nclude/common_time/ICommonClock.h
nclude/common_time/cc_helper.h
nclude/common_time/local_clock.h
edia/common_time/Android.mk
edia/common_time/ICommonClock.cpp
edia/common_time/cc_helper.cpp
edia/common_time/local_clock.cpp
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_tx_player.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
|
| 1a0ae5be3d1273cba12584b33830d859510fbf82 |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Don't double destruct audio_track_cblk_t
Fortunately audio_track_cblk_t doesn't have a destructor, but for clarity
remove the double destruction.
Also add warning not to add any virtuals to audio_track_cblk_t.
Change-Id: I70ebe1a70460c7002145b2cdf10f9f137396e6f3
nclude/private/media/AudioTrackShared.h
ervices/audioflinger/AudioFlinger.cpp
|
| bb001926447d0b7dc71ca8bb3c9856f3136d8f4c |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Use pid_t not int
Change-Id: Iad1c2fd4152e94080ad8c65c13ddf4519fc2ed27
ervices/audioflinger/AudioFlinger.cpp
|
| d5e54f7a36daedc3b2a642d1499c262da04e6280 |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead code
mFormat is unused in resampler
mClientTid is unused
local variable pid is unused in dump
Change-Id: Ib156e38029366620bfeff2a13e73471867155a5b
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
|
| a5224f319e2ba4b51ddb4287705ccf8d4b8ecc51 |
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
AudioTrack declare more methods const
Change-Id: I4999e984460893961d0d8092cff17f3cf07d7214
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| f587ba5b991c7cd91e4df093d0d796bd419e5d67 |
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
nclude/media/AudioEffect.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioEffect.cpp
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| f3623993b78669a624d9b3a703b361ed6c035ad9 |
04-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Don't call virtual functions in destructors for the writer classes"
|
| 4c340c6521b634f159d2d6bc4e9359226fd8edf8 |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use bool instead of int
The .h is not modified to avoid increasing data size.
Change-Id: Ide4a821a5b16424ffa03471dfff98dc3e9b5f751
ervices/audioflinger/AudioMixer.cpp
|
| c59c004a3a6042c0990d71179f88eee2ce781e3c |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger methods const and inline
This saves 1063 bytes and probably improves performance.
Change-Id: I11cf0dfd925fbaec75e3d1b806852a538eae5518
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.h
|
| c19e22450e6e3d07594c935c7a9522e85e909e82 |
30-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use virtual destructors
It turns out to be just a comment, as all except AudioMixer are RefBase.
There are only a few performance-sensitive cases where it's worth thinking
about whether you need a virtual destructor, and the headache usually
outweighs the benefit.
Change-Id: I716292f9556ec17c29ce8c76ac8ae602cb496533
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResamplerSinc.h
|
| aad5bdff98ac5bc9be4288b5acf445465750711e |
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"
|
| 7378ca506e4e20c2b2d4e94a131cf1b95831adb5 |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use 0 not NULL for sp<> and wp<>
Change-Id: Id1f0c89acefaceed6cb9ca7c165fce895e46d85b
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| c71f6e2392bf55cc85ee7c1a376441e9b9aae4c8 |
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
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
|
| 8c31ae07a170746f408445b1c23937f14c19ec51 |
03-Feb-2012 |
James Dong <jdong@google.com> |
Use AACEncoder instead of OMX-based AAC software encoder to workaround issues in the video editor engine
o related-to-bug: 5947347
Change-Id: I8eae8166e87e5809e2f3699f760f3a3e57895b4f
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
|
| 787bae0578fbaab6219ebf23494866b224d01438 |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_in_acoustics_t consistently"
|
| ff3c83e04ae459c4252b86dd4440b4e37ee92c16 |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use ToneGenerator::tone_type consistently"
|
| a0d68338a88c2ddb4502f95017b546d603ef1ec7 |
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
nclude/media/AudioEffect.h
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/Visualizer.h
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/ToneGenerator.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 87f155d6655b2d3b27e69281a29e85c6407e4d26 |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "For performance, return large objects by reference"
|
| f81e97e4ec8b01965a5b36987f886cf5001f71ff |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "No need to check a wp<> for 0 before promote()"
|
| 84afa3b51ac48f84ed62489529ce78cba7fca00e |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Constructor initialization and const fields
In constructors, initialize member fields in the initialization list
rather than constructor body where possible. This allows more fields
to be const, provided they are never modified.
Also initialize POD fields in constructor, unless it's obvious they
don't need to be initialized. In that case, put a comment instead.
Remove explicit clear() in destructors on fields that are now const.
Give AudioSessionRef a default constructor, so it's immutable fields can
be marked const.
Add comment about ~TrackBase() trick.
Initialize fields in declaration order to make it easier to confirm that
all fields are set.
Move initialization of mHardwareStatus from onFirstRef() to constructor.
Use NULL not 0 to initialize raw pointers in initialization list.
Rename field mClient to mAudioFlingerClient, and getter from client()
to audioFlingerClient().
Change-Id: Ib36cf6ed32f3cd19003f40a5d84046eb4c122052
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
|
| 5c0ad10b14ec2287f90f95912d98e66eef006e2a |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Cleanup thread types"
|
| 62da7fbd60bee2dd57f503126266e9f04311d400 |
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Make AudioTrack control block volume field private"
|
| b44c9d2bdc0d5b9cb03254022a58e017b516e9e6 |
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
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 8bcc65c753085fe3328592cceda0cf0e8f8b0a45 |
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
nclude/media/stagefright/AACWriter.h
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/MPEG2TSWriter.h
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/AACWriter.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG2TSWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| d45ee9d9d61af0791c7c3c51f8d4fe6794ef02a5 |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix const sp<>& in parameter list and return value"
|
| 914b33354be650a5213dd545ace49c6e81828043 |
02-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Removed a loop for buffer lookup"
|
| 1fb41b40037b4cad585cbd4e08c58b66c61afed7 |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Unconditional delete"
|
| 457d4c01ec0e922771ef57158431f48e4d267905 |
02-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "More audio_stream_type_t"
|
| 0e265cf36d201a7ccc0238b5c60b50f43d1dc450 |
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
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| 928170837b9dec2b90f7a01b85182a8b00b45972 |
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
edia/libstagefright/omx/SimpleSoftOMXComponent.cpp
|
| e336de43a7cf186fe9d5070f5badfad6e302d9e3 |
02-Feb-2012 |
Eric Laurent <elaurent@google.com> |
Merge "modifications for new webrtc modules"
|
| bf6954598193147cac980b8b5d7ad5215f1dec16 |
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"
|
| a789d6c0560d85fca51ba7d806527212aa6337c9 |
01-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Clean up VideoEditorPreviewController class part one:"
|
| 4e260ab948787c2a814543077832847deae890fd |
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
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| 83f70f4472e9b0cacc5d372eddfcef4b02662d10 |
01-Feb-2012 |
Andreas Huber <andih@google.com> |
The AMR WB software encoder is now an OMX component.
Change-Id: Iebfb2696783a0163369ba4e8ef72e19ee76ad893
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/amrwbenc/SoftAMRWBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/SoftAMRWBEncoder.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 5387696d25bc710f8cd0e6d08079e2aa8d6c1417 |
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
edia/libeffects/preprocessing/Android.mk
edia/libeffects/preprocessing/PreProcessing.cpp
|
| 252353088a5ebf8508fbc01439ff417805ef1417 |
31-Jan-2012 |
Andreas Huber <andih@google.com> |
The software AMR NB encoder is now an OMX component.
Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/amrnb/enc/Android.mk
edia/libstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/SoftAMRNBEncoder.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| c25942f42682ce662fa87c236ce9cdd8ede5b772 |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am afc3fb47: am a91c3232: Reconcile with ics-mr1-release
* commit 'afc3fb4729b128b7d1dd9e10a3058677d6199f9f':
|
| d792877a09824e212bae439caa5c4762e261f5e3 |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am a91c3232: Reconcile with ics-mr1-release
* commit 'a91c3232fcfe908ddb65be33bdeedff344dfc7d8':
|
| d21be5b0758710e975462e8eb054ef460a97367f |
01-Feb-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I5553166d3df57d850f576995d0cb5e162e4eccee
|
| 2af955b7437ac5345d75a5e528ebbb749667af7e |
01-Feb-2012 |
James Dong <jdong@google.com> |
Merge "add tests module tag to omx_tests"
|
| 8a0f85fec2e28a97ba8fdda89c2a9b957098c114 |
31-Jan-2012 |
James Dong <jdong@google.com> |
add tests module tag to omx_tests
Change-Id: I5dcb5187f09a7ae980ac5857b7ade81001d459f8
edia/libstagefright/omx/tests/Android.mk
|
| 10a5a34b0a8ba44343d0c7e0d3f261af49b5cf4c |
31-Jan-2012 |
James Dong <jdong@google.com> |
Merge "First step of refactoring 'timedtext' code."
|
| d459b485c61bd3e7fd81c5cd3af8ada27fc3e8d3 |
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
nclude/media/IOMX.h
edia/libmedia/IOMX.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/omx/OMX.cpp
|
| bb62819aa34b0e89090ccc50e5915e25bc137583 |
31-Jan-2012 |
Andreas Huber <andih@google.com> |
Merge "Make sure our aac decoder handles this parameter."
|
| 3989d5c21ce6d1f3492c9e5484d610d5d66abd9e |
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
edia/libstagefright/codecs/aacenc/src/bitbuffer.c
|
| 6655174826330afe66ef766258181ae8c11f3f6c |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/timedtext/Android.mk
edia/libstagefright/timedtext/TimedTextDriver.cpp
edia/libstagefright/timedtext/TimedTextDriver.h
edia/libstagefright/timedtext/TimedTextInBandSource.cpp
edia/libstagefright/timedtext/TimedTextInBandSource.h
edia/libstagefright/timedtext/TimedTextParser.cpp
edia/libstagefright/timedtext/TimedTextParser.h
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
edia/libstagefright/timedtext/TimedTextSRTSource.cpp
edia/libstagefright/timedtext/TimedTextSRTSource.h
edia/libstagefright/timedtext/TimedTextSource.cpp
edia/libstagefright/timedtext/TimedTextSource.h
|
| 530f752a8191ccc6bde82fb2012aa3cd032257c0 |
31-Jan-2012 |
Andreas Huber <andih@google.com> |
Make sure our aac decoder handles this parameter.
Change-Id: I212ef0c21776b99d0c6662b118ca0ec16b1d3d5e
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
|
| e59542680aa0e83cacbc471fbd3945b0509a849c |
30-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 827a597d: Reconcile with ics-mr1-release
* commit '827a597df70a51c6cccad52fae2be2c469f58b77':
Revert "Fix 5797764: Increase lock screen's thread priority"
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
|
| c58295bfa07615b81b9bf5784cb8e2dac79aded7 |
30-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
|
| d05397144be774f2f3623c754e865f51753e4e31 |
30-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
For performance, return large objects by reference
Change-Id: Ibf737018ef1d3c7d717584615dcb2d4ecdb50c99
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 090f01963e215f895020a31e22368cd44e086ce3 |
30-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Improve performance for sp<> on stack
Combine default constructor for sp<> immediately followed by assignment,
as the reference-counting is relatively slow. Also return sp<> directly
rather than via local variable, for the same reason.
Change-Id: If55931f1e407994f6591ddde41b53db72fb4fc40
ervices/audioflinger/AudioFlinger.cpp
|
| 3d2d40ac83acbda8c161cae675c372595efd640e |
28-Jan-2012 |
James Dong <jdong@google.com> |
Clean up VideoEditorPreviewController class part one:
o moved local types inside the class to avoid external exposure
o use non-virtual destructor since it is not meant to be a base class
o removed unused header files and moved some of the header files to .cpp file from .h file
o replaced #define constants with local enums
Change-Id: Ib321fc8c0379955083bc892c2ef93ed58c6c2ff5
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| 2985773cff8a4984ede9985cf4aad9ce655ffd45 |
30-Jan-2012 |
James Dong <jdong@google.com> |
Merge "Fix an error to deal with 0-size nal units in some AVC files"
|
| e9c52da6fdb755ed832325c2fe4fe5b3bc4c9eed |
30-Jan-2012 |
Andreas Huber <andih@google.com> |
Instantiate software codecs locally whenever possible.
Change-Id: I58d5c30b9de9873a239e91955a8900e2c72518a7
edia/libstagefright/Android.mk
edia/libstagefright/OMXClient.cpp
|
| 435dbe6c3ecd04bcb4bd80584064e287ebccd720 |
30-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Fix const sp<>& in parameter list and return value
EffectModule::addHandle and Client::heap() were declared incorrectly.
As a parameter, an sp<> should be & for efficiency, and for input
parameters it should also be const to protect the caller's value.
But as a return value, an sp<> should have neither const or &. The "e"
in "return e;" might be located on the stack, and if there is "&" then
the caller would see the address of a variable which no longer exists.
Also, an & would make it hard to do "return 0;".
A "const" without & is meaningless in the return type.
(In this particular case, the "e" is a member field, so it was safe.)
Change-Id: I3df5f294214eb15a9d4d596c6d5ef29de97b5c27
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| dc27bc4b2cd4b95a0d7ba5dd34e3be63e1cc0c9d |
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
edia/libstagefright/codecs/amrwbenc/inc/basic_op.h
|
| cf8b805a0c0695097211ca18237c27f45b0df85c |
22-Dec-2010 |
Martin Storsjo <martin@martin.st> |
stagefright aacenc: Avoid warnings about incompatible pointer types
Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
edia/libstagefright/codecs/aacenc/inc/aacenc_core.h
edia/libstagefright/codecs/aacenc/src/aacenc_core.c
|
| 94621e87e0972d87d5cd11197757b8bd56499882 |
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
nclude/media/IMediaPlayer.h
nclude/media/mediaplayer.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| e9dd0176933d6233916c84e18f3e8c0d644ca05d |
28-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Unconditional delete
Don't check that pointer is non-NULL before delete.
Don't leave deleted member fields non-NULL, except in a destructor,
since it could be misleading in a dump or debugger. (mRsmpOutBuffer)
Change-Id: Ic0492a6b752f74a67f4c96dfb89ca2de4e69eecf
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 211eeaf17e5565b68447d29799dbf158a33cf4cf |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
More audio_stream_type_t
Change-Id: I1260259efe0aa3fc1ef13de69758aaa592e1f815
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
|
| 77c1119ea0b5cb32287088ceeeb7e3b6bd14a85d |
25-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
No need to check a wp<> for 0 before promote()
Also remove unnecessary wp<> local variable.
Change-Id: I620e67b5d559d28616f8e00609a525cfe19c5ddc
ervices/audioflinger/AudioFlinger.cpp
|
| 3d2f877c1cb4e4ae4ddde7f57f4353de9341f11b |
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
nclude/media/ToneGenerator.h
edia/libmedia/ToneGenerator.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| c84b947d802116d64ca11087cfbc52fabd3c7109 |
28-Jan-2012 |
James Dong <jdong@google.com> |
Fix an error to deal with 0-size nal units in some AVC files
o related-to-bug: 5890998
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1
ibvideoeditor/vss/mcs/src/M4MCS_API.c
|
| de9719b3ec71472e6bf75117152176af51d1a515 |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_in_acoustics_t consistently
Change-Id: I0a9dd668fb2e57b1c3ece3190588194974b99062
nclude/media/IAudioFlinger.h
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| fd267d7cf640225bb57f0ed1af44efc153275f6d |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_source_t consistently"
|
| a3a2cd4072aaa2d93c91251a786eb7323f8d2c27 |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioStreamIn and AudioStreamOut"
|
| 6f5980b75df837231365d238c1b0d6f386363fbb |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Declare methods in binder opcode order"
|
| 28f52c84c22e129063a576e1269a39ae0cc0bfb3 |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use enum effect_state consistently"
|
| 114c458f2b80a252ec627add1d5fda2093c79068 |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use enum track_state consistently"
|
| 37770e47b63038178e1d8bdb9f14785a86e9e858 |
27-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use enum mixer_state consistently"
|
| 3bd45591402b94ed4481ea0ee0a9140840979c84 |
21-Jan-2012 |
James Dong <jdong@google.com> |
Clean up VideoEditorGBAudioProcessing
o added #ifndef/#define in the header
o removed unused variables
o renamed some types and methods
o replaced macro with class private enum
Change-Id: I588ef062fcadcd11591a5a55b4aed771c724492f
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
|
| eba51fb3a361f67a6a64d5a16eba6084fe27d60e |
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
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
nclude/media/stagefright/AudioSource.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libstagefright/AudioSource.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 710272b2da6b32c050770378db74f8197e8b8dc6 |
27-Jan-2012 |
Andreas Huber <andih@google.com> |
Merge "The software AAC encoder is now an OMX component."
|
| aed850d0d3b3c8cf3feaf1438076f33db2a60946 |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
AudioStreamIn and AudioStreamOut
These are immutable, so make the fields const.
getOutput() and getInput() methods are now const.
Change-Id: I128246ebd56ea50b3e542be43f2aa1bcb55f1373
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 2b1892db4a2ab47bfc09e59a4c11751aea99e4ea |
26-Jan-2012 |
Andreas Huber <andih@google.com> |
The software AAC encoder is now an OMX component.
Yay.
Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
mds/stagefright/record.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/aacenc/SoftAACEncoder.cpp
edia/libstagefright/codecs/aacenc/SoftAACEncoder.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 23bb8becff20449a9b1647d5a1a99b14c83f0cce |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Cleanup thread types
Use type_t instead of int for thread types.
Initialize ThreadBase::mType in constructor and make it const.
Change-Id: I43d141388b9639e4783c30b97dbda5688bf7555f
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 90716c5728b37637b2d0a730a721bfc9fad299e0 |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Declare methods in binder opcode order
This makes it easier to compare interface and implementation.
Change-Id: Ie060e43dec348902abcf40f5a610cec639d6d0d3
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 29c23c3aee5ae799b3480dc6876a46c46b019710 |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use enum mixer_state consistently
Change-Id: I5b71ed20f939dfc4b98143334b7aa064d282f584
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 28243dd563fee1c82f0fff6cc27b5cbf21fa2585 |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use enum effect_state consistently
Also fix indentation
Change-Id: I393ef9e37ffceed5ad4a78df439726ae1fe139df
ervices/audioflinger/AudioFlinger.h
|
| b853e986caf43408ad95b9014f194aadff385e3c |
26-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use enum track_state consistently
Change-Id: Ie5ebb7befa092e1de1e4df9c6e2d51e6bcfd176a
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 2857b47a2731579772c76d46285660972c0ba23d |
25-Jan-2012 |
Ben Cheng <bccheng@google.com> |
Preserve NEON callee-save registers d8-d15.
BUG:5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
|
| 244ffc8b98c8b59cf64ef3d368c3373014a2f230 |
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
|
| 11484788dd0c2ec9fce29c523a7748de34fb9b8a |
25-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
|
| 395584e473cc096c84d6657d07380d65dd711e14 |
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
|
| 013b73bfc4d5fb21082ccccf45fa08c18f86aa08 |
25-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
|
| 2d96e2965b3118c4e3cb21a76c9f07e0c8ccfc6e |
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
|
| 4787cfeb9cfe6027c7634b09ede309f37a8b0a75 |
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
|
| 9365ea9bf2e439b3e71abbabe22ce7382ebc4b3a |
25-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am 535b0264: am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
|
| 5da85aa064f65d1fc90628bd6658ecd307e44725 |
25-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am dd347d51: (-s ours) am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit 'dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
|
| bfd99cb8261a8a1ae65dc2e956b5fce8484713bb |
25-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
|
| f27286d86de720e2b0af9f4facf671f3a5de1d85 |
25-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit 'fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
stagefright aacenc: Add missing newlines at the end of files
|
| fa521a76c4fc14b01b46930cd0d04856d57fdcc1 |
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
|
| a70de78001281b44e8a05da60d81b551850c57bf |
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
|
| ceec4ae3ba8c3c3d5e243647ad7ee2fc39c71c9c |
24-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
|
| cdb22f7bbe6a6456e572e06c7e579578d2075ccc |
24-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 02421f52dc57db09d50e81e879ae6112ab3b83e6 |
24-Jan-2012 |
Jason Simmons <jsimmons@google.com> |
resolved conflicts for merge of 7eeaf3f0 to ics-aah
Change-Id: I92b709268e22e3c3e9590c15173ab073b37db726
|
| 84e19873fde204d73628ba1b5ca9e3f5778574fa |
24-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
AudioFlinger: refine mixer sleep time logic
|
| 7c5aea0a8d9b422999483f96a2566f77ff11abf2 |
24-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
|
| 52eccc1b3f033e25b5bac92effa03953bf919ad1 |
24-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
|
| a078e9b727156c76ef864ac2d8b3f6a99df9e604 |
24-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Add missing newlines at the end of files"
|
| f06a99bbc159a691ad618865c4faecbf185371cd |
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
|
| d9f088521782f071fc615df0ebbc80e53e21b2b1 |
24-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
|
| 5e37bc8d9ba68d6bc42e70a263f7c2969cc3c787 |
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
|
| 9c7ebfd56cef49f9a26572b44790868689599e34 |
24-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "stagefright aacenc: Properly terminate a comment"
|
| 5ddfbe7a9c530f70582dc788c9b198d892be3950 |
24-Jan-2012 |
James Dong <jdong@google.com> |
Merge "AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect."
|
| 21e4b6ed00e814bffc70895847a4944d7a190020 |
24-Jan-2012 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: refine mixer sleep time logic
When an AudioTrack is in underrun state, the AudioFlinger mixer will
sleep for a short period of time to give the app a chance to fill the
AudioTrack buffer. If the AudioTrack is still not ready during next mixing round,
the mixer will proceed with other tracks.
If an application keeps a steady underrun condition, the AudioFlinger mixer will
alternate between ready and not ready states. In the longer term this will cause the
audio HAL to underrun.
There is a mechanism to reduce the sleep period if the mixer is not ready several times in a
row but this mechanism is defeated by the alternating ready/not ready conditions.
The fix consists in only increasing sleep time if the mixer is ready for at least two
consecutive times.
Issue 5904527.
Change-Id: Id0139bca9be8c4e425ec6d428515c4d8f718e8c9
ervices/audioflinger/AudioFlinger.cpp
|
| eaa0b5cc2f7723e9b25298126d0dcb48c56d5dac |
24-Jan-2012 |
Eric Laurent <elaurent@google.com> |
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
This reverts commit b918035d34422a2041b6ec8c09c566bb93345b40.
Change-Id: I093bcfa56ad54a080b930208b6b79169d33581fb
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 6813a4d34b2f4b866438c9bcbcd93b0184a43a36 |
23-Jan-2012 |
Justin Ho <justinho@google.com> |
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
This reverts commit 71c4496a9757438afd30b4404824f296f6158a49.
Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| eedda3071755b2dcf851bca8bed610de18a91d01 |
24-Jan-2012 |
James Dong <jdong@google.com> |
Fix an error that missed an "=" for equality in an if statement
Change-Id: Ib566226b427f5357d52c7b9c0742afa05fdd3a84
ibvideoeditor/vss/mcs/src/M4MCS_API.c
|
| bd1b8756295539dd329b9eb41a9e5d2bbb805108 |
24-Jan-2012 |
Justin Ho <justinho@google.com> |
am feb1d988: (-s ours) am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
|
| b85a11467b3d46cb275fcc0d866619d36cda8662 |
24-Jan-2012 |
Justin Ho <justinho@google.com> |
am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
|
| 15dfda272eec983508b89fb8bc9ca6f2bb825496 |
24-Jan-2012 |
Justin Ho <justinho@google.com> |
am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit 'fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
|
| 7baf7894bc2f1a62440f381eeb50143f210a5d61 |
23-Jan-2012 |
Justin Ho <justinho@google.com> |
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
This reverts commit 71c4496a9757438afd30b4404824f296f6158a49.
Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 727f9e1e8e1306af761765e480ac5499224db646 |
20-Jan-2012 |
James Dong <jdong@google.com> |
AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect.
o this patch removed the AudioPlayerBase class.
o verified and passed functional tests
Change-Id: I33727069ef63136979b954a9dee1c35309ef6dd4
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/AudioPlayerBase.cpp
ibvideoeditor/lvpp/AudioPlayerBase.h
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.h
|
| 80a0d2de0a7db5cdcaf40fe33b14523b65d19423 |
21-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove AudioFlinger dependencies on client"
|
| 335787fe43596f38ea2fa50b24c54d0823a3fb1d |
21-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Remove AudioFlinger dependencies on client
Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
nclude/media/AudioTrack.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 873cc5762ed087b75cb0242313dd9090d8cc889d |
21-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am ee567e08: am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit 'ee567e08d973c0fad214889e8d980f9bfb535b34':
Rename LOG_ASSERT to ALOG_ASSERT
|
| f58880be9350b464291fb3cd6e257059f49ab9dc |
21-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 45470559: (-s ours) am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '45470559cd4a499fd5d38cf708f0b531dc081fed':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
|
| 5ce21b62cc70048c02821cfd2eebfa440f1112c0 |
21-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
|
| 235a722c362d79a140de047705a36e69caa1a96a |
21-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am dde686e2: (-s ours) am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit 'dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
|
| beba05c532c4d0d247cb11c5a28914a62fccd801 |
21-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am a1e87397: (-s ours) am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
|
| 598c116a365e7b5e457cafe4a856e3dccf69f337 |
21-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am d6b5584b: (-s ours) am 97aa8ee8: Merge ee4618bc
* commit 'd6b5584b67f8a2f3d8ea20d748652673d5761e33':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
|
| 83d86538c4c479a9225c75ab27938e8f05abb9c8 |
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
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| fbe807addeb759b2354fa4151adff52849cd9fe0 |
21-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 5d0c713a: Reconcile with ics-mr1-release
* commit '5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
|
| af0b82748ed900efab48068137114740cc84ee8f |
21-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix warning for redundant typedef"
|
| 58f30210ea540b6ce5aa6a46330cd3499483cb97 |
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
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 9bf3a2f69bbfa2562664181b779941e776b7e835 |
20-Jan-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Add ANativeWindow timestamp support to camera service."
|
| 41159044c6764712bb6de54a507aeabc513b90cb |
20-Jan-2012 |
Andreas Huber <andih@google.com> |
Merge "Starhub RTSP apparently does not establish time on all tracks"
|
| 7e73e44c2d2208a7079e562f7b0b9b73ef6a29f1 |
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
edia/libstagefright/rtsp/MyHandler.h
|
| 4a98a7c95f3c7d1e8c2913086ce35533a7d5cbf3 |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix typos in string constants"
|
| 31acba114c686e7364fd8875c89e48acb32f9733 |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead file include/media/thread_init.h"
|
| d967f0a099db2b71597a3127134afd4a46287a4a |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove redundant get()"
|
| 05bfe50e13793404a78c20c850d467d17734d496 |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
|
| 7fc9a6fdf146ded90b51c52f4a05d797294dcb85 |
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
edia/libmedia/AudioSystem.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/mediametadataretriever.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 112ab3e11b9992814363e0f9c629ef7fba86950b |
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
edia/libmedia/autodetect.cpp
|
| ea3cc3bca949139e401b77f2ac0cce7ac6e76f8f |
20-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead setRingerMode(mode, mask)"
|
| 6f9028e5fd2f4dae3068c07bcb5221c5e7c515fa |
20-Jan-2012 |
James Dong <jdong@google.com> |
Merge "More source code Clean up in video editor engine"
|
| ed6269fd78eb57dce865279f4b777a9dd096cdcc |
20-Jan-2012 |
James Dong <jdong@google.com> |
Don't allow evil constructors in VideoEditorBGAudioProcessing
Change-Id: Ic525ed66308681ec62363bc90ed2cea42c165a2b
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
|
| 00f742c087d92e5452d29be1fb668022b5f8a6c7 |
14-Jan-2012 |
James Dong <jdong@google.com> |
More source code Clean up in video editor engine
o fixed incorrect design and got rid of PreviewPlayerBase class
o removed obsolete/unused code as much as possible and reformatted the source code
o verified and passed functional tests
o More to come ...
Change-Id: I7a89162f8b9d9ea6eabcf0457366cd2f6d970d11
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/AudioPlayerBase.cpp
ibvideoeditor/lvpp/AudioPlayerBase.h
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyAudioSource.h
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.h
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
|
| a3db30f7c53936a3acb87d2c44807ee2f0cfa16e |
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
|
| d746737921074e2a6c39c52b06022c5166689df5 |
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)
|
| daef36f5d4934bd055c694a8d54b86e2b50a6159 |
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)
|
| 3734cbca25c6d902677cfb5e59dff7a1cb17a45d |
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)
|
| e744a90eb52bf9547848c08380cfb7ba7e63ffbc |
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)
|
| ca05a87f4c69670a06bdee4b4f98bcdcd838beda |
20-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
Merge ee4618bc
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
|
| 39fd8eb956dea32692d3d72b10b64a8597df0a40 |
09-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
edia/libmediaplayerservice/TestPlayerStub.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResamplerCubic.cpp
|
| 9a8ded7348c5b2302dd27b285b395416bc842c49 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
amera/Camera.cpp
amera/CameraParameters.cpp
mds/stagefright/sf2.cpp
rm/common/ReadWriteUtils.cpp
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScannerClient.cpp
edia/libmedia/Metadata.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/Visualizer.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/TestPlayerStub.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/AACWriter.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/FLACExtractor.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/g711/dec/SoftG711.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
edia/libstagefright/foundation/AMessage.cpp
edia/libstagefright/httplive/LiveDataSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
edia/libstagefright/omx/OMXMaster.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/rtsp/UDPPusher.cpp
edia/libstagefright/rtsp/rtp_test.cpp
edia/libstagefright/tests/DummyRecorder.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/yuv/YUVImage.cpp
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpPacket.cpp
edia/mtp/MtpProperty.cpp
edia/mtp/MtpServer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| aa70226152d2084f85a96b52359dbc8476a86a45 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
amera/Camera.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/IOMX.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/ESDS.cpp
edia/libstagefright/FLACExtractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/foundation/AHierarchicalStateMachine.cpp
edia/libstagefright/foundation/ALooperRoster.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/camera/libcameraservice/CameraService.cpp
|
| 53feeb42c721e8fc9285e35e679906a951f3277c |
04-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
mds/stagefright/record.cpp
mds/stagefright/stream.cpp
rm/drmserver/main_drmserver.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/foundation/hexdump.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/rtsp/UDPPusher.cpp
edia/mediaserver/main_mediaserver.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpProperty.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
|
| 52546c0ef96aa3e7e21482e0f9b6e982557c8da9 |
20-Dec-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
amera/Camera.cpp
amera/CameraParameters.cpp
rm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpObjectInfo.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorageInfo.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| 3812256de32e73e38ba16e50ac0451c10223d4eb |
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
amera/Camera.cpp
amera/ICamera.cpp
amera/ICameraClient.cpp
amera/ICameraRecordingProxy.cpp
amera/ICameraRecordingProxyListener.cpp
mds/stagefright/sf2.cpp
mds/stagefright/stream.cpp
rm/common/DrmMetadata.cpp
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libeffects/testlibs/AudioEqualizer.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioParameter.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IEffect.cpp
edia/libmedia/IEffectClient.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/Visualizer.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libstagefright/AACWriter.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AudioSource.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/ESDS.cpp
edia/libstagefright/FLACExtractor.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG2TSWriter.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MediaSourceSplitter.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/VideoSourceDownSampler.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/SimpleSoftOMXComponent.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/AAVCAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARawAudioAssembler.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/tests/DummyRecorder.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDeviceInfo.cpp
edia/mtp/MtpPacket.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorage.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraHardwareStub.cpp
|
| 6f444c95d86936217bf49fc11d279851b0fa364d |
19-Jan-2012 |
Andreas Huber <andih@google.com> |
Merge "Make sure the ThrottledSource reports the proper mime type"
|
| bd9c9a80fd487b3e83861c32b388eac146f8a299 |
19-Jan-2012 |
Andreas Huber <andih@google.com> |
Make sure the ThrottledSource reports the proper mime type
of the underlying source.
Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
edia/libstagefright/include/ThrottledSource.h
|
| 90a607163f793b968d96295b876532e4d03b642c |
19-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
|
| 03e9231e4f29a332df13d06bd90dc1fe28eb36e3 |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead file include/media/thread_init.h
Change-Id: I98688bb7109b5f82953988935c7c33fe3c7f4ec0
nclude/media/thread_init.h
|
| aeeb7e219e34d2d657d829913659a4e10e976375 |
19-Jan-2012 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 05683c85 to master
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
|
| 9096f3471434d7f0d2419ac0ee2a618045489718 |
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
edia/libmedia/Visualizer.cpp
|
| 27a0d83f53ddbfd6449ab0e3c786742a2cd135a9 |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix incorrect includes of AudioTrack.h"
|
| 241fc78866b2aefd75cd1890df5a75b7008728e8 |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Simplify range check for audio_mode_t (continued)"
|
| 86905f445c96743b037eed6360afa956a85b019c |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Add units to time periods"
|
| ca42b286a162f5cd6a4a916bfe429abe95780730 |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use const const strings for arrays and pointers to strings"
|
| 5cb73e780ac3ce0556a68e6e0396486ce9b19a6d |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "For booleans, use ! instead of == false"
|
| e4b8fa11add55107ec74d7df7c4fe6b57a7f301e |
19-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 60a5dfbfdee07988834f75b618687cfc993948ef |
19-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
|
| 9e5af59badab79128c03c79534a20f09b6e93cfe |
19-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
|
| a3f1fa308728976fc9ca1b4f37d26e633b32b9ac |
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
nclude/media/AudioRecord.h
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MidiFile.h
|
| 347966c827883711d1ec631f204e4a6ab74e9d99 |
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
edia/libmedia/AudioSystem.cpp
|
| 22ecc912a87099cff8cadc424cd12f85c118673f |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Add units to time periods
Change-Id: Ib980e2676cecf5d9b0c2e388da6dc8e370df8abb
ervices/audioflinger/AudioPolicyService.cpp
|
| 8dad0e31c2366c501bd1d600261d0af35a6ca786 |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use const const strings for arrays and pointers to strings
Change-Id: I0a073e17ebf6ad59e7edbedac104c6fa4bcaf9c9
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| f1d4592d4c3c99ebab55559e164ff102e825283e |
14-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
For booleans, use ! instead of == false
Change-Id: Ibc115936d2d0b0b7744ebe9b52839ea5b42c4edd
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 0b07b8085d7b837b4dd5f09e0c8c39408f6bdbf7 |
18-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead setRingerMode(mode, mask)
Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 2774144fa8283f1a7b43e17a53c97dec0c366dd3 |
18-Jan-2012 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: mix track only when really ready (2)
This problem due to the way audio buffers are mixed when
low power mode is active was addressed by commits 19ddf0eb
and 8a04fe03 but only partially. As a matter of fact, when more
than one audio track is playing, the problem is still present.
This is most noticeable when playing music with screen off
and a notification or navigation instruction is played: in this case,
the music or notification is likely to skip.
The fix consists in declaring the mixer ready if all active tracks
are ready. Previous behavior was to declare ready if at least one track was
ready. To avoid that one application failing to fill the track buffer blocks other
tracks indefinitely, this condition is respected only if the mixer was ready
in the previous round.
Issue 5799167.
Change-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| b93db88344829d02f114768b5f8a8e30f78b88fc |
18-Jan-2012 |
Andreas Huber <andih@google.com> |
Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
|
| c813985abd8ba61e999b3505f6a332574f87a1be |
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
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
|
| 77418fc9b4131cabfe9a85963604bdd535a04df8 |
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.)"
|
| 6c90884d683f00b56f2050c598b2cc40b7ca60d3 |
18-Jan-2012 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Merge "Make sure seek triggers a reconnect if needed."
|
| 04eaf3e5f20d7faa956c0d672024ffb5117f4c26 |
18-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Track volume cleanup"
|
| 40a4e1440869b2e3981f261b0d301cd16c0cf0aa |
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
edia/libstagefright/NuCachedSource2.cpp
|
| 9fc4dfb69df0b5a13b7a1904272eb1dcf8113d0c |
22-Dec-2010 |
Martin Storsjo <martin@martin.st> |
stagefright aacenc: Add const declarations to some pointers
This avoids some compilation warnings.
Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
edia/libstagefright/codecs/aacenc/inc/psy_configuration.h
edia/libstagefright/codecs/aacenc/src/dyn_bits.c
edia/libstagefright/codecs/aacenc/src/interface.c
edia/libstagefright/codecs/aacenc/src/psy_configuration.c
edia/libstagefright/codecs/aacenc/src/psy_main.c
edia/libstagefright/codecs/aacenc/src/quantize.c
|
| 63ad6aacc6ce6b729bf25f41376cfea731a2c1eb |
18-Jan-2012 |
Eric Laurent <elaurent@google.com> |
Merge "audio framework: manage stream volume per device"
|
| b1cf75c4935001f61057989ee3cf27bbf09ecd9c |
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
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 511754b5839fd9b09fc56b89ae007fbc39084a33 |
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
edia/libmedia/AudioTrack.cpp
|
| 83844cc2f95dc279015b47fd1e18c7cb4eabe9a1 |
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
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 7a4097cc526fc25a36e0f451613340a9444ca043 |
17-Jan-2012 |
James Dong <jdong@google.com> |
Fix two typos in the defined frequency enums
Change-Id: Ia0b6af98bd8f2ccb4d79705064a225e5f699ed8d
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| f237a30e9344d43f832ba11db6f62c6ad2084444 |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead setVolume() and mVolume[2]"
|
| ad0f6cc5e115ca167ff122c83451b46d85c590ac |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dead setVolume() and mVolume[2]
Change-Id: I94b835434093e920432614eb5007101e87758f32
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 3f6448e020969be59ad4d8df99c5296f237ffbd9 |
16-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Move fixed_fft to system/media/audio_utils
Change-Id: If8a03911434862a872539c313f54825ffb2cc672
edia/libmedia/Android.mk
edia/libmedia/Visualizer.cpp
edia/libmedia/fixedfft.cpp
|
| 0696400a6bb9abbed62b3b9c6aa105495dc600a2 |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_mode_t consistently"
|
| a9b21c5a7c24fe14d20372263c0bf5faf3d3e348 |
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
nclude/media/Visualizer.h
edia/libmedia/Visualizer.cpp
|
| 263709e7be37c7040aaef385bc5c9389a9b5f514 |
06-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Check stream type in AudioFlinger::createTrack
A bad parameter to AudioFlinger::createTrack could cause mediaserver to crash.
Other AudioFlinger stream type cleanup:
- Simplify range check for audio_stream_type_t
- Add comment about mStreamTypes array initialization.
Change-Id: Ia33aa1cce0fdd694b08d9288816ffc097a9543d0
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
|
| 3944e0326a286bcb931551e61e79c033b10d09d4 |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix locking for mMasterVolume and mMute"
|
| 613882293184e575a44bff681a3decaefe889e69 |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use size_t for frame size"
|
| 4a108948e915b5c758cada106c129f56532ccf35 |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_stream_type_t consistently"
|
| 0107954f72153db747a3727dc1157e9236dfed90 |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_stream_type_t consistently"
|
| b9ac2007cd141992eb5412ffb1c6527e0259b3ab |
17-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioTrack and AudioFlinger send level cleanup"
|
| 132e88ee86e4f11d1b649c336cd2d6eb5980c3fc |
15-Jan-2012 |
Dongwon Kang <dwkang@google.com> |
MatroskaExtractor: to support MPEG4 and MP3 codec.
Change-Id: Ic7ffb3ed394b233336fbf2a7b2627ee27033a59e
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| ec2e74b538b899aac54f55ed1aa60286624f8895 |
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
edia/libstagefright/AVIExtractor.cpp
|
| 9806710f5d6722cfc5783c7eca3512451a0f2035 |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Fix locking for mMasterVolume and mMute
mMasterVolume and mMute are both protected by mutex in AudioFlinger class, but
there were two places where they were accessed without a mutex.
Also make AudioFlinger::mMasterMute private not protected.
Change-Id: Ia3897daeb5c50313df5bcc071824357526237f3e
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 05632a5fa4b88ca474294887fc92a9fcdf0e2352 |
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
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| b9980659501d0428d65d8292f3c32da69d37fbd2 |
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
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 51067c14482decc3dcc1ac16a6573a9cfa9cc3de |
13-Jan-2012 |
David 'Digit' Turner <digit@google.com> |
Merge "media/mtp: Add missing LOCAL_C_INCLUDES"
|
| f4e76c538f81068bc2e125f3f9ef8b8dd40f2d2a |
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
|
| b45e50a5bce5fba740318d056c8dd1fd9caed354 |
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
|
| bcc2252eb16484cf58036146ea5034756dde8027 |
13-Jan-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
|
| 60866592ed6953f2b0e12cefcd58f1ced26546d0 |
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
edia/libstagefright/codecs/aacenc/src/adj_thr.c
|
| 721f2bb7b28891c0811a5bea31fa62644131befc |
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
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.h
|
| b8576d5ae50294bb1917b84f366054ebff02a3a6 |
05-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
stagefright aacenc: Use QDADD/QDSUB instructions
Change-Id: I46c81dba0486d515f1f2b89a13fae27f6ab1e122
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
|
| fa9597bc0007f6a1d6704f047e7d94bb195c8a68 |
05-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
stagefright aacenc: Remove useless inline asm for simple right shift
Change-Id: If1f40e9c16952182e974af1c86a14995259c2ade
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
|
| 813eebeb773b1e4c42c2063a7fe37a94514e596a |
05-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
stagefright aacenc: Use ARMv6 SSAT instruction
Change-Id: I652eaaa54e7766d9dca80fd8cc156ca481359471
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
|
| 9da751147af3222258093d9f41cabf0ea1391c04 |
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
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
|
| d2fdc7129d96391d22065866c612d532dfe411b3 |
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
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
|
| 132e42c04a58e623efa6cd6ca43641cd80db0f05 |
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
edia/libstagefright/codecs/aacenc/src/adj_thr.c
|
| 2db3b238966f5f326010321b698fa938d65b8e8a |
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
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
|
| 2f0fb8c1ec139d385feb6990111ed6dc93422eac |
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
edia/libstagefright/codecs/aacenc/src/sf_estim.c
|
| 417f62c84261ea17e17a011b1e9706eb997a6ba1 |
22-Dec-2010 |
Martin Storsjo <martin@martin.st> |
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
edia/libstagefright/codecs/amrwbenc/src/mem_align.c
|
| 5e9afe434d8207fb0af6e191cca671ab74cfe878 |
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
edia/libstagefright/codecs/aacenc/inc/bitbuffer.h
edia/libstagefright/codecs/aacenc/src/bitbuffer.c
|
| 891abc0ee089f2ba5b92dcc014e5efc2ef07f01e |
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
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.c
edia/libstagefright/codecs/aacenc/inc/config.h
edia/libstagefright/codecs/aacenc/inc/sf_estim.h
edia/libstagefright/codecs/aacenc/inc/transform.h
edia/libstagefright/codecs/aacenc/src/aac_rom.c
edia/libstagefright/codecs/aacenc/src/aacenc.c
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
edia/libstagefright/codecs/aacenc/src/band_nrg.c
|
| 32bc0329ac94b181f1457c182c5bb2903f29832d |
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
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
|
| fff6d715a8db0daf08a50634f242c40268de3d49 |
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
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioPolicyService.h
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/ToneGenerator.h
nclude/media/mediaplayer.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| c7a8e2422445030b9312470abca23c966b6367c7 |
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
edia/mtp/Android.mk
|
| 09192653e836b21689f004bf8dee375356641181 |
13-Jan-2012 |
James Dong <jdong@google.com> |
Merge "Separate sniffing from session initialization"
|
| 813c1017a499d5fe7a9ee7f40aae845954a3ba55 |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_stream_type_t consistently
Change-Id: I0b3ba8ab74f03433d1e64cb898fa62c02535a2f1
ibvideoeditor/lvpp/VideoEditorPlayer.h
|
| 9d2f386dd2885eaffa11fd494ae258bb09fe6397 |
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
rm/common/DrmEngineBase.cpp
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
nclude/drm/DrmManagerClient.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/FileSource.h
nclude/media/stagefright/MediaExtractor.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/ChromiumHTTPDataSource.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/WVMExtractor.h
|
| daeb5b33861147fda0096f9c794be6f341d884c2 |
12-Jan-2012 |
James Dong <jdong@google.com> |
Remove streaming related logic from preview player.
Video editor engine only deals with local file playback/preview.
Change-Id: I8e3414abf8a109a77a1e34a959fb4a090612ae3d
related-to-bug: 5857057
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 4a9eb9628be8fdc441179394b7edca9bdce23ed3 |
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>
edia/libmedia/AudioEffect.cpp
edia/libmedia/IEffect.cpp
edia/libmedia/Visualizer.cpp
|
| 8dcbd11c186e26b67de813adaec66dd578415cd7 |
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_format_t consistently
Change-Id: Idb08c49fe1a2c87ea2bb080815a5a6f95409834c
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
|
| 4cc55d53d542c4f4ed645738cebb65b9e7eb6c44 |
12-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_format_t consistently"
|
| f78aee70d15daf4690de7e7b4983ee68b0d1381d |
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
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| d5a8bf0bca459389cdb81fdcc30893516bdce951 |
12-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am ce77af47: Reconcile with ics-mr1-release
* commit 'ce77af47e979d365155e4003ca2943b639600e73':
|
| bc08dd57fe03b29d5acf53ab21e382b8c5600d33 |
12-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
|
| b676a05348e4c516fa8b57e33b10548e6142c3f8 |
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
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
edia/libstagefright/codecs/aacenc/basic_op/basicop2.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.h
edia/libstagefright/codecs/aacenc/basic_op/typedef.h
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
edia/libstagefright/codecs/aacenc/inc/aac_rom.h
edia/libstagefright/codecs/aacenc/inc/aacenc_core.h
edia/libstagefright/codecs/aacenc/inc/adj_thr.h
edia/libstagefright/codecs/aacenc/inc/adj_thr_data.h
edia/libstagefright/codecs/aacenc/inc/bitenc.h
edia/libstagefright/codecs/aacenc/inc/interface.h
edia/libstagefright/codecs/aacenc/inc/line_pe.h
edia/libstagefright/codecs/aacenc/inc/psy_const.h
edia/libstagefright/codecs/aacenc/inc/psy_main.h
edia/libstagefright/codecs/aacenc/inc/qc_main.h
edia/libstagefright/codecs/aacenc/inc/quantize.h
edia/libstagefright/codecs/aacenc/inc/sf_estim.h
edia/libstagefright/codecs/aacenc/inc/stat_bits.h
edia/libstagefright/codecs/aacenc/inc/tns_param.h
edia/libstagefright/codecs/aacenc/inc/transform.h
edia/libstagefright/codecs/aacenc/src/aac_rom.c
edia/libstagefright/codecs/aacenc/src/aacenc.c
edia/libstagefright/codecs/aacenc/src/aacenc_core.c
edia/libstagefright/codecs/aacenc/src/adj_thr.c
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
edia/libstagefright/codecs/aacenc/src/band_nrg.c
edia/libstagefright/codecs/aacenc/src/bit_cnt.c
edia/libstagefright/codecs/aacenc/src/bitbuffer.c
edia/libstagefright/codecs/aacenc/src/bitenc.c
edia/libstagefright/codecs/aacenc/src/block_switch.c
edia/libstagefright/codecs/aacenc/src/channel_map.c
edia/libstagefright/codecs/aacenc/src/dyn_bits.c
edia/libstagefright/codecs/aacenc/src/grp_data.c
edia/libstagefright/codecs/aacenc/src/interface.c
edia/libstagefright/codecs/aacenc/src/line_pe.c
edia/libstagefright/codecs/aacenc/src/memalign.c
edia/libstagefright/codecs/aacenc/src/ms_stereo.c
edia/libstagefright/codecs/aacenc/src/pre_echo_control.c
edia/libstagefright/codecs/aacenc/src/psy_configuration.c
edia/libstagefright/codecs/aacenc/src/psy_main.c
edia/libstagefright/codecs/aacenc/src/qc_main.c
edia/libstagefright/codecs/aacenc/src/quantize.c
edia/libstagefright/codecs/aacenc/src/sf_estim.c
edia/libstagefright/codecs/aacenc/src/stat_bits.c
edia/libstagefright/codecs/aacenc/src/tns.c
edia/libstagefright/codecs/aacenc/src/transform.c
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/amrwbenc/inc/basic_op.h
edia/libstagefright/codecs/amrwbenc/inc/homing.tab
edia/libstagefright/codecs/amrwbenc/inc/isp_isf.tab
edia/libstagefright/codecs/amrwbenc/inc/log2.h
edia/libstagefright/codecs/amrwbenc/inc/mime_io.tab
edia/libstagefright/codecs/amrwbenc/inc/stream.h
edia/libstagefright/codecs/amrwbenc/inc/typedef.h
edia/libstagefright/codecs/amrwbenc/inc/typedefs.h
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
edia/libstagefright/codecs/amrwbenc/src/autocorr.c
edia/libstagefright/codecs/amrwbenc/src/az_isp.c
edia/libstagefright/codecs/amrwbenc/src/bits.c
edia/libstagefright/codecs/amrwbenc/src/c2t64fx.c
edia/libstagefright/codecs/amrwbenc/src/c4t64fx.c
edia/libstagefright/codecs/amrwbenc/src/convolve.c
edia/libstagefright/codecs/amrwbenc/src/cor_h_x.c
edia/libstagefright/codecs/amrwbenc/src/decim54.c
edia/libstagefright/codecs/amrwbenc/src/deemph.c
edia/libstagefright/codecs/amrwbenc/src/dtx.c
edia/libstagefright/codecs/amrwbenc/src/g_pitch.c
edia/libstagefright/codecs/amrwbenc/src/gpclip.c
edia/libstagefright/codecs/amrwbenc/src/hp400.c
edia/libstagefright/codecs/amrwbenc/src/hp50.c
edia/libstagefright/codecs/amrwbenc/src/hp6k.c
edia/libstagefright/codecs/amrwbenc/src/hp_wsp.c
edia/libstagefright/codecs/amrwbenc/src/int_lpc.c
edia/libstagefright/codecs/amrwbenc/src/isp_az.c
edia/libstagefright/codecs/amrwbenc/src/isp_isf.c
edia/libstagefright/codecs/amrwbenc/src/levinson.c
edia/libstagefright/codecs/amrwbenc/src/log2.c
edia/libstagefright/codecs/amrwbenc/src/lp_dec2.c
edia/libstagefright/codecs/amrwbenc/src/math_op.c
edia/libstagefright/codecs/amrwbenc/src/mem_align.c
edia/libstagefright/codecs/amrwbenc/src/p_med_ol.c
edia/libstagefright/codecs/amrwbenc/src/pitch_f4.c
edia/libstagefright/codecs/amrwbenc/src/pred_lt4.c
edia/libstagefright/codecs/amrwbenc/src/preemph.c
edia/libstagefright/codecs/amrwbenc/src/q_gain2.c
edia/libstagefright/codecs/amrwbenc/src/q_pulse.c
edia/libstagefright/codecs/amrwbenc/src/qisf_ns.c
edia/libstagefright/codecs/amrwbenc/src/qpisf_2s.c
edia/libstagefright/codecs/amrwbenc/src/residu.c
edia/libstagefright/codecs/amrwbenc/src/scale.c
edia/libstagefright/codecs/amrwbenc/src/stream.c
edia/libstagefright/codecs/amrwbenc/src/syn_filt.c
edia/libstagefright/codecs/amrwbenc/src/updt_tar.c
edia/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
edia/libstagefright/codecs/amrwbenc/src/voicefac.c
edia/libstagefright/codecs/amrwbenc/src/wb_vad.c
edia/libstagefright/codecs/amrwbenc/src/weight_a.c
edia/libstagefright/codecs/common/Config.mk
edia/libstagefright/codecs/common/include/voAMRWB.h
edia/libstagefright/codecs/common/include/voAudio.h
edia/libstagefright/codecs/common/include/voIndex.h
|
| c0f8fbe3ded614201abac794c34669c8a9fdb696 |
12-Jan-2012 |
James Dong <jdong@google.com> |
Remove unnecessary drm handling logic in PreviewPlayerBase class
Change-Id: I08b1e23ecf5775deb92a262fb9ed60a464fe60c0
related-to-bug: 5857208
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.h
|
| 7382d6a1b92a54b9a002eb5d4bcc1dcac651c176 |
12-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 83bc7f3cf78b28a818417f40a4f0c00593993366 |
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
libmedia new can't fail on Android
Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MediaScannerClient.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/Visualizer.cpp
|
| 3bba0e0a60b15895134bc2c731d21fd7ebd28784 |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix race in AudioSystem::getInputBufferSize"
|
| 544096247a907bc55688e5c03d5586ba5219d82a |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix bug in JetPlayer::loadFromFile"
|
| e3a067f8bc98134941ee1a4da8c2a92a15aaa9cc |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Simplify range check for audio_mode_t"
|
| e51dd6dd7b7034c171246ebf5e08b187ef17150c |
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
|
| 3c4551107ba2e11d3e4573113d337e2fc5ff4c0f |
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
|
| a7cbd8e1a52c307cb8aac7d06a777ba2713fed82 |
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
|
| c40256146bee58bff09e1c16ef99ea06d31f89f9 |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use correct type for hardware call state"
|
| 0132e12ded92529b1520ad62f5134fa31361c90b |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Declare IAudioTrack methods in binder opcode order"
|
| 2ea3410d0d3d592ce30c3ba0ce3e0e63b1244057 |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use consistent style of & reference for AutoMutex"
|
| 22f3efdefddc855ea0763275310850bf55bd4fd1 |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix missing tag in mediaserver ServiceManager: log"
|
| 9770988e61961d34033fd2c12f0de85a267df68f |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioFlinger new can't fail"
|
| 02b2d2dddc9be339cf7647d4ead53cecd1c51038 |
11-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix build warning"
|
| 9f3d5919b45c360f88510f7455279aebe810d56b |
26-Jul-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Add ANativeWindow timestamp support to camera service.
This allows the camera HAL to set ANativeWindow timestamps, which
are used by SurfaceTexture.
Bug-Id: 5081132
Change-Id: I123ea4c9d1824fb72146fad81ad03d1491e0a7f8
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| f8c1a6f7ef515810356816b50bfe18af95f3ec32 |
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
edia/libmedia/AudioSystem.cpp
|
| 0049acfc8b1c33eb90afc925dacd08a487618e17 |
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
nclude/media/JetPlayer.h
edia/libmedia/JetPlayer.cpp
|
| 930f4caa1e311ef7ff538c421a324396157eb24f |
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
edia/libmedia/AudioSystem.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 86d24aa35adf82512d341d9aaebd62b36b0a0847 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| c1dc1cb1d1eaf84e88669f1a5f22579a0d9237c2 |
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
edia/libmediaplayerservice/TestPlayerStub.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResamplerCubic.cpp
|
| 7ef85ef8fc2792b019b4c9b9559f652c7ecda029 |
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>
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
|
| 5f29ca38b71506ad7c7cb9925efbddf588e9655b |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "By convention const goes before the type specifier"
|
| 25b248eb52a0a16adaef6b79c9d92cb88b9a2bc2 |
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use cached reference to media.player service
This save unnecessary binder calls
Change-Id: I93a60efc54d9c8fb8fab706cd4477bbfd00ffec8
ervices/audioflinger/AudioFlinger.cpp
|
| 879bc64e43d62f2690c77a3282cef2e45d1b76e9 |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Replace loop by __builtin_ctz"
|
| 5c7b3bcc88e2b472f1f7b416d89222714b96a567 |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Clean up AudioTrack::mActive and stopped()"
|
| febdbfec3b1ed0e20aa4f10bfdd82702d3e41f4b |
09-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "suspended() and isSuspended() are const"
|
| 29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 |
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
amera/Camera.cpp
amera/CameraParameters.cpp
mds/stagefright/sf2.cpp
rm/common/ReadWriteUtils.cpp
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScannerClient.cpp
edia/libmedia/Metadata.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/Visualizer.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/TestPlayerStub.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/AACWriter.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/FLACExtractor.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/g711/dec/SoftG711.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
edia/libstagefright/foundation/AMessage.cpp
edia/libstagefright/httplive/LiveDataSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
edia/libstagefright/omx/OMXMaster.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/rtsp/UDPPusher.cpp
edia/libstagefright/rtsp/rtp_test.cpp
edia/libstagefright/tests/DummyRecorder.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/yuv/YUVImage.cpp
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpPacket.cpp
edia/mtp/MtpProperty.cpp
edia/mtp/MtpServer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| f8bd29c66308c820d579b3efb0942a53a277e2c5 |
08-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: I5c54a0185527f6ca3e746d625a007aa06f6f25f9
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| d709ca9c6a0fa1c8f40cbe624a119398643c5087 |
07-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am 20090b30: Reconcile with ics-mr1-release
* commit '20090b30340f9382a2eca6a9bed21117f7a27d7e':
|
| b470ec5eb16e08f6d0d24bf79aa76c05fe5543a1 |
07-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
|
| d9a4d0bdc90c2ad37b0e9a818d8fd5cbbe624c7c |
07-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 0e5ace70ca8067fc2c3259fe041352d1dab7e1e2 |
07-Jan-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
Switch camera sounds to always use the system enforced audio stream.
|
| fee28f6229866f26c7ef857e7f49f76c1ddd867b |
07-Jan-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '7944704e6c4cc10105838b78d3d8403bf66a066b':
Switch camera sounds to always use the system enforced audio stream.
|
| afb3f7fd1a093c333a90cadfe484fe2643e57031 |
07-Jan-2012 |
Eino-Ville Talvala <etalvala@google.com> |
am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '7944704e6c4cc10105838b78d3d8403bf66a066b':
Switch camera sounds to always use the system enforced audio stream.
|
| 4a6f02833d8421b7d9b20f89729d8bb03b8b8102 |
07-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
AudioFlinger new can't fail
Change-Id: I7dae05a5ea1c962a9975386eab1fedbbe106ffba
ervices/audioflinger/AudioFlinger.cpp
|
| 33df529414c248972587d97cbb2e3309e0a7eeff |
19-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Fix missing tag in mediaserver ServiceManager: log
Change-Id: I2d5525ffee0b66c0bc361a02b313ec4dd61e6552
edia/mediaserver/main_mediaserver.cpp
|
| 1099586bd48a8a90bb1cc4e7c279703bc7259214 |
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
nclude/media/IAudioTrack.h
edia/libmedia/IAudioTrack.cpp
|
| a7d8d6fc5e102a08b262a1b78aa1abeeb097d9e4 |
06-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use consistent style of & reference for AutoMutex
AutoMutex, which is a typedef for Mutex::Autolock, is overloaded for
either a reference (&) or pointer (*) parameter, but we prefer to use
the reference form when the mutex is known at compile time.
Change-Id: I3515e6d6ab7959b2356a27fa3b04fd49e42cb31e
ervices/audioflinger/AudioFlinger.cpp
|
| a4454b4765c5905f14186893b0688be375642283 |
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use correct type for hardware call state
Change-Id: Ic6d98b129e3ec653df1d8f7e829adf8dccb4f378
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 60a78ac9535878984b0777788760b9ee7465c5e6 |
06-Jan-2012 |
Eino-Ville Talvala <etalvala@google.com> |
Switch camera sounds to always use the system enforced audio stream.
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.
Bug: 5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 54c3b66444ebfb9f2265ee70ac3b76ccefa0506a |
06-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
By convention const goes before the type specifier
Change-Id: I70203abd6a6f54e5bd9f1412800cc01212157e58
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResamplerSinc.cpp
ervices/audioflinger/AudioResamplerSinc.h
|
| f9a27779634ce3a01e5957f234cd04eba74fa07f |
06-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Fix build warning
Change-Id: Ic99608d0c14ed56c02f036e0bbaaae1b16bab8ba
ervices/audioflinger/AudioMixer.cpp
|
| 5ff1dd576bb93c45b44088a51544a18fc43ebf58 |
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
amera/Camera.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/IOMX.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/ESDS.cpp
edia/libstagefright/FLACExtractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/foundation/AHierarchicalStateMachine.cpp
edia/libstagefright/foundation/ALooperRoster.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/camera/libcameraservice/CameraService.cpp
|
| 98dd542ffcd3424b1da58bd273c0c1ff5b8c8960 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Replace loop by __builtin_ctz
Using the builtin is faster on some platforms, for example on ARM it's
19 instructions instead of 13, and is O(1) instead of O(n). Of course,
track creation is an inherently slow operation, so this doesn't matter
much now. But if we add support for virtual tracks, then physical tracks
will be allocated/freed more frequently. Also just on principle ...
Change-Id: I3f590934092bd7a1869cbedbc7357928aa5cc8ff
ervices/audioflinger/AudioMixer.cpp
|
| e70ff37034fdb93f65d34704aec400ec9123e55c |
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: I605079da4a7c01e6555e2aab6f16ccf8cc6ac694
ibvideoeditor/lvpp/I420ColorConverter.cpp
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 8a08dcc0a5de19a904e77d5f31bed3dff9a59890 |
05-Jan-2012 |
Steve Block <steveblock@google.com> |
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
|
| e1c3962e268ffc12bfd1bd9ea84da1f135f36960 |
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
nclude/media/AudioTrack.h
nclude/media/IMediaPlayerService.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 1dcd47537a81fc55db9b48dce7fff7bae8a601d5 |
05-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
am d32ee5ba: Reconcile with ics-mr1-release
* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':
|
| 9a2aaf927e56a4b4acab23ef16b3f133a9f48a63 |
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
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| a3a854868a80fd9b9b8720e06a172754943f9417 |
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
suspended() and isSuspended() are const
Change-Id: I04b95970b5a645b64e7e64fffd46d868354dda66
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 88592eccaf6afcddd5f985955be92fe25205c680 |
05-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove the notion of "active track" from mixer"
|
| 22bf648b0b5484834850667664912b660df28585 |
05-Jan-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
|
| a2a0a5d7d56baa831870f4bf2a0d942a477d92ef |
05-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"
|
| f6b1678f8f508b447155a81b44e214475ab634a8 |
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
edia/libeffects/testlibs/AudioBiquadFilter.cpp
edia/libeffects/testlibs/AudioCoefInterpolator.cpp
edia/libeffects/testlibs/AudioCommon.h
edia/libeffects/testlibs/AudioPeakingFilter.cpp
edia/libeffects/testlibs/AudioShelvingFilter.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 7ab41c9f773ba599646f1b0d00955c1be80f92fd |
05-Jan-2012 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 1a4b9939 to master
Change-Id: I0c910d391a38a916d8431f7d1f5b82e39e1a66c2
|
| 1c03729ed505d5ad66b72ea6ee921d8bb06245c6 |
05-Jan-2012 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| fe0698f9d44ca923ff1ba528f2c42019937ea5e2 |
04-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
audioflinger: fix clicks on 48kHz audio.
|
| 63e345adfad4b1078835e4c883cb777de2d854ab |
04-Jan-2012 |
Eric Laurent <elaurent@google.com> |
am fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit 'fb578b6b88af51812b71a86ad4dd3a7de56e394b':
audioflinger: fix clicks on 48kHz audio.
|
| ec9e663f697df4254dacc79f52cdb633179c92ab |
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: I261ad4d5348f4832488707edeb3cbdbb6dd12fca
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/I420ColorConverter.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| df64d15042bbd5e0e4933ac49bf3c177dd94752c |
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
mds/stagefright/record.cpp
mds/stagefright/stream.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/foundation/hexdump.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/rtsp/UDPPusher.cpp
edia/mediaserver/main_mediaserver.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpProperty.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
|
| b8a805261bf0282e992d3608035e47d05a898710 |
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
amera/Camera.cpp
amera/CameraParameters.cpp
rm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpObjectInfo.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorageInfo.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| 4ca06b0a9af472cfd13f52841fc9d2e5a6558674 |
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: I17166d9fb435c85c5fd9d5fba1a39d2661c61e10
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 071ccd5a9702500f3f7d62ef881300914926184d |
23-Dec-2011 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix clicks on 48kHz audio.
The calculation done in prepareTracks_l() for the minimum amount
off frames needed to mix one output buffer had 2 issues:
- the additional sample needed for interpolation was not included
- the fact that the resampler does not acknowledge the frames consumed
immediately after each mixing round but only once all frames requested have been used
was not taken into account.
Thus the number of frames available in track buffer could be considered sufficient although
it was not and the resampler would abort producing a short silence perceived as a click.
Issue 5727099.
Change-Id: I7419847a7474c7d9f9170bedd0a636132262142c
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.h
|
| 9c56d4ae6212c21ce5fd71ed534eb195983a07c1 |
20-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Remove the notion of "active track" from mixer
This is a first step towards making the mixer more object-oriented.
Change-Id: Ifd445d0e471023a7f5c82e934736ffc95ba1b05b
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 94023fa6744e24f26f0aba1699ec278649bd66df |
20-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 21cb1290: Reconcile with ics-mr1-release
* commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':
|
| 183c525aee3b683f6d92b0b6e7197a3989ddee1a |
20-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
|
| 12d9702773c8a3242a44dd6528126c9ff0dade43 |
20-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead code"
|
| bbaf8673f1d1dd79d1b7f474ca7111da58e84aff |
20-Dec-2011 |
Eric Laurent <elaurent@google.com> |
Merge "audio effects: rename configure command"
|
| 3d5188bd6abe55898f10a0edf3c05aff8aa2ef67 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/testlibs/EffectReverb.h
edia/libeffects/visualizer/EffectVisualizer.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 81a028fef62bcadf13fc8550067a3d29c918b3ca |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Remove dead code
Change-Id: Icf23f7f90fdeb660f4015f22cf239e6d05f5d03c
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| e78950e714e57767b54a836e22924212cfbf5f5f |
17-Dec-2011 |
Hong Teng <hongteng@google.com> |
Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed."
|
| f602a5f7f29e694a7da4c143737b74501c00477d |
17-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Use constants for 2 and 32"
|
| d1e672acd8fa1af899f85ee2321327237028adf8 |
17-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Extract out audio DSP code to utility library"
|
| 2736f1cb9aed4165819d21f2f3d35782dd811d26 |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "ditherAndClamp from libaudioutils not AudioMixer"
|
| bf71f1e7948406492376c6cbd5e6a30c8cb670e4 |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Use constants for 2 and 32
Change-Id: If820dfd58b6df258570750610a07af99598d9e53
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 8d0dd8b46163ec7b42e2051c441ae2bf96dd9aec |
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
edia/libstagefright/SampleTable.cpp
|
| b92bc47a05925c29efef0d66711b6d3f17f406e7 |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Use switch in AudioMixer::setParameter"
|
| 788040c5189bbdaf567ce4b29ffd1db08ea1020c |
05-May-2011 |
Glenn Kasten <gkasten@google.com> |
Use switch in AudioMixer::setParameter
Replace series of if/then/elses by easier-to-read switch. Also return
void instead of status_t, since callers weren't checking it. Assert on
bad input parameters.
Change-Id: Ie1f0a297977b28501d20e1af819afed9b4750616
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 237a624f674800d2300806b115eee8c9bb7db033 |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
deleteTrackName now asserts on bad input parameter
This is safe, as the input parameter is always track->name(),
which must be valid.
Change-Id: Iea8ea3a5706c27026335526ba8851030d00681f8
ervices/audioflinger/AudioMixer.cpp
|
| fee0357bd06bb261c26c6030df45db8e1b2a1b73 |
16-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 3b21c50ef95fe4e7ac3426ca14b365749e66ff08 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Extract out audio DSP code to utility library
Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 7bdbbc7e45fca8e50df91ef2e8b39d1608841c9d |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
ditherAndClamp from libaudioutils not AudioMixer
Change-Id: I1e8a00c81efefd956fe9e4d9b58557373320e322
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| 154a7fbda9b704bc1d23b6f17573016ebb5989be |
16-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 57ea96a4: Reconcile with ics-mr1-release
* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
SurfaceMediaSource: use the HW_TEXTURE usage bit
SurfaceMediaSource: use the HW_TEXTURE usage bit
|
| a9798d3c1f1c9787975dc0f16e2191da95f2f0da |
16-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
|
| 6d4bf6eda04888144ec59cba4816a2cbb79b9e5c |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "setActiveTrack and setBufferProvider can't fail"
|
| b87c068727a15a3d3f0bfdcb758c76a097f5e869 |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Simplify enable/disable mixing"
|
| f61ea45c823814371c8ced71a4023f9b2cd05a3b |
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
edia/libstagefright/SurfaceMediaSource.cpp
|
| 44beb98b085f8e221fbe471523e69a0d174704b4 |
16-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
edia/libstagefright/SurfaceMediaSource.cpp
|
| b5aaa4a4d8f3c6f8be574b6ad8bd20fb74da6b9c |
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
edia/libstagefright/SurfaceMediaSource.cpp
|
| 255adceb85bc23de61fb138ddb474852514b3b33 |
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
|
| 58f5793d7e803c150278300f3435aa05e86bb5a7 |
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
|
| 7e2f99569ae7d22307957abecc2e1818b4e7ab5e |
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
|
| 69aac3e6cd68e8c305a41b2677123db7662efd4b |
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
edia/libstagefright/SurfaceMediaSource.cpp
|
| 079123ee3d2e20bbc17a7ddbd96ca46bed27898f |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Improve resistance to leaks for ConfigEvent"
|
| 26fa039c3752eaaf74d1be53d9795f48e9f43de3 |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Use NULL not 0 for pointers"
|
| fba380a0b2c62684ce4272a05165965bae29d6a1 |
16-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
setActiveTrack and setBufferProvider can't fail
Return void, not status_t, from setActiveTrack and setBufferProvider.
These methods returned status_t, but the callers never checked the
return value. Since these aren't externally visible APIs, they now
return void, and assert on bad input parameters.
Change-Id: I530ed29484596ae41e8659826ca425149c51c2a1
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 1c48c3c61970527b97892ab6a2daae8eaac26964 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Simplify enable/disable mixing
The MIXING enum isn't needed, and now returns void instead of status_t.
Change-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| f3990f2cc8fd824ae52a880a7b22248e1bdfb192 |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Improve resistance to leaks for ConfigEvent
A Vector of pointers is risky, as there is no ownership (and the
ThreadBase destructor was not deleting them, so if there were any left
over at end it would leak). Replaced by a Vector of values.
Change-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 2a8ce907a57f30ffa336a024e09752794d08ec1a |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix build error when verbose logging is enabled"
|
| e0feee3da22beeffbd9357540e265f13b2119cbb |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Use NULL not 0 for pointers
Change-Id: Iab3f9abbdab617dc5a599e657ec46a0b0a002eef
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
|
| a9960bcb176c58bd9d5f9062b84437a59fff875e |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Fix build error when verbose logging is enabled
Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
|
| 8df7a98161a07f2348f292f7691887bbb8293fef |
15-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 42968939dfce0954d6540011199045ec4ed7de80 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix indentation and whitespace"
|
| a06a9a50b37d60e9c43c9de9f8ea3a8649cd5691 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Improve AudioFlinger error logging"
|
| 53a166cabc956529d2336b04c26b9c03b550ab38 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioMixer uninitialized simple fields"
|
| 0cfd8231e4c489392809bf44c174315df2690145 |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
AudioMixer uninitialized simple fields
Change-Id: I47e3849f048d4d990c9634f9c8a2ca2de0339e93
ervices/audioflinger/AudioMixer.cpp
|
| d879601ace079e3c0aed79cf3fa5fb4db6ad4a9f |
28-Oct-2011 |
Glenn Kasten <gkasten@google.com> |
Improve AudioFlinger error logging
Change-Id: I8ce9aff4038cd7fa0067600faa8080b137db1939
ervices/audioflinger/AudioFlinger.cpp
|
| 2eda60a8485cfe70a60e72156beffdc470ecb093 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Audio C++ comments"
|
| c5ac4cb3a5124860ccfc7e4ff66251c55a5595ca |
12-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Fix indentation and whitespace
Use git diff -w to verify.
Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
|
| f7d4ae9149a1fa4fa97ee0ba97652e28ed92b297 |
15-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am b14436d0: Reconcile with ics-mr1-release
* commit 'b14436d0700f6e837e4d6066ddcf672c61d7f033':
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.
|
| 3453bf678e3d0187015cdde1c9263299ea361726 |
15-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
|
| d2bc4e0683eb6d1b7ac9731cc27ab46dc3e016af |
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
rm/drmserver/DrmManager.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 1d334101f1289cf4c8967af6e78ac22619175982 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove unnecessary this->"
|
| c23bd9b5b9e4be9c395789810fdd8522296fc50c |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Use const char correctly in AudioFlinger"
|
| e5dfcd8c6792c4b64120fd03708729b70a887f2a |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Use units after all times"
|
| 738ed42488491b740e73c0cddc2f257af17b638d |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Delete obsolete includes"
|
| b299dc4ded29a226daac07f195d1558e660d2f9f |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove redundant clear()"
|
| 505c529b2be910a7c5a814799b2e65af4b5dc941 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix includes"
|
| 2135dad4a542e4702e4b2d87f0eb05571ff64b57 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "AudioTrack::setVolume check range"
|
| 362c4e697d8e9c034e964ac7b40227e054491547 |
14-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Audio C++ comments
Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
nclude/media/AudioTrack.h
nclude/media/IAudioTrack.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.h
|
| 2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c |
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.
|
| 910782a65a6fce8446cb52ed635d7d702f5fddc3 |
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.
|
| 26c2a6bf34b370d467cab4753e5a4b187ba62c0f |
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.
|
| d1d8f23dde239289ba8c0de0944baaca3586c880 |
08-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Fix includes
Remove unused #include dlfcn.h
Add #include String8.h
Forward class declaration is only for references and pointers.
In this case, we need the full class declaration,
and were incorrectly depending on another header file to do it.
Change-Id: Iff65cceb3982698cc1ebaeec405695fc190c03ff
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 91eb8bfbe253a6b6fe1aa23fb884a601c28991c4 |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Remove redundant clear()
Change-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| ec1d6b5e17281a066d618f7fcd2b63b3ce11f421 |
12-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Use const char correctly in AudioFlinger
Use const char [] instead of const char * to eliminate unnecessary pointer.
Make the array audio_interfaces also const, in addition to the strings.
Change-Id: I31f33d1dcb9a657ee136f4280fd2d46492496831
ervices/audioflinger/AudioFlinger.cpp
|
| 9054897ab9ffb307fadae81b774a1fc61cb542e7 |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Remove unnecessary this->
Change-Id: I72038f5d4568f0633d3e4ab90f4b67e2dd22c332
edia/libmedia/AudioTrack.cpp
|
| f0c495012bad92230604a9a12a907812ec49ee8f |
30-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
AudioTrack::setVolume check range
Change-Id: Ie182bf0f741f1f49f68c02a1e7437a2a34d34fc5
edia/libmedia/AudioTrack.cpp
|
| 785ee06d106cd7958e0c151ebc6b7174d9ba861e |
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
rm/drmserver/DrmManager.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 7dede876998ff56351d495ec3a798c1b131193e8 |
13-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Use units after all times
Change-Id: I48d3f29c37228b5d03189e4c9600824c9360cac9
ervices/audioflinger/AudioFlinger.cpp
|
| 5805f995ef365bf00fcccd5c1f948086c17ec75e |
14-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 16bdd1e6: Reconcile with ics-mr1-release
* commit '16bdd1e65ef19379bbede40c38de2e9f816ba35b':
|
| 50845c903200fbf5e1e61012376516931e945e4c |
14-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
|
| e4fe3a4f41f296ac0471152542fcfd904ee50b0e |
14-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| f4ebe8bdfa7e94d7613a4acfc1fb5f6c747bebd3 |
13-Dec-2011 |
Andreas Huber <andih@google.com> |
am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '22e50edddc2a13fa9cc00f7cc5a5f6471cbece24':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
|
| c8e9af4a16dee47bb47f1e3577b48806e3f542af |
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
|
| d17ce3f8c06b9dec0f20075043a7806cc0224e1b |
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
|
| 19e9d0fe6dc3ff4fb1807fee2ad058bf3277e883 |
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
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
|
| 6d3deeede48d298f95643a98e0bb8636bfbe906e |
13-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am da296533: Reconcile with ics-mr1-release
* commit 'da29653305f299d6390492333a6360cfa78665d9':
|
| df4856c3e34231ba0998814cd1c4d9e33dd929b6 |
13-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
|
| 5061489994828273312d445e7b52aa5a337e4ea0 |
13-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 25b1e93b052ed3590c1ee4d03476c242187de36b |
13-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 40375099: Reconcile with ics-mr1-release
* commit '40375099d10139b6c96c1db8b8295874d60c712e':
|
| 50a44951baf856cda679e78947e369ce923a6517 |
13-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am f14dc291: Merge from ics-mr1
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
Fix drm enumeration order, resolves failure to play forward lock ringtones
|
| fec2284d520fa2856358692095a715678225abcb |
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.
|
| d1b9f44fccd387abbc42b6923b2b06ac7db1aa05 |
13-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 175d5d76: Reconcile with ics-mr1-release
* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':
|
| f2d86c8afe5e80bc178c1758d41b7bf154960318 |
13-Dec-2011 |
James Dong <jdong@google.com> |
am 406dd5d1: am aadbd80b: Fixed the false drm recognition.
* commit '406dd5d1e48752177753666867403542e1f400ca':
Fixed the false drm recognition.
|
| 837b8184e1307991578de5d5d25b62a67bb225f6 |
30-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Delete obsolete includes
Change-Id: I960a179a026ff8d710b43b64cb358f18ee04de16
edia/mediaserver/main_mediaserver.cpp
|
| c48d98adbedca37b596af9a8b460de7e2eb0a89b |
12-Dec-2011 |
Jeff Tinker <jtinker@google.com> |
am a5cbf023: Fix drm enumeration order, resolves failure to play forward lock ringtones
* commit 'a5cbf023e349f2394ba6fc58d73b4375cfec4369':
Fix drm enumeration order, resolves failure to play forward lock ringtones
|
| 6af1e76b61d04ed524b570f92091680a851207df |
12-Dec-2011 |
Andreas Huber <andih@google.com> |
Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
|
| 956a9787cfaf429f951549df6e587c6ce4ac20f8 |
12-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
|
| 2a82a3a8824904f4e6750eb18dcc33ed113edbeb |
12-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Merge from ics-mr1
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
|
| d2927a79dc933a134e022281a4679a65e340dc3a |
12-Dec-2011 |
Owen Lin <owenlin@google.com> |
Fix the build. (Change LOGV to ALOGV)
Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
|
| a9d421d3c05b98ee5481428ca3dcb3e3245140ff |
10-Dec-2011 |
Jeff Tinker <jtinker@google.com> |
Fix drm enumeration order, resolves failure to play forward lock ringtones
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
rm/drmserver/DrmManager.cpp
|
| a3e52a846f1e299c4b205e2da698b184591d618e |
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
|
| aa5ba9a27f4c483ee116b7b296a681f4f8e23e62 |
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
|
| 7e2afc451825028bdeb43e60450a730a4290dfd8 |
10-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 4aae77cbe1bf4369910314a55c2bc2349af10d3c |
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
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
|
| e154d13b47d7a2bf5968a7c6070da15814d3c544 |
09-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 54854d31: Reconcile with ics-mr0-release ics-mr1-release
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535: Lockscreen...
|
| 4cfdbf86ca4f8c9401490da01892aee8a49b2bdc |
09-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 576bb4a6: Reconcile with ics-mr1-release
* commit '576bb4a63f925ef5862eedb6428ba890f0ad1054':
|
| 901e78d96eec495bda0dbe2e2b73009951301817 |
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.
|
| bb006eb1ccdf9428d45aa9a2d8df662d53dfe0e2 |
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.
|
| 736d8141e8f060c79c297c5447cdbe2c7fa9e231 |
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.
|
| 7e976e926dd8085a64a7add97ce09bfeca26e088 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 254868809d7df841112209fcbf5c191cce013f81 |
09-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
|
| 0de434f36f7610e6652604f4b7ca7c778757eeac |
09-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 1da7ad123ccee937a52b833d80ea8ddf462ad9a3 |
09-Dec-2011 |
James Dong <jdong@google.com> |
am aadbd80b: Fixed the false drm recognition.
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
|
| 63aeaee9e1e3318ceed0a0955b46f0f0e35f5f2d |
09-Dec-2011 |
James Dong <jdong@google.com> |
am aadbd80b: Fixed the false drm recognition.
* commit 'aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
|
| d1fa3ca0eee42ffd450d579b357f39163a716ee3 |
09-Dec-2011 |
James Dong <jdong@google.com> |
Fixed the false drm recognition.
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1
related-to-bug: 5732033
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MediaExtractor.cpp
|
| d9ee7329bedf754add88e6f7cb20e1814db0f6cc |
09-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 3b42170d4ceaef29daf6fef51c06dd3d88d99a67 |
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
|
| 62c54ce5b09bab16dfabf18cc1f2dc1d9b35acf8 |
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
|
| 9ee47a064243b3b25ca6aa697975806b178ef466 |
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
|
| 7c7ee7bfc530307a3695c036a632c199251cbbe2 |
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
|
| b7b9c7b47a771e550124ae269a7b1be262039b95 |
08-Dec-2011 |
Andreas Huber <andih@google.com> |
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
|
| ee736e9e74c5368db8d63214513c85cb74bb0183 |
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
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
|
| 1906e5c7492b9cbc88601365536a69e9a490c963 |
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
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
edia/libstagefright/foundation/ABitReader.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 390b7b4e6137ad04d7c36e63e0da6ab5c5fd7aba |
08-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I409eea7f746a37d96ba1af9b60488d93e7e39d96
|
| 68c79e2bd8fce31fd826c2dd93ed639984c71cb2 |
08-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
|
| 089e65452bfe40a9f34f36be377795d175bde10b |
08-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| d276313bf895a6810404123c0affb4b7a6a07582 |
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.
|
| 34ae954bc7a45310eaf7accb49bf088f801eda23 |
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.
|
| 894f3ca9a9f94225bb64f36847508a91d0b17a6e |
08-Dec-2011 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
|
| 8e49b604c806eabe3eea2bd24813cdfc4b87c64c |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| eebeceec684a36222b4559e3157b0db04c0a67ed |
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.
|
| 59a6c2874abdee0123aba4d251d0c81df393efb8 |
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.
|
| bf6baf751f855001e92ea3da020dffb3bb7c1501 |
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.
|
| 2c170cd8e308712674edd2cc7eebea70359d4951 |
07-Dec-2011 |
Dave Burke <daveburke@google.com> |
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
|
| bab412099ab1bd3e9e942453cbb42c87ea9a59ec |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 78829cbcb747ac2c5946949d9661d249ac5adfed |
07-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 3de8d36b: Reconcile with ics-mr0-release
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
|
| a9676a82efbec4a46db8e5e58f0f701c7f7d6e05 |
07-Dec-2011 |
Andreas Huber <andih@google.com> |
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
|
| fa19c45913900baa6d3ef50fb4d2048684b63906 |
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
|
| b26d97ccbcbf5aa07f4d5ead9c77cdd46d3263e2 |
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.
|
| 43afd557f8b4b87561321135cf284b14e87c2bc6 |
07-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
|
| 36d4f8f2a5929d181deccb73332372b0a412bea6 |
07-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release
* commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
|
| 1b37b40f3c39863ecc6c404b177fc0c961f32dce |
07-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 3de8d36b: Reconcile with ics-mr0-release
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
|
| 0c4ec128aa324f99f726a314bd97e8a581f22ec5 |
07-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
|
| 44bec2e1e2072ebaeeb96bde2c639c48beae1bf9 |
07-Dec-2011 |
Narayan Kamath <narayan@google.com> |
Merge "Allow data uris to be data sources"
|
| 1add6848e09a89d0828a0117d0dd9bb2b2341000 |
07-Dec-2011 |
Andreas Huber <andih@google.com> |
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '92860d5d4681e684d5f3936137c6c067c950121e':
DO NOT MERGE: Remove the AVI extractor.
|
| 434e86339ecbcc93c85617f760661c765199e118 |
07-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| fcab2a8d5644875361f39f271fa9ffde59709c07 |
07-Dec-2011 |
Andreas Huber <andih@google.com> |
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
|
| 75e7c07412f0dc55633dd0b81d4358ebe307eb0f |
07-Dec-2011 |
James Dong <jdong@google.com> |
am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '49782b8100a752056f044f6f3f1cf16a6a1f03b4':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
|
| 51a841af801adf360842b1de48f9564af2c1cb25 |
07-Dec-2011 |
Andreas Huber <andih@google.com> |
am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit 'c4738293527618f9a228c3f0f645c0a0704ada9c':
DO NOT MERGE: Remove the AVI extractor.
|
| 72936144fd16d6d73b7383b634d53909f4887d2b |
07-Dec-2011 |
Andreas Huber <andih@google.com> |
Merge commit 'babb7200' into manualmerge
|
| 01fe81c26d27af4d2e24482dcf2b910d983b0f7c |
06-Dec-2011 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaExtractor.cpp
|
| e5bcf5c6572bb5190ee8394619e936ffb61db14d |
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>
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
|
| 78074d5dc8122d750d97065a6d5ec419e26350d4 |
06-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
|
| e74de52d4e22fc61d41f703672fa8f1215446ab5 |
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
|
| 4a5110810e7d5b833f08cca3855225521a20230c |
06-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.
|
| f7b5cdd410cb8fdd46bac5b5098e0f01442bba12 |
06-Dec-2011 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaExtractor.cpp
|
| 62157c64096fe7065d4f99ad21edda41b208a808 |
06-Dec-2011 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaExtractor.cpp
|
| a2ad6febe24bb7baf544c7ba100ab76e55547f7c |
06-Dec-2011 |
John Grossman <johngro@google.com> |
Merge "AudioFlinger: Make StandbyTime configurable." into ics-aah
|
| 725dfe996b2b23fe78b4d92718401406c510a32c |
05-Dec-2011 |
John Grossman <johngro@google.com> |
AudioFlinger: Make StandbyTime configurable.
Make the standby time for AudioFlinger configurable using a system
property. Default AudioFlinger behavior is to go into standby
(allowing the audio outputs to underflow) after there has been nothing
to mix and AudioFlinger has just been pumping out silence for the
configured standby time (which defaulted to 3 seconds).
Now, by setting the "ro.audio.flinger_standbytime_ms" property in
their platform init.rc, platforms can override this default and
control the standby time. If the property is missing or malformed,
the old default value of 3 seconds will be used instead.
Change-Id: Ic9fa8b5f5bccee493bc72c65e408d3fd8ddd1059
Signed-off-by: John Grossman <johngro@google.com>
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 6c83e3be2921009ff7dcfced2a3eda7811b8b041 |
16-Nov-2011 |
Narayan Kamath <narayan@google.com> |
Allow data uris to be data sources
bug:5571010
Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
edia/libstagefright/DataSource.cpp
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/chromium_http/DataUriSource.cpp
edia/libstagefright/include/DataUriSource.h
|
| c50480791ba002f3a77a870c9dea8416ee924c8f |
06-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516
|
| 5f14e44ef801dd2c3e35f816bdc8c709482d8ebb |
06-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 2013d4d159bfc29b4143d3b5fd4735f51a03684c |
06-Dec-2011 |
Eric Laurent <elaurent@google.com> |
am 5433e25f: am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '5433e25f6ce013860ff2a074ad8d1158cc39ab91':
audioflinger: fix audio skipping over A2DP
|
| c4ce69a593d3e565877163a8703f72aa6b451a38 |
06-Dec-2011 |
Eric Laurent <elaurent@google.com> |
am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
|
| 047b630795d17f847a71298eb8d9008e61afe20c |
06-Dec-2011 |
Eric Laurent <elaurent@google.com> |
am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
|
| 9e603e057d6cc80e6b7e948b9af13b1a7b736008 |
06-Dec-2011 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
|
| 223e70d6bde101349cba04b20ef243730cf84c07 |
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
edia/libstagefright/SampleTable.cpp
|
| 456caf3f5f0af673dc120c17c23635f40d8f5ac2 |
05-Dec-2011 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 07bacabe to master
Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
|
| 1a733a33e1428f577747fcd74dccd8853bd1b29f |
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
|
| 369c3a57543b6abff69f91a8e5c5c48970dffaf7 |
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
|
| a0f2bf56e30f580535229fa6a58e7d48b762727c |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/SampleTable.cpp
|
| 162b40bbaf3c3a24f61a6636bef6f80a9c0a31dd |
05-Dec-2011 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix audio skipping over A2DP
The maximum sleep time allowed in the mixer thread when audio tracks
are enabled but not ready for mixing is derived from the latency
reported by the output stream.
This does not work for A2DP where the latency also reflects encoding, decoding
and transfer time.
Modified activeSleepTimeUs() to take A2DP case into account.
Issue 5682206.
Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 467a3f3ea4830b4f4d9cb5b68f2f6ee638648801 |
05-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I50ea08700096cc77b6af3838bb4adbc21062de1c
|
| 2158db000d227875b12c85c850ec6e3039553f9b |
05-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
|
| 0cb4b9a6aa1f1f28b7b5d3e02b1d7fac70817b0a |
03-Dec-2011 |
Mike Lockwood <lockwood@google.com> |
am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
|
| 326805adc3be4936a26c60be107c205f492a82e1 |
03-Dec-2011 |
Mike Lockwood <lockwood@google.com> |
am 7bbc3c4b: (-s ours) 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 '7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
|
| 36126b2f17223803c981e4ff7bca2d751d971753 |
03-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 51ecb2eb5ce2a2a6fcf05c1a372242686ce7c787 |
02-Dec-2011 |
Hong Teng <hongteng@google.com> |
am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.
* commit '38ca8aaf3ad045d8623bce0be9b351ae9004abb3':
Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.
|
| 72028075d3d8dc65a8ea28a0364bd1a5b7df5fee |
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
|
| a33b7d94103696702e40533c6a0b8043e66498af |
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
|
| fa845c6d4637fee51b34d9c1cf06db42b97ac0f4 |
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
|
| 7570af16ad9ad892d9cff6d733d29a25d736586d |
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
|
| fed8bb604c31bf6a60ca84aafed016d21d3e0f90 |
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>
edia/mtp/MtpServer.cpp
|
| 8af4c7d02fc484ed1bdc082fc2a5383bc50f2180 |
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>
edia/mtp/MtpDataPacket.cpp
|
| 53ea28aa02caa4963f376254299afdf6c1de9765 |
02-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| f8a303a7057aa4126f7a0c11355c86ffabc03be5 |
02-Dec-2011 |
Hong Teng <hongteng@google.com> |
am 38ca8aaf: Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.
* commit '38ca8aaf3ad045d8623bce0be9b351ae9004abb3':
Fix for issue 5490443 Native crash while exporting a video Handle the decoder error case, this modification is to fix the native crash.
|
| 651d4c66a0abb26e32a32d40d90988e98fe7f824 |
02-Dec-2011 |
Mike Lockwood <lockwood@google.com> |
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage"
|
| f9632207ec3fd477bfc5cd17a5950a21600b628c |
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"
|
| a9a46c1f53129be8fe1f3f0a6ea868d7b4c8f8f7 |
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>
edia/mtp/MtpServer.cpp
|
| 48bd916ffef341335237a4fa54d69c9deab1ab3c |
02-Dec-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I1c603308272f9b00174c3f9046171e069ffee566
|
| 42fb390d04ae77ff72a1ff41d32be04079b3c98b |
02-Dec-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 44c190826d72589f5c9e13d69e32673bd8bd7c64 |
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>
edia/mtp/MtpDataPacket.cpp
|
| 17078d8a83becd5bfb49a39f1415882b78d07a49 |
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
|
| 1d26d11ebdc2cd53691b868e7dde844a708896a1 |
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
|
| d7217d71683c6643b2608032cf1cd38e10a6b2c7 |
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
|
| 4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f |
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
edia/libstagefright/AVIExtractor.cpp
|
| 00b82d39c6d1b4e0594857ef5113f46775c4a065 |
01-Dec-2011 |
Hong Teng <hongteng@google.com> |
Fix for issue 5490443 Native crash while exporting a video
Handle the decoder error case, this modification is to fix the native crash.
Change-Id: I3f2ef62b591ebfb9e01153b80b04eb330f575207
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| d7689b475da6e17bd96518581d6868f8adaf4792 |
30-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I49813a61d932c0d7b0562f8706292494c4c04e9b
|
| 2c0dd961d42ad75529a557240ed570f97b237d2f |
30-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401
|
| cd9e929c8490d1410e6d99c9b54585cb2fea569c |
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
|
| ea9d51bd710e6739077a3700f27a1c37767a2f6d |
30-Nov-2011 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 3d630e86 to master
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
|
| 2907dac07c264b45d43b44d304fbe1865bd8c41f |
30-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 37a153f450cb8550fe64a1bf62366cf5e944d6ab |
30-Nov-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add camera focus move callback."
|
| 7a3a2b2f9bb9421dcf83fbd47276e57917078aef |
30-Nov-2011 |
James Dong <jdong@google.com> |
Fix the broken build
Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
edia/libstagefright/ACodec.cpp
|
| 1b493416e52241b71eec6ab875516529da6430d5 |
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
|
| 15031854d15ffcc5c955290f61aa59aa09e1fde9 |
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
|
| 21befea3720fb847aef5440d507902d8705a671a |
30-Nov-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
|
| 8afbf8e07fd1d75dfa0a517267beb6c1fa818027 |
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
|
| c089d02cf2bddf1bba6eaa2b2fcce149dc44633e |
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
|
| eca36b5a1759970bc3d0373d72d6fec7c9b7e944 |
30-Nov-2011 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 998a929a to master
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
|
| a2d54aea18b469a186a6f8112c10c963710ab154 |
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
|
| d7dbc9e610281bcdd5a1f0292e066aa2dbf749c4 |
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
|
| 4d1ba696c0b308cc5a148e8228b9ef3a9a9e48f4 |
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
|
| 65879b6ff9b3e3f254b33b29c91c1f6db5271faa |
29-Nov-2011 |
Andreas Huber <andih@google.com> |
am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
|
| 8a1fac32b307cfa096b343f219d471365b657ad8 |
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
|
| b96d3c5195b148c0d695a326fa9c315561d787ef |
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
|
| 6bf045c85526312b198733ac8113cc213c8d79c9 |
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
|
| b19386fe52b727524de59a7673b2f56b2e707d51 |
29-Nov-2011 |
Andreas Huber <andih@google.com> |
am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
|
| 7609b2304379fd6d3e5c8d13a34c680441dc48b6 |
29-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Make sure we can properly shutdown even if" into ics-mr1
|
| 5274010d068b05333e3e5544d59ca284802b1a8e |
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
|
| 544ee287d01d98efbe9eeeaeb7016c8dd55e3748 |
29-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
|
| bfcc8d8ab7c56bc013bd221a29e1ecf3a6390813 |
29-Nov-2011 |
Andreas Huber <andih@google.com> |
Updated (internal) API for IStreamSource to signal discontinuities
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug: 5553055
nclude/media/IStreamSource.h
edia/libmedia/IStreamSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
|
| d620506220a15177942a8168d09c517740e908d0 |
14-Nov-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add camera focus move callback.
bug:5534973
Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
ervices/camera/libcameraservice/CameraService.cpp
|
| 6e3d311b6631b12aac2879d1b08c3534aece78b1 |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
|
| b58ce9f5e8d0696f9571a94ba5fc05f4500f663f |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
|
| 404a123bed7f180724ead17f10e037b3eb347701 |
18-Nov-2011 |
Mathias Agopian <mathias@google.com> |
split ComposerService out of SurfaceComposerClient.h
Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
nclude/private/gui/ComposerService.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| c9260c15c1e7e2743039c964b8769379a3fff332 |
28-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Make AudioTrack a RefBase so wrappers not needed"
|
| 9053a58eb870f3d9a623a8a9117f900a45fd3a96 |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| d748311537c4856433afa6f812945b2c1a1bcb74 |
28-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| d3d822204249eaca4259bdf46f6f0357b96e8e21 |
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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
|
| 926798f8c21ab002d9797ef8973852a2612c1f75 |
23-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit 'f6422f5f5d04aab47f8f36a0ea92e2140bed0105':
audioflinger: reduce sleep time to avoid underrun
|
| 3aadf3a399dc9d14ed85c09c30d4726e2c90536a |
23-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
|
| 48679acff8977bf8e378478882f1a32cb77a5a77 |
23-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
|
| 7cafbb32999049873d4746ba83bd20c88abe6ce6 |
23-Nov-2011 |
Eric Laurent <elaurent@google.com> |
audioflinger: reduce sleep time to avoid underrun
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.
Issue 5553055.
Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
ervices/audioflinger/AudioFlinger.cpp
|
| 1d2ad70cb27c16709ebd74ae651c47f57abfedb0 |
23-Nov-2011 |
James Dong <jdong@google.com> |
Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."
|
| 8c3ddf9442d04cf19dba88381fbbb53d587d5979 |
22-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
|
| a1f988df2d273b716fd36f888c228fc94143d237 |
22-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 6f26d10ee6c337112ee5f968a436ac0ee9c6352f |
22-Nov-2011 |
Hong Teng <hongteng@google.com> |
am 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
* commit '8e61113210e4c3c1ce57ecef1dda327bea85c19c':
Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
|
| 8cc8c7dee7c4ee9f05874d20c1664645a4657fb5 |
22-Nov-2011 |
Hong Teng <hongteng@google.com> |
am 8e611132: Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
* commit '8e61113210e4c3c1ce57ecef1dda327bea85c19c':
Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
|
| a7e4865306b72e8eb97ee73719c897c432c53a0c |
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.
|
| 1a316cee915740189465fda64b2a11cd6403b632 |
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.
|
| a0c986cc09531e208af17e62ea6f0f47841705cc |
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.
|
| e933cb5ae546d023ab756391a135c170874e7901 |
22-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
|
| 0e0c3220ee1c4d57765e2cba3b07923921c55e08 |
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
edia/libstagefright/timedtext/TimedTextParser.cpp
|
| 7c56bb3ac1fb758a222a0c23805704a2789657b6 |
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
|
| b8813d07df166e26d126184c77e870169d975790 |
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
|
| 88b00e9b79a0242251435b399971be4ca9738395 |
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
|
| 4c57986f963c81fc7c2455deb113c9b32b135468 |
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
edia/libstagefright/SurfaceMediaSource.cpp
|
| c8d53b6147249440e6b99f88adc795ac82e1a050 |
22-Nov-2011 |
Hong Teng <hongteng@google.com> |
Fix for 5638097 KenBurn generation time increased from 19 secs to 30 secs
-Remove the additional transcoding for kenburn video in video editor saving phase.
Change-Id: Ia8721ba75d4b7923db0f483bf30209c6fa40e4bd
ibvideoeditor/vss/src/M4xVSS_API.c
|
| e8e5f86e9e310b065596c8cbbca1543eb833dee1 |
20-Nov-2011 |
James Dong <jdong@google.com> |
Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f
related-to-bug: 5626569
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 2fde76bdc548b4a54e8cafc4e9f8ac33245687ba |
19-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I90ea8a02a4bb9b357d7bddfa1a02602d3de839fa
|
| c637289fdfbea45a322601ce74f743595c477339 |
19-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
|
| 7383d41aa2821544efaf55d57ff55ac5358a8a19 |
19-Nov-2011 |
Marco Nelissen <marcone@google.com> |
am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != bool
* commit 'a1cd09e0e6a239eafa5112c0e8a09b7efc154a78':
status_t != bool
|
| 26900df26fe5b55ddc804df097162ffbd9b81d0a |
19-Nov-2011 |
Marco Nelissen <marcone@google.com> |
am 7ff7821a: am d4b22ab4: status_t != bool
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
|
| 863992ab17511fb2550f0347b59065066dd6f8b5 |
19-Nov-2011 |
Marco Nelissen <marcone@google.com> |
am 7ff7821a: am d4b22ab4: status_t != bool
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
|
| 6f5cc45c48c02173bfae8d54b54a92c9bae256a1 |
19-Nov-2011 |
Marco Nelissen <marcone@google.com> |
am d4b22ab4: status_t != bool
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
|
| 91e2c7d2988c4947aca8a637f88a2179d905b970 |
18-Nov-2011 |
Marco Nelissen <marcone@google.com> |
status_t != bool
b/5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
edia/libmedia/MediaScannerClient.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 153cefdf4acab25355f590d7760ebf73ef6096a9 |
18-Nov-2011 |
Marco Nelissen <marcone@google.com> |
status_t != bool
b/5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
edia/libmedia/MediaScannerClient.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 71b61a960ae30df990976ca5dbe780d85a15b0d1 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 0c5ce9b35aa34688bca86b93beee743b6ff250df |
17-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 5522189 re-enable ARM opts but disable inline"
|
| c23e2f2464eb3748599d47af7d8986b856f3c179 |
17-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5522189 re-enable ARM opts but disable inline
PIE did not work together with inlining. This change combines (almost
all of) the performance benefits of ARM optimizations together with PIE.
Change-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256
ervices/audioflinger/AudioResampler.cpp
|
| 60047ae30cc816e98ddb4b0b48e58c34c3d1f486 |
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...
|
| 6402ec10dfa1687a147c94167dc66051ca27bb87 |
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...
|
| 7f2bec1f9b8acc105a5779b18ab180dbe59a1b00 |
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...
|
| 6479b955d21707609eae70008cf7956dddf12371 |
17-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
|
| 1de4e2e1d7c22a31238e448200cbbe667cd5fa4c |
17-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "MidiFile uses C++ Thread not createThreadEtc"
|
| 528312c36a3ded860ead1a512df51663d03767ff |
17-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "JetPlayer uses C++ Thread not createThreadEtc"
|
| aaa12ed10abb5d8ed6a1a939885114d1c87c9b7c |
17-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| c57c82e19eca3e24ebd060f9c41f516a85538c19 |
17-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 4dce941e: am 816e68e2: No-op merge from ics-mr0
* commit '4dce941ecec71aa999cf777a43f05821793b6749':
|
| 90100b5573f95e8404c6e2917520e090fe8b49fd |
24-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
MidiFile uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiFile.h
|
| a23856c0ad1f49a6ebcb71d3f63f329edc999a72 |
24-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
JetPlayer uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
nclude/media/JetPlayer.h
edia/libmedia/JetPlayer.cpp
|
| 879135196fd1c97deefc538c888037c56c2879a7 |
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
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| c34233e673c9791e137456d0c427d58db184b690 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 185b1e367397ac1364c233e391cd4e2889df5bd5 |
16-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 816e68e2: No-op merge from ics-mr0
* commit '816e68e2fddd56c34f864dc5647801117a51720b':
|
| 8964aadebe10e872b078f0821389b00cd5ec4e87 |
16-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 816e68e2: No-op merge from ics-mr0
* commit '816e68e2fddd56c34f864dc5647801117a51720b':
|
| 7b81bc3b06bcf0a6d571d08453751987106df46f |
16-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
|
| fd8f534c7389e8215671a36a02c4666321f8816d |
16-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
|
| db3d5c567abd752dcfa25f91f35c051ca0390efa |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 6c3bc9338fcfb182d4f829a56405ba2c4a47a89e |
16-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 83a4cc4e3a404a02fa4af496ff48ee51581fb098 |
16-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
resolved conflicts for merge of fbb122bf to master
Change-Id: I607e6b11e925ba858d2a0856117e2fcb68bed963
|
| c8114b1c3e37399a202c68dd856dc81fd28d0b17 |
16-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am fbb122bf: Merge "Fix 5607624: Native crash in movie studio while previewing the movie" into ics-mr1
* commit 'fbb122bfb2615f007a8b321d553669e8ff56c40b':
Fix 5607624: Native crash in movie studio while previewing the movie
|
| 482cedda9164b9f376dbe47644e33eb07db5b996 |
16-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5607624: Native crash in movie studio while previewing the movie" into ics-mr1
|
| b68a91a70bc8d0d18e7404e14443d4e4020b3635 |
15-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Make AudioTrack a RefBase so wrappers not needed
Change-Id: I2305abe586ac41251af04a194bc818c110a1b293
nclude/media/AudioTrack.h
|
| 5c052218128013d630b4d9a84393ebfbff11f3e8 |
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.
|
| 3b8c0478e92f0c52a3bb2eca2d34effd04cf61e7 |
15-Nov-2011 |
Hong Teng <hongteng@google.com> |
am 811c53c5: Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
* commit '811c53c58a870397f2864003dc21d5799a422b26':
Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
|
| e7cf4ee4462bfcfc4e99c0b059ee525da12173f8 |
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.
|
| 20ad2b6133af0ccb2bc11f7b4dc949d8ec07eaf6 |
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.
|
| 29aaef16d26dd6a78f7da22121e8167ac36c9347 |
15-Nov-2011 |
Hong Teng <hongteng@google.com> |
am 811c53c5: Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
* commit '811c53c58a870397f2864003dc21d5799a422b26':
Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
|
| 9621addc73c029e77fd3d50f38a34f8f264b6e38 |
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
|
| 5ee2648cafa2884492eb3991b132fef24b2a35a5 |
15-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 2db767137112a619751b70b9947aaa064030a210 |
15-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5607624: Native crash in movie studio while previewing the movie
Change-Id: I6bc123a3da4fb071a65fe776bcba0268fa58bf29
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
|
| 3a9cefebd2c5d2157aefaed01c54f151dc64a5b3 |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| 72425b1109ddd092048b5280889f972626a61b7e |
11-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: I43c03fc626194d9ebbe8d914d9209a04bc085831
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| c4795ecad4e5a0b3ec54862a40c82ef1ba53cd59 |
14-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
audioflinger: fix noise when skipping to next song
|
| 732e23d6eb840991cf16fbbd2d3d6f16f786ef13 |
14-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
|
| 41ff78579d92e5ebca1fd7f84ce6561281a8112e |
14-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
|
| 72ae9fd9cca0af6e5c1001eeeca80841f712b096 |
14-Nov-2011 |
Eric Laurent <elaurent@google.com> |
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
|
| b0ea0f730c6715f00d22f2ad071afd474f680d97 |
13-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 544fe9b6e9325701df4ab8c1d29774fc13c4cf6c |
12-Nov-2011 |
Eric Laurent <elaurent@google.com> |
audioflinger: fix noise when skipping to next song
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.
This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.
Added a delay before stopping effect process after all tracks have been removed from a session.
Issue 5584880.
Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 78ff828e28c22715f5b6c320d967744cb4f51fd4 |
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...
|
| 73bb0b9f2922679d057e29e9f502988178554a02 |
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
|
| 516fb1dad0c434fd89624c418543d35436a5374c |
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
|
| 54500e5e15b8bc1fc646b7c79fee49ce075db614 |
11-Nov-2011 |
Andreas Huber <andih@google.com> |
am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '9a87a838028f3911a066a729cdb5ec688903a5ae':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
|
| a36d8caf15d56a75906e9cc75b5e04463c1317a6 |
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.
|
| 2b5a61f40a1b7c4dd84d7c552c81ee4829358a82 |
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...
|
| 38f5f175d9e7e07ebb986090c61368abea4568f0 |
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
|
| 9569e3b2d560a7b56b68f2732a6a111d8dede98f |
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
|
| e294ab6ecca7989316aaf64ff33bb8f7bc7c03e3 |
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
|
| 78a96239c6227997522c5e01bead7732f95e4dbc |
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.
|
| 8d3016b0b04602187f90e7a5229a15e5fc4ef25d |
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
|
| 18f9bb10922123940d1929724fcb7a45cc757c93 |
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...
|
| 1e809edd9b25e34d9c475ecd2c2e26ddc75cba2c |
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
|
| 2e56cfcbc6072342813172c4a1bb9adb3f728c63 |
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
|
| 8ae0f5562ae79fed534f12c340fdff7114c12c38 |
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
|
| 87f685560f302ec511781b2f1b688600e7ecc5fd |
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.
|
| 7ac9a9afafbc7c515a73086c11a15a27c7fd05b1 |
11-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Didn't mean to check this in..." into ics-mr1
|
| 91f230461288a2a5091182ef9e17079aabf8ebaa |
11-Nov-2011 |
Andreas Huber <andih@google.com> |
Didn't mean to check this in...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
edia/libstagefright/rtsp/MyHandler.h
|
| 04ccb823442a4dae4f418228dd28f8607f174978 |
11-Nov-2011 |
Eric Laurent <elaurent@google.com> |
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
|
| 73b1fd56d99b356b0effe8cf96ecf7446beb207f |
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
|
| 4ab3045755d33ab24bd312cfbc888f300c5e01f9 |
11-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
|
| 4c5f7e33c26a858fd61438e3c1aea5c196a770e7 |
11-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
|
| 023132eac2f2e2e0aa8859231cce1a6d324242fd |
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
|
| cb432e65fd876b8b210f548c07b230517450b3b9 |
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
|
| 0bb80204f457e1f948e47abacd86fae9ee687de4 |
11-Nov-2011 |
James Dong <jdong@google.com> |
Merge "Adds handler type 'sbtl' to support subtitles in various containers."
|
| 29c6bf87465a20ea1dc65a5b32d90380e232ca4e |
11-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix log message"
|
| 0fbe0577cfeda28bd016110e670708cce0752044 |
10-Nov-2011 |
Andreas Huber <andih@google.com> |
Disconnect on socket error on the RTSP control connection.
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
|
| 40ddcb7150a31052ba20878454426dc3572b7acb |
10-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Fix log message
Log did not have a tag, and was wrong level
Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
rm/drmserver/main_drmserver.cpp
|
| 4977479ecb0f3b69017aba22e0bd850c54aa5bbb |
10-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
|
| 19de627354d465c4e9ccd1fcdcffd132861330b2 |
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
edia/libstagefright/rtsp/ARTPConnection.cpp
|
| f0c86a83c687074be79397e082e3775ca56641b1 |
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
edia/libstagefright/rtsp/MyHandler.h
|
| 4948818cb91176df74c972ac27b2f392b5d148bc |
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
nclude/media/mediametadataretriever.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 7cad0b48243f86c516181d09185dc83223ae51d7 |
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
|
| a585407bd04f2f4189dc393fc7e3f7f58d4f1a7a |
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...
|
| e9a919b178a75f4cb70322c02c9c8e2756fb5ea1 |
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.
|
| 3df40a093d8d3d211f693e0e3ef4076750cabfea |
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
edia/libeffects/visualizer/EffectVisualizer.cpp
|
| 719b23faa1ce43e749ecf245f030bcdf2d2d7f7d |
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
|
| 52c155208d8bb7ef2b885494e0583226c02de0e0 |
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...
|
| eda3ab0b1767638c8331ceaf6f7e0adc2c31b50c |
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
|
| eec2d81676a50338763b86073545a5365d19eee7 |
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...
|
| 7f438868794d83cb560c0852e7c7acd3124ceaa1 |
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.
|
| bb3e9ebcc7fd5823164b54835b56371f317189bb |
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.
|
| 1dc0ab1d2e2c5f40193556ad1239e304563f3083 |
10-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Send RTSP control connection keep-alive requests" into ics-mr1
|
| ca957d753496aff94dbb93b547e1c605bbfa064b |
10-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Don't believe the PV decoder's lies..." into ics-mr1
|
| d57a4ddd1ab42401c4a011df7e9577b843de1b68 |
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
|
| e26dd87f87be5016777bf92e498a26d545d3926a |
10-Nov-2011 |
Insun Kang <insun@google.com> |
Adds handler type 'sbtl' to support subtitles in various containers.
Change-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1
edia/libstagefright/MPEG4Extractor.cpp
|
| 32beb277bc4d71cb587258e8195dcbca2da84ed9 |
10-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
am 874641f1: am f2c2b1c4: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '874641f1331f3b37e8b2d930ed942fb6ca522501':
|
| 6977ca7d5ffdbc1610a95c74653b1fbe6a665f32 |
10-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am db7d79e6: am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit 'db7d79e6f1e1860a9bfe4756a03c753435fd0ddf':
Fix regression for SoundPool playback
|
| d9f9f24db6f55f4743ece9965d4ece5f33d1b7ed |
09-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Instead of asserting, remove active streams if their sockets return failure"
|
| 8c308ffd781132c8417cebc3bf77c2e56a464e0b |
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
edia/libstagefright/rtsp/ARTPConnection.cpp
|
| fa1e6f99cd4f2e23e23dbbb1fd43041fcd32fe9e |
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
|
| f2c5aff16e0c654a697bbf2a17f862d3a953e233 |
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
|
| 0990dae8a2808e1c896a2ca692145432f30e0014 |
09-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
Fix regression for SoundPool playback
|
| 2961a85f5f00343c115ac8e5dc17de631694fb6e |
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
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.h
|
| d7292d5796d9ae1f288a0273ec54f8041536a536 |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 0029faf8f4efbca3844c4174b75d46c432f8f272 |
09-Nov-2011 |
Andreas Huber <andih@google.com> |
Don't believe the PV decoder's lies...
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
|
| 0ac360ef0c2a54f204c2038bf126425adb2258ea |
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':
|
| b5d340314ac6da461f15fe4d1db996ae28770d67 |
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
|
| 12edddb3a54c49422bff90b3939b55807844dc4e |
09-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am 2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit '2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
Fix regression for SoundPool playback
|
| 756961c16112aa684511b55b72345d3b4ddd1df5 |
09-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 32f0a8c022fa733aa721c607df330a5d4a0a1b32 |
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
|
| a47b69c6f7c6fe0044ebcb2d0790ce3548de56fd |
09-Nov-2011 |
Eric Laurent <elaurent@google.com> |
Fix regression for SoundPool playback
Commit 19ddf0eb introduced a problem with applications (like SoundPool)
relying on an underrun condition to detect end of playback instead of
stopping the track when all data is written.
AudioFlinger would keep waiting for new data in case of partial buffer
filling and never reach the underrun condition.
Added a mechanism to wait no more than once if not enough frames are present
in the track buffer.
Issue 5585490.
Change-Id: I131e605ff6070831a01ddf734e68459e3bf2354b
ervices/audioflinger/AudioFlinger.cpp
|
| 908dbdee96856693decc04fa143c2ba525495d43 |
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
edia/libstagefright/rtsp/MyHandler.h
|
| 471af5aaea2d2491a77dba379771f7c96b9ca3c3 |
08-Nov-2011 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 26f70db9 to master
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
|
| 1e2c4152878a400cbd6d1ccf148ba1e0f6582c11 |
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.
|
| 0f31bfac8cc3317a1f96f7c2bb1cf3941c5c148c |
08-Nov-2011 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of f3a892ab to ics-aah
Change-Id: Id9c0ef089d4ed71dbf69c5969b36f9ac44a25ad3
|
| 936a981ba15d528a023311aa32f46446813551d9 |
08-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Remove surface legacy APIs and code." into ics-mr1
|
| 3b86c964df855a9740c446e984309b719c3ec37c |
08-Nov-2011 |
Eric Laurent <elaurent@google.com> |
am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1
* commit 'f3a892ab9347ce733b81ccb4913a91c586f8f367':
AudioFlinger: mix track only when really ready
|
| e1a8a719c7c62fdb337b71f68844ae20042c2b79 |
08-Nov-2011 |
Eric Laurent <elaurent@google.com> |
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
|
| 18c6735b7ca7899003dd540eb4e91f7f0474ad7a |
08-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 6a9ab553ebd36705d3edacc6deb6a27dd6b799a3 |
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.
|
| c0d3b9a32e04a9fe1e88097be8785d8055397232 |
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.
|
| 49e82712b2b7072bb8b8d6e2c86115eaa82e9943 |
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
|
| 78df57fff35a38ab6d68526d340b2853d25721ae |
08-Nov-2011 |
Andreas Huber <andih@google.com> |
Merge "Use binary search to discover closest sync sample index, replace"
|
| 8f76ebf90d0391a4baa8a921ed6e291dfc7891da |
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
edia/libstagefright/SampleTable.cpp
|
| d3011ec5d392996849dd1a62c42832155f46acf2 |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
Fix a leak in Parcel::writeBlob.
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
|
| c72b01f32784093b2061e2089753dce9062c0c32 |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
|
| 7a56a69a3f8ba774d3e276ad26a14d020d516073 |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
Fix a leak in Parcel::writeBlob.
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
|
| 197388e5f42fc21175a03e3abb05020fabbcbb71 |
07-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
|
| d005007c4b8c944b33a57b6db4e6ecb7f8f07a4e |
06-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 45b92707d851458c73e320d2450cfc246b1167db |
05-Nov-2011 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 914972be to master
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
|
| f5a486a54d85ee59f4e9afa18b05c1946d749050 |
05-Nov-2011 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 79178b8b to master
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
|
| 683525b61bc1b58b4fd9e1b3ef9ed3b0c3bf34ae |
05-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5478024 drop after decode if can't drop before
Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
|
| 15d91830fef9ef667c4bcce704e783bdeee4108e |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
|
| ff7eb864cdef857b076f2427c58ee58e59e75994 |
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.
|
| 93f6ba45115134ebd75ff7381bdf715251b0a6c3 |
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.
|
| 4d954c4ff6ab7110df23f1f3ebfe296beb97f3de |
04-Nov-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
|
| 047f160561fc7a87fc5794762d36225bfa5d2e89 |
04-Nov-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
|
| 7040b12bb2f83209bbccd0149d365e2d106adc74 |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
|
| f8bbc7a0ffe9b93f8c496979904d18e595027010 |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
|
| fc1a3ac1641b8849bf925a6bf0fa96b2abcdd91f |
04-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
|
| 28bb5bd7b8ecba7f278d2cadd21bdd1286eea655 |
04-Nov-2011 |
Dave Burke <daveburke@google.com> |
am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
|
| f47368b74d8d300bcd08cf148b609164245186a9 |
04-Nov-2011 |
Dave Burke <daveburke@google.com> |
am 43e72b1f: am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
|
| 654d83b36af586919457880e40a5dfdd79a31abb |
04-Nov-2011 |
Dave Burke <daveburke@google.com> |
am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
|
| ee74c46968e632915bdff1af5d59a1b2ca3ac796 |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
|
| 3dbe3201479828e84abe02e1fdd0a5d414c0ddb8 |
03-Nov-2011 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: mix track only when really ready
The addition of low power audio playback mode made that audio buffer consumption
by audio HAL can now happen in bursts. This makes that requesting audio data
from an AudioTrack for mixing can happen at much shorter intervals than before.
This revealed an existing problem where AudioFlinger would consider a track ready
for mixing although not enough frames were ready to completely fill one output buffer,
thus creating short periods of silence.
The fix consists in waiting for enough frames to be ready in AudioTrack buffer before
declaring a track ready for mixing. This minimum is not applied when the track is stopped
to allow the buffer to be emptied completely.
Change-Id: I6d04f9b65db5af85b0b53f0a5674be7ec02f9e9f
ervices/audioflinger/AudioFlinger.cpp
|
| 0bdcaf9c5466cf9c84a8c98e160411ab74f05f4b |
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.
|
| b518cf9d4456dc0ef58d67f09efe1db0e017852a |
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.
|
| 1183a4ab06b9fe01fe39a4b8728bfc71789361fc |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
|
| e215bd266d851041e1aff57088a77c32d6b4ad3c |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 91501f3a5ec88e7e4efc043fa37ae2380f84796b |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
nclude/camera/CameraParameters.h
|
| e926b999ddd1a607e4f01ee2acd79dc87de62688 |
03-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-2-release history after reset to ics-mr0
nclude/camera/CameraParameters.h
|
| ef7a78943ddbd22170cbf430aa9d2b2d9603d69c |
02-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
|
| fd57665ece9b8ee174d6efe4df7e41e07c7c44f1 |
02-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '11b49ba933bab7ff8262139141eef0e5f3c45a18':
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
|
| 254c2211b5088bb7d84d7126306aad7763b58372 |
02-Nov-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
|
| b47568c9e85432d24b5d22005260a9879d03fae9 |
02-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
|
| 2db114bf7753f267b1d71d615359ee2b437daa38 |
02-Nov-2011 |
The Android Automerger <android-build@android.com> |
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
nclude/camera/CameraParameters.h
|
| 5dc65e2ce92c7364da60bdff5f345daf145c2c0f |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| 14da736f1707a6dbefa52405e910ecb1b3bc2dd2 |
01-Nov-2011 |
Andreas Huber <andih@google.com> |
Properly decode ADTS files with ID3 headers.
Change-Id: I55247e79ac9cc9547e3e0f6fe048bcbdc9b639d1
edia/libstagefright/AACExtractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/include/AACExtractor.h
|
| b6431802fc6cff501a4311de288ba469839fbf86 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| c12fded0f156fad1dda38ed82ab15fd663270caa |
01-Nov-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| cfc24068990c7602fc4a7a630b0871a3fe239509 |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 11ba6da4: am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
|
| 09ebde724b2cd224968d1fdba4f5afd81c998c6a |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
|
| 2cf981a8e3dcc815e422f21ae4f09e17934906e1 |
01-Nov-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Update camera continuous autofocus javadoc." into ics-mr0
|
| 2aa4cc04154d82f6658fb86f394f13bb488b0468 |
08-Aug-2011 |
Andreas Huber <andih@google.com> |
Support new HLS byte-range extensions
Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/include/LiveSession.h
edia/libstagefright/include/M3UParser.h
|
| 1dcfc417ce7c031f5c039ef89f5312b643908956 |
31-Oct-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-mr1-release
Change-Id: I712537045ade8ec23936caddcdbf95fbba0ef9a8
|
| 2f5ef5818cb23e854992ef5b78c6439639353f2d |
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
|
| 8b69e73c046096dcca8b9408fa962cd346c638c9 |
30-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 59f35c38fba7e12dad6aacd7ca74be08f6fd7f7c |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
|
| 0656c64d9e2fef4fd3b775c8e0959c1794e84e8c |
28-Oct-2011 |
Ed Heyl <ed@google.com> |
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
|
| f20877482fd43f3bfa267e407d67d0d796082341 |
28-Oct-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 5522189 temporary workaround"
|
| 305f4b6dabe500b97062e72049a296d0699243d7 |
28-Oct-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5522189 temporary workaround
Change-Id: I21d91d7a24df7bb6e7fc3d0fbc4786d55391fc0e
ervices/audioflinger/AudioResampler.cpp
|
| 3901e5d87573447db33fb9930871a1f5266a9b2c |
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
mds/stagefright/stream.cpp
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| d7a07f295a291496111b56a4886411c237ba6dc9 |
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
|
| 841fa37451fb74f3d5978a15aab606bbb67e8c39 |
28-Oct-2011 |
Andreas Huber <andih@google.com> |
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
|
| 6fe5bd88840ee02a34a205770c806569f615e267 |
28-Oct-2011 |
Jason Simmons <jsimmons@google.com> |
Do not inline the audio resampler assembly functions
The assembly expects arguments to live at fixed offsets from the stack pointer
which are invalid if the code is inlined.
Change-Id: Ie93e93c5c69774079112345754fbc85896fc2f64
ervices/audioflinger/AudioResampler.cpp
|
| 07436fc0daa56a429bf3f777b9e5793a9f4e57de |
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
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
|
| 3c56184d33c3f08eddff38f3883ccc14348a87bd |
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
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
|
| 395575aba45ef636ac8ecf0f85e30329ba094150 |
13-Sep-2011 |
Jason Simmons <jsimmons@google.com> |
Hold the AAHDecoderPump ThreadWrapper in a ref-counting pointer
Change-Id: Iff840dbd9e1f79a07e62c1481b2b0797f30247cb
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player_substream.cpp
|
| 1a5e6b1f38ab3c542dd27f7fe600a3200b4dd7f2 |
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>
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 033e42b72f70ad777e65f9ba4a5f7a3ab3331ab0 |
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>
nclude/media/MediaPlayerInterface.h
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
edia/libaah_rtp/pipe_event.cpp
edia/libaah_rtp/pipe_event.h
edia/libmediaplayerservice/Android.mk
|
| 94dacaf173ff4aad8a39a3343b12a513b92ed2a8 |
29-Aug-2011 |
John Grossman <johngro@google.com> |
Add a missing NULL check.
The get_next_write_timestamp method introduced to the audio HAL is optional.
HALs which do not implement it leave it set to NULL. Callers (there is
currently only one in the AudioMixer code) need to be certain to check for NULL
before invoking it.
Change-Id: I88ba43bb53bec081c98c9a8842936c4fbfdd44f6
ervices/audioflinger/AudioFlinger.cpp
|
| 500e510c7bd96a3d2959cdd858db4045b74a0e1a |
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>
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioTrack.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioTrack.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.cpp
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/audioflinger/AudioResamplerSinc.cpp
|
| 4b8bb4ee7d1d64dc1cd5478a3772f97e4a4a00d7 |
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
|
| 262620399c228b3b201c2c4b39c87508d3047d74 |
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
|
| ed3d89bbe410bac6d0e95d3ad8fa7d06337740f9 |
28-Oct-2011 |
Jason Simmons <jsimmons@google.com> |
Do not inline the audio resampler assembly functions
The assembly expects arguments to live at fixed offsets from the stack pointer
which are invalid if the code is inlined.
Change-Id: I423b3993ac9cd8d62129718d84fd23efbbac174a
ervices/audioflinger/AudioResampler.cpp
|
| c1aa1e96d1310e8b8f9962f924247aa35a61e3c3 |
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
|
| be1480bade58688d201335860247734aec6b11cb |
28-Oct-2011 |
James Dong <jdong@google.com> |
Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
|
| 92278a1a3478c94b65dde41f03d967c47b81d7d6 |
15-Aug-2011 |
Mike J. Chen <mjchen@google.com> |
Incorporate aah changes to AudioBufferProvider into VideoEditor
This is a squashed merge from master-tungsten of the following change:
commit e1bec6e10c8d7462a0970568153a2d9db1463e6e
Author: Jason Simmons <jsimmons@google.com>
Date: Thu Jun 16 14:22:57 2011 -0700
Change the interface of the AudioMixer and AudioBufferProvider to accept a presentation timestamp
Change-Id: I565b48450f98089767bf92b435826c9f4baeb01c
Change-Id: I201bdc4479a53b4bc023549d0a1831ac0a8f33dc
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>
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| 597f405273ce21b7e67984084c428d84c3365bd9 |
27-Oct-2011 |
Wu-cheng Li <wuchengli@google.com> |
Update camera continuous autofocus javadoc.
Suppose applications call autoFocus in CAF picture mode. If
CAF is in the middle of scanning, the picture is very likely to
be blurry. Change focus callback to return when the scanning
finishes.
bug:5514415
Change-Id: Ibcb8f92a5263d7dbd7cce54df3617fb21c6255d4
nclude/camera/CameraParameters.h
|
| bd1970ae5c97cf423cbc5b591e9c8eab05a76a37 |
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.
|
| 0d681abd16873a265a10aee1e9ae8fa062309de3 |
27-Oct-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
|
| 6d5994a5e5cb642401f40dfda5b7350085a018f4 |
27-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-mr1-release history after reset to ics-mr1
|
| 93594b5aa16dbbb0b196f6e181a8ca099d7ab62b |
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
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| b05e3b5b3c2d77f6c71631ea538f6190ec61b3d9 |
27-Oct-2011 |
James Dong <jdong@google.com> |
Report call status from AudioSource::start() to file writer
Change-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330
related-to-bug: 5514288
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
|
| 7dae00baa6e8957be15523c46bb948bd1dde64c3 |
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
nclude/media/mediaplayer.h
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| a4af2143ecbd630e946647c1b5f90fda8f61ebb3 |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
|
| cfe7598b0f3959c45d396a1051ec48c20711f728 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
|
| 448adcb4cb287070b3c1926aa8ee632df28bc009 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
undo reset to ics-mr1 until we have a better method
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioTrack.h
nclude/media/MediaPlayerInterface.h
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
edia/libaah_rtp/pipe_event.cpp
edia/libaah_rtp/pipe_event.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.cpp
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/audioflinger/AudioResamplerSinc.cpp
|
| 783cfe32ee6f3972849b72283b95d5173ba79766 |
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
|
| 71adab54edf9d0e2c89473d3be12edb6b9dc4549 |
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
|
| 32bdfd5acb76a02e82e0059c8bd892bc1f73a7e3 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 40a8e3a753f4359d3975e0a0f2187051b9ee6d80 |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
|
| ca89aab103f3dc3e1873f85fd540df84cf7980fc |
26-Oct-2011 |
Ed Heyl <ed@google.com> |
reset to ics-mr1, but keep history
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioTrack.h
nclude/media/MediaPlayerInterface.h
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
edia/libaah_rtp/pipe_event.cpp
edia/libaah_rtp/pipe_event.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.cpp
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/audioflinger/AudioResamplerSinc.cpp
|
| 4e6cf6b6efe24627251f5e1ed8aaf179a495d689 |
26-Oct-2011 |
Steve Block <steveblock@google.com> |
am 71f2cf11: (-s ours) Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
* commit '71f2cf116aab893e224056c38ab146bd1538dd3e':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
|
| d210352b437b1735c5eca96dbcadacbcc2cee302 |
26-Oct-2011 |
Steve Block <steveblock@google.com> |
am b3bc653e: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
* commit 'b3bc653e3cad72a4841cab90fbb7346e938735e3':
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
|
| 3856b090cd04ba5dd4a59a12430ed724d5995909 |
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
amera/Camera.cpp
amera/ICamera.cpp
amera/ICameraClient.cpp
amera/ICameraRecordingProxy.cpp
amera/ICameraRecordingProxyListener.cpp
mds/stagefright/sf2.cpp
mds/stagefright/stream.cpp
rm/common/DrmMetadata.cpp
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/preprocessing/PreProcessing.cpp
edia/libeffects/testlibs/AudioEqualizer.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioParameter.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IEffect.cpp
edia/libmedia/IEffectClient.cpp
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MediaProfiles.cpp
edia/libmedia/MediaScanner.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/Visualizer.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libstagefright/AACWriter.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AudioSource.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/ESDS.cpp
edia/libstagefright/FLACExtractor.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG2TSWriter.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MediaSourceSplitter.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/VideoSourceDownSampler.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/SimpleSoftOMXComponent.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/AAVCAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARawAudioAssembler.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/tests/DummyRecorder.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDeviceInfo.cpp
edia/mtp/MtpPacket.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorage.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioResampler.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraHardwareStub.cpp
|
| 1765d6e0c962d2b89897c0278f969084f632d181 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 2703f23af496c13cfa39cc7e157fa12d1cb4c169 |
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531
ibvideoeditor/lvpp/AudioPlayerBase.cpp
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| e796622a3a1a2f3be1f09d6b139bbb783fa712ec |
20-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2f204ac67cf8b69743d748ea60023f32cddb6725 |
20-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 29a636a59703284bb8cbff079fac7d1b89d5101f |
20-Oct-2011 |
James Dong <jdong@google.com> |
am 518f2a51: am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
* commit '518f2a5132d9526b79f4a278f621ae3342434aa8':
Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.
|
| e20c2c1775349da6d4a5700f0c7faaa07d62f409 |
20-Oct-2011 |
James Dong <jdong@google.com> |
am f23f7257: Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
* commit 'f23f725773de1eb394655e657cd12f95f6250b3d':
Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.
|
| a6fa59c6a798f16cb3253da7566023de3991e8aa |
20-Oct-2011 |
James Dong <jdong@google.com> |
Merge "Fix for 5477832 Movie Studio crash when trying to import the attached h263 file." into ics-mr0
|
| d79eeae9058c1f98ca340bd3a82d31391e935fee |
20-Oct-2011 |
Hong Teng <hongteng@google.com> |
am 17887cd0: am 52da22e1: Fix for 5234840 Corrupted frames in transition
* commit '17887cd0623d1cc8f225505ecc5b5bec78e75b32':
Fix for 5234840 Corrupted frames in transition
|
| ee0ef8b405dd308cae26ead9772e9aea5be6ac14 |
20-Oct-2011 |
Hong Teng <hongteng@google.com> |
am 52da22e1: Fix for 5234840 Corrupted frames in transition
* commit '52da22e185f4bd4c7778706d8651a2706cdffc5b':
Fix for 5234840 Corrupted frames in transition
|
| d7da7fc5cb985234395b057e11e8d91a4f5c901b |
20-Oct-2011 |
Dave Burke <daveburke@google.com> |
am 149a1493: am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
* commit '149a14931e5aa4beb8c4263995f01437a8918465':
Stagefright: idle OMX after ANW errors
|
| 1d2acaffde56ad79e6e96f228d7857863462397c |
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
|
| 55f4bc5c3d1acfaa735b8b19cf34b6b68f6cfcca |
20-Oct-2011 |
Dave Burke <daveburke@google.com> |
Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
|
| b1d666f5cb555d135eb69e005e88a03330bbb54c |
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
nclude/media/IOMX.h
edia/libmedia/IOMX.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| b9f55dc767c65f1deb4fb51ddbeb53f631cf8c26 |
20-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 38cdb606: am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced
* commit '38cdb6063059fe5164f8cf93c21ea000fe24f524':
Fix 5487571: Make sure shutter sound is played when it's enforced
|
| e6a823c276302b0c499d7a39956c1b731f23dd4c |
20-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am f806871f: Fix 5487571: Make sure shutter sound is played when it\'s enforced
* commit 'f806871f3016a8184de4c9dcfbe0b9069dc0d72c':
Fix 5487571: Make sure shutter sound is played when it's enforced
|
| 8888a75f01d904541e409e858d23e4150ace34b6 |
20-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5487571: Make sure shutter sound is played when it's enforced
Change-Id: I0c7adf452217b8308243836b40b1fba8f2029240
ervices/camera/libcameraservice/CameraService.cpp
|
| 64ed644caab19b469673ba64083577578b12e5e0 |
20-Oct-2011 |
James Dong <jdong@google.com> |
am c7d92746: am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0
* commit 'c7d927466e6314315743e5c98730b3a79c52e892':
Check whether media recorder client exists before dumping.
|
| d24bac2f9e83d3dbc0ef9d2aae3b8ad8e4d2b731 |
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.
|
| 2e5bcd4a0d1f3078acfd88785aa29923ae03a3bb |
20-Oct-2011 |
James Dong <jdong@google.com> |
Merge "Check whether media recorder client exists before dumping." into ics-mr0
|
| c65d276d201f85c2ea99e79ede7b5d2bc08d25fb |
20-Oct-2011 |
Hong Teng <hongteng@google.com> |
Fix for 5234840 Corrupted frames in transition
This is to solve the corrupt frame in transition clip generated
from mpeg4 input clip.
Compress domain trimming is disabled for mpeg4 since hardware
encdoer may use different time scale value than the input mpeg4
clip.
Change-Id: I19377a19840f599ba9cb24c89dc86aaa63fc229e
ibvideoeditor/vss/src/M4xVSS_API.c
|
| 799de64f085ccf2a58f0c74a151badaabd0bd679 |
19-Oct-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5477832 Movie Studio crash when trying to import the attached h263 file.
Add support for Audio Object type 5(SBR) and 29(PS) in
audio decoder node.
Change-Id: I9b631893f530d0c8550a0a7addfbdce226313693
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
|
| af560cf47d71e8e1b2fe84664928d6dcbc6c77b1 |
19-Oct-2011 |
Eric Laurent <elaurent@google.com> |
am ee00c054: am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
* commit 'ee00c0541e8f066550dcbd5bc8af257fce8d7944':
Fix issue 381905: BassBoostTest CTS tests fail...
|
| 545d1e935b8ee12255bbd443a89a4b8ec2aeeb35 |
19-Oct-2011 |
Eric Laurent <elaurent@google.com> |
am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
* commit '3c86134a50618605c86eb9f5f120dbf97826e3e1':
Fix issue 381905: BassBoostTest CTS tests fail...
|
| a85a74a8219c03f2b1d1ef98f3f02e55f89f89a3 |
19-Oct-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 381905: BassBoostTest CTS tests fail...
When AudioEffectTest is executed, an Equalizer is created
and enabled on a MediaPlayer session. Effects on the output
mix are therefore suspended.
Then the MediaPlayer is released with the effect still enabled.
In this case, Audioflinger::purgeStaleEffects_l() fails to restore
the suspended effects when the effect attached to the released audio session
is removed.
When subsequent tests are executed on output mix effects, these effects cannot be
enabled as they are still suspended.
Fixed purgeStaleEffects_l() to restore suspended effects if the effect removed is enabled.
Also fixed EffectHandle::disconnect() to only restore suspended effects if the disconnected
handle actually has control over the effect.
Change-Id: I67232e7c34680b0cc01abfd57d5d510a524e5d4f
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| feaff441394c3142615f648b96ea6954a109c6a2 |
19-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 915cec633a6c96ba802bfbc897245c3bb6cde698 |
19-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e579e28089c6b86f56d257030b778c5e22b1a5a5 |
19-Oct-2011 |
James Dong <jdong@google.com> |
Check whether media recorder client exists before dumping.
Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82
related-to-bug: 5477177
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| bfe938cd4b7f3b1c678ef95f62ddc494570e44b1 |
19-Oct-2011 |
James Dong <jdong@google.com> |
am 3c563ce6: 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 '3c563ce672e6b1827b33ab4ce0f0c28e894214d5':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
|
| ca9f7f2d484ba0296db49406e3ef908bc7e119c1 |
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.
|
| c4ff709bd714286ea4b1eaf8d932c43a02d5430d |
19-Oct-2011 |
James Dong <jdong@google.com> |
Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
|
| 81445dc27fd325e889f353263ba6fa89ea9aa419 |
19-Oct-2011 |
Hong Teng <hongteng@google.com> |
am d41d94e2: am 71184927: Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done
* commit 'd41d94e217507ecf9217bebd950b83390e7ffaf6':
Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done
|
| b3c06552b415b15ad568c41281f148706f7cbd9e |
19-Oct-2011 |
Hong Teng <hongteng@google.com> |
am 71184927: Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done
* commit '711849272b603a88f751c1758b51a1dfbec315df':
Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio Apply frame effect(overlay) after rendering mode was done
|
| d7b39321d8dedd31d558b9cff49aab4e5b78ce9a |
19-Oct-2011 |
Eric Laurent <elaurent@google.com> |
am a6f4fb1f: am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
* commit 'a6f4fb1fbbaf6cb13ad6b813a4cecbc28ba02776':
Limit AudioFlinger log.
|
| 2ce99907b2f4369bb76f2698c6d414cdbfb36224 |
19-Oct-2011 |
Eric Laurent <elaurent@google.com> |
am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
* commit 'ecfdd7ff468bfc861e84fe18992e26b89cc63126':
Limit AudioFlinger log.
|
| 5e69eb97b0e5e70919f61099bcc5bdbb1db0861c |
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
edia/libstagefright/OMXCodec.cpp
|
| eac28ab858dc4ecdfd25b6d8851219e6787d1222 |
13-Oct-2011 |
Hong Teng <hongteng@google.com> |
Fix for 5154138 Titles are not aligned properly in a exported movie from Movie Studio
Apply frame effect(overlay) after rendering mode was done
Change-Id: I1ff9cc868117cc8dcdc735e6854ff429b74e8154
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| 5c4e818c39ac2d2739675fe907904a874f7623c5 |
19-Oct-2011 |
Eric Laurent <elaurent@google.com> |
Limit AudioFlinger log.
AudioFlinger logs a warning when a write to the audio HAL
takes too long to return. The threshold for this warning is
a rule of thumb based on the assumption that the audio HAL will consume
buffers at a regular pace.
The introduction of low power audio mode with larger buffers and writes
occuring in bursts makes that this threshold is often exceeded resulting
in excessive and misleading warnings.
The threshold is raised to remove unwanted warnings but we should reconsider
the usefulness of this warning altogether.
Change-Id: I5ef6898ea28d879cede3e47da542a64092a3cca4
ervices/audioflinger/AudioFlinger.cpp
|
| 92f08028ba33a1f4e63fe347e08246476067a3eb |
18-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 0fb0d7c5a2696551a25f4382080001e42fddd87c |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 21ad1d1c: am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0
* commit '21ad1d1cb0806991fc5e7c55c9f3bbce87745e17':
Fix 5468644: Use the proper audio stream type to play sound.
|
| 5c5e2c63872f9d6915b7b593b816fd3acddcff06 |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am a84e37f3: Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0
* commit 'a84e37f37c7cd21fe498a923c181d3896e055d56':
Fix 5468644: Use the proper audio stream type to play sound.
|
| 3c57859f03ce9257128e3b2cd29a906b8f9a6aa5 |
18-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5468644: Use the proper audio stream type to play sound." into ics-mr0
|
| ce4ae617fa634c166aff0cbdb2c08858f9c0924d |
18-Oct-2011 |
Dave Burke <daveburke@google.com> |
am 499e2522: am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0
* commit '499e2522455440e7e68c2df8b30a727aa9ef46b3':
Don't hold onto the lock while reconnecting to the server
|
| 89770b4c942a2cf0bc2cba2a7a182a10d17b21b5 |
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
|
| a038c14efdaa118e2d8c5b42584cb0bb5f3b2ec7 |
18-Oct-2011 |
Dave Burke <daveburke@google.com> |
Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0
|
| 95c4d6034dc356f70c6293ea53d4858415b2d020 |
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
edia/libstagefright/NuCachedSource2.cpp
|
| ff4f55c8d77e276dbcceedb4e560ca1d91ba38ba |
17-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5468644: Use the proper audio stream type to play sound.
Change-Id: I80dd37da277b1810959a2dbdd852078b26f70cf5
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 754e2904f0c7959f999677663163792b02a8cb9d |
16-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| b45eea48652dfaafe9c8703832891fb0dcbfe30e |
16-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 0ae53bfc26b62726906debca1e4011482617e2a0 |
13-Oct-2011 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 6e80c50f to ics-aah
Conflicts:
media/libmediaplayerservice/MediaPlayerService.cpp
Change-Id: Icb9371dcace4609fffd048b7fdc27ee59d589a92
|
| f19d933071399a00d24dbeaec69b1677d2f74344 |
13-Oct-2011 |
Andreas Huber <andih@google.com> |
am 3e79eec7: Remove RTSP support from libvideoeditor\'s PreviewPlayer...
* commit '3e79eec74bc253c1b8e27cb9a815ae43b4849e68':
Remove RTSP support from libvideoeditor's PreviewPlayer...
|
| 2bfdd428c56c7524d1a11979f200a1762866032d |
12-Oct-2011 |
Andreas Huber <andih@google.com> |
NuPlayer is now taking on the task of streaming over RTSP.
Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
mds/stagefright/stagefright.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libmediaplayerservice/nuplayer/RTSPSource.cpp
edia/libmediaplayerservice/nuplayer/RTSPSource.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/APacketSource.h
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/rtsp/MyHandler.h
|
| 7f1ce2642a81c0bd057927b647d81075ae4969b4 |
13-Oct-2011 |
Andreas Huber <andih@google.com> |
am 0eb6ef17: Merge "Support for an MPEG2 Program Stream extractor."
* commit '0eb6ef1798362d15696618debdb2478b386398c5':
Support for an MPEG2 Program Stream extractor.
|
| f337772630b0a1b48d7828647d1079ebdc22919d |
13-Oct-2011 |
Andreas Huber <andih@google.com> |
Merge "Support for an MPEG2 Program Stream extractor."
|
| 37ae0418c2e3b1995dec2a9976365789ca9310e1 |
13-Oct-2011 |
Mike Lockwood <lockwood@android.com> |
am 745e3601: am 0c265c88: Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0
* commit '745e360103e81facb6641d035c5e3ccc8ace855e':
MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size
|
| 0cc79c66329b9ffa7d7bdfafa5d245a11fd3660d |
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>
edia/mtp/MtpServer.cpp
|
| b75aae8cc1ea671d4c186e87d84701da8ee521f1 |
13-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ff0b6e6cbd5418ad9828adb0700426ccd96bed40 |
13-Oct-2011 |
Wu-cheng Li <wuchengli@google.com> |
am 7a3ba4d7: am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0
* commit '7a3ba4d732d5ce394aab9783e4099b2e71f1903f':
Improve camera javadoc and fix some errors.
|
| bbdb412041a1e593c95c29c84d5ddbb8906787e4 |
12-Oct-2011 |
Wu-cheng Li <wuchengli@google.com> |
Improve camera javadoc and fix some errors.
bug:5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
nclude/camera/CameraParameters.h
|
| 92c99e7fec711a8bb829ada6331dc464bfcf9f51 |
13-Oct-2011 |
Andreas Huber <andih@google.com> |
am eb763a7b: am 8c7951af: Merge "Assume a PTS of 0 if absent, don\'t bail on fragmented PES packets not having PTS" into ics-mr0
* commit 'eb763a7b0259f57ee33500ec99b040a16793119f':
Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
|
| ba8b6c4afc726e2d059464b7e3c9072391af5bb4 |
13-Oct-2011 |
Eino-Ville Talvala <etalvala@google.com> |
am ca2640b2: am 0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
* commit 'ca2640b2ab4136eefe138baf07dcfcbaea86da17':
Add video stabilization control to Camera parameters.
|
| 4a4a8f0143c7ac17f88e73f76e21c6d8b63d6e20 |
13-Oct-2011 |
Andreas Huber <andih@google.com> |
Remove RTSP support from libvideoeditor's PreviewPlayer...
Change-Id: I2032772037c1130736081cb62bd6ce8d1270e1b9
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.h
|
| a808bcba75af9f3a6160c24fc9a8968bac2bbd7f |
12-Oct-2011 |
Andreas Huber <andih@google.com> |
Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0
|
| 98a46cf165d8de3779874eba01803bbc485f45b9 |
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
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
|
| 7019d2247e644470a0e8eb99b02b8b2d656fd9fb |
11-Oct-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Add video stabilization control to Camera parameters.
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.
Convenience accessor methods hidden for now.
Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 596c24d3a81b6deaabb3378b8d71ec0d7c237d39 |
11-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 59a41875fd73126efa0fcee49e5262b4546992aa |
10-Oct-2011 |
Andreas Huber <andih@google.com> |
am a5da78f0: Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater"
* commit 'a5da78f09df49ed379028ccaaa383c68dcb58397':
YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater
|
| 49c59815369616b0fd5451ccabd377e8fe1dc3fa |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| 4a7496c285f585422521c4175ac569e85bbb18c8 |
09-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 3e8607e35fb668345849cc4e96d063d7242968b2 |
07-Oct-2011 |
Andreas Huber <andih@google.com> |
am 41c95f36: Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"
* commit '41c95f3642323ec4cfdc84a3bb70537af0da8cca':
Specifying -1 for both low and highwater marks would not actually do the right thing
|
| e87a2f05f39203dff8914b7612b1b2a709aeb75f |
07-Oct-2011 |
Andreas Huber <andih@google.com> |
Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"
|
| 0b8cd8b0cf1489f8f7c0b2c4d7ea8fea70ca93a1 |
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
edia/libstagefright/NuCachedSource2.cpp
|
| e72db078c0669121fd170cbcd2b3b737efbac293 |
07-Oct-2011 |
Iliyan Malchev <malchev@google.com> |
am 851a14eb: Merge "Add initialize method to CameraHardwareInterface"
* commit '851a14eb9443996f29617e84dd8b66281876ae8e':
Add initialize method to CameraHardwareInterface
|
| 5861a9a98c641261c4807c976c750e4611b3a57d |
06-Oct-2011 |
Tyler Luu <tluu@ti.com> |
Add initialize method to CameraHardwareInterface
Add intialize() method to CameraHardwareInterface so we can
return a proper error value to CameraService if open of camera
hardware module fails.
b/5405235
Change-Id: I09c627034ddd22a5753c5163392c4fcff301e0b9
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
|
| bbcf5f312b158365d09c5b3c5c625d12acea318e |
07-Oct-2011 |
Andreas Huber <andih@google.com> |
am 59797e6b: Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
* commit '59797e6bece0ac2d649d8d93d02ed81979950145':
Allow a system property "media.stagefright.cache-params" to override cache/prefetcher
|
| 003124e20eb0744aab36ad1bde05e15ac122ad75 |
07-Oct-2011 |
Andreas Huber <andih@google.com> |
Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
|
| 3c48728a9881660e5e3353903b77ac614cab0e82 |
07-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 17f25410: Merge "Allow shutter/recording sound to be adjusted unless it\'s forced."
* commit '17f254105b399c7a4216da2d477e7f9cbdbd7319':
Allow shutter/recording sound to be adjusted unless it's forced.
|
| ccab9d2b7cb4ba58139a007f893a9121e1208f57 |
07-Oct-2011 |
Wu-cheng Li <wuchengli@google.com> |
am 3c02c12c: Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
* commit '3c02c12c73fa8719e49a5da6534750196efe3eba':
Allow Camera.setDisplayOrientation to be called when preview is active.
|
| 6c904e26d4cd7a79f589e613fa7b2866a9fccb15 |
07-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Allow shutter/recording sound to be adjusted unless it's forced."
|
| 3e754efaddf3e221bcae6fe836d7553185d01944 |
07-Oct-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
|
| b9f588677910cac6ffc0346092bfcfe1c6620b90 |
07-Oct-2011 |
Wu-cheng Li <wuchengli@google.com> |
Allow Camera.setDisplayOrientation to be called when preview is active.
bug:5422679
Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb
ervices/camera/libcameraservice/CameraService.cpp
|
| 90f4bc2a3d361252df898fa31a99f4120aeefb27 |
07-Oct-2011 |
Chih-Chung Chang <chihchung@google.com> |
Allow shutter/recording sound to be adjusted unless it's forced.
Change-Id: I7080d5f50a87f92c8e9395d4cf8f927a6760fa70
ervices/camera/libcameraservice/CameraService.cpp
|
| 5c29a244bbcbbfc2d17a40478b17e49df97eff83 |
07-Oct-2011 |
James Dong <jdong@google.com> |
am f3c00568: Merge "Fix an issue where we should allow negative values but did not"
* commit 'f3c00568163b186202cab8d79b2f11eeacb88646':
Fix an issue where we should allow negative values but did not
|
| e46c970c8f2fc26ff39cf8bebf984f46b17233ba |
07-Oct-2011 |
James Dong <jdong@google.com> |
Merge "Fix an issue where we should allow negative values but did not"
|
| a045cb0e77097120e86e367e1cab5494ce2a5d5e |
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
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| 2a1b95ec8da61cf2147f77f0c2691af53f50e998 |
06-Oct-2011 |
Andreas Huber <andih@google.com> |
am beedd862: Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."
* commit 'beedd8627a82007de61480c9e794dd967b708ded':
Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.
|
| 1b8ba61cb178bb6429bd214db9c615c350d0823a |
06-Oct-2011 |
Andreas Huber <andih@google.com> |
Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."
|
| 788a07fc61bad7ea2f0e3cca3f126b52a9bab376 |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 8dd17c4495931db050878107afb8096a7e1bdfa4 |
06-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 4ad7762652e600049618ba44016e45f2858cb147 |
06-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| b832a03d563dd000faa44f2577e92237525edc32 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| 933344c82c76c0acc36b209bb9ddf0454b2622de |
06-Oct-2011 |
Eric Laurent <elaurent@google.com> |
am 3c892288: Merge "Fix issue 5381089: problem with A2DP music volume"
* commit '3c892288837d165e0273ff1a0f1194c2347d24ac':
Fix issue 5381089: problem with A2DP music volume
|
| ec35a1416472865dbebc22b10199ad718ed2cc95 |
06-Oct-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 5381089: problem with A2DP music volume
This problem only occurs when audio effects are present and
the music volume is applied by one effect engine.
When connecting or disconnecting A2DP, audio effects are moved from
one mixer thread to another. When removed from the source thread,
the effect is stopped but it is not restarted when added to the
destination thread.
This regression was introduced by commit 21b5c47e.
Change-Id: I4cc578d8d760ec65b185032b6fda98c739d331bc
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 3120e87211bf4862f604110f551c46da638bd04b |
06-Oct-2011 |
Hong Teng <hongteng@google.com> |
am 7911553d: Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test."
* commit '7911553d968b6269cedb814f32e45c07fa4068f6':
Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test.
|
| 2534acb86e3f9ea94ed989f778f2606b79536fbc |
06-Oct-2011 |
Hong Teng <hongteng@google.com> |
Merge "Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test."
|
| e018023b4844fef7880bf5e45f706afcb10c33b6 |
29-Sep-2011 |
Hong Teng <hongteng@google.com> |
Fix for 5369981 Native crash : testPreviewWithEndAudioTrack functional test.
Change-Id: Icb8cadaff50a22588417c2c8f5c31415dd0cca9e
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
|
| 8cbd4639783e7a60c482699f2b36cd7d50e4f6f1 |
05-Oct-2011 |
Andreas Huber <andih@google.com> |
am 50dabc5f: Merge "Set crop params to ANative Window during Initialization."
* commit '50dabc5f0efbe2c4a987579cb2ad94132ee587be':
Set crop params to ANative Window during Initialization.
|
| d20bf0676d6db8f12edcd2307f82409c076c7015 |
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>
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| dba0b744774d2dc3d984942231e6338cab2090f0 |
05-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c4633bf9760f4f9926b561f253360747652c2845 |
04-Oct-2011 |
James Dong <jdong@google.com> |
am 4783a631: Video editor incorrectly rejects videos that could be supported by the HW decoder
* commit '4783a631d2ed6f589c6ee25502200af5dd7a476a':
Video editor incorrectly rejects videos that could be supported by the HW decoder
|
| 93d4a21f1c73df290e26a21e7a628f28d50bd035 |
04-Oct-2011 |
James Dong <jdong@google.com> |
Video editor incorrectly rejects videos that could be supported by the HW decoder
Change-Id: I831b32c7ab02fa110865c88bbb02f339889d97a5
related-to-bug: 5407761
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| b7b6adfe86dc1e58e840d7372e812501e34009c7 |
03-Oct-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2944eca607304a095ea43ba2b8f0b9de61249f9f |
08-Sep-2011 |
Andreas Huber <andih@google.com> |
Support for an MPEG2 Program Stream extractor.
Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/include/MPEG2PSExtractor.h
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp
|
| cd9d51f9102178f496adb3b1fe86c413497b5aa2 |
30-Sep-2011 |
Andreas Huber <andih@google.com> |
am cb52d012: Merge "Gracefuly return on detecting wrong AAC format from corrupted files"
* commit 'cb52d012e910b86d3562d4cad32d66e17986e286':
Gracefuly return on detecting wrong AAC format from corrupted files
|
| d3523f89a867afa111bb332887bf006ec3ae93e6 |
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>
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| ca0662c3c3f5135956630611410e2bee42bba145 |
29-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| a2fb8a7c2178f956861b6cba60326e72f7e1e57a |
29-Sep-2011 |
Andreas Huber <andih@google.com> |
am 0044a15e: Merge "Support multiple NAL fragments per .mkv payload"
* commit '0044a15eb92588372e21fa56a02fbed396cb5e02':
Support multiple NAL fragments per .mkv payload
|
| fea8f6217455d8cfc957e5b30f4eb2349859518f |
29-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Support multiple NAL fragments per .mkv payload"
|
| 792e33fd19e57e0d615d401a54ab567d04f16251 |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| bed11fa7067c0a19d5883736da29c5cb5015bfcd |
28-Sep-2011 |
James Dong <jdong@google.com> |
am 5e28463d: Merge "Flush resets the count of played audio frames"
* commit '5e28463dc4d12802d173018c572f73e13ba50722':
Flush resets the count of played audio frames
|
| 5530493f9abcd8f1f0b06cccecd6900e86a99778 |
28-Sep-2011 |
James Dong <jdong@google.com> |
Merge "Flush resets the count of played audio frames"
|
| 6ffeca88c422ce453609ae8e2e50267126bd8335 |
28-Sep-2011 |
Andreas Huber <andih@google.com> |
am 781ae92f: Merge "Support AMR, G.711 and vorbis audio in ACodec and friends."
* commit '781ae92f11ff136b99acb56cc361ad662d9cb6b9':
Support AMR, G.711 and vorbis audio in ACodec and friends.
|
| 729de186450f78c099637e1fce743fe531862c52 |
28-Sep-2011 |
Andreas Huber <andih@google.com> |
Support AMR, G.711 and vorbis audio in ACodec and friends.
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
mds/stagefright/sf2.cpp
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| f70071253953122d6fba0e1773ed09d3c5e29ae3 |
28-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 6c375490a5536695770a85b57ec9f828d3c0c9d4 |
28-Sep-2011 |
James Dong <jdong@google.com> |
Flush resets the count of played audio frames
Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3
related-to-bug: 5331470
edia/libstagefright/AudioPlayer.cpp
|
| 4d8e4e7ab2e9f7d937423d17c4e8fb60f425c0cc |
28-Sep-2011 |
Andreas Huber <andih@google.com> |
am d4fb497c: Merge "Cut down on AwesomePlayer and OMXCodec\'s verbosity."
* commit 'd4fb497cf4606abf61ec690ed971523ff9d05eac':
Cut down on AwesomePlayer and OMXCodec's verbosity.
|
| ac4d4d3698e920b9f5c648a781df5b6af8bcfdf0 |
28-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."
|
| c32589a79f8120ac0060945fffc50279143989aa |
28-Sep-2011 |
Andreas Huber <andih@google.com> |
Cut down on AwesomePlayer and OMXCodec's verbosity.
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug: 5382014
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 04d90d8ccb8812c6e6eeb620588ea184c3c9d3ff |
27-Sep-2011 |
Eric Laurent <elaurent@google.com> |
am ab7ed38d: Merge "Fix issue 5373658: memory leak in AudioFlinger."
* commit 'ab7ed38d5fea82db64eb90bad9d4c646d61d15df':
Fix issue 5373658: memory leak in AudioFlinger.
|
| 17799467c64629ef174d8f09cc89c4049624dcac |
27-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 5373658: memory leak in AudioFlinger."
|
| 7e069e101782b542449776c402bcb08e9a9307b1 |
27-Sep-2011 |
Andreas Huber <andih@google.com> |
am d33b3881: Merge "Signal an appropriate error even if there are no active streams yet."
* commit 'd33b3881f7647e721181c46f9166ee139cec7e38':
Signal an appropriate error even if there are no active streams yet.
|
| dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3 |
27-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Signal an appropriate error even if there are no active streams yet."
|
| eac68baf095aeef54865c28b6888924dc6295cbd |
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
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.h
|
| 9d18ec574f5d847a86a21594ac39394ef5b108fc |
27-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 5373658: memory leak in AudioFlinger.
Unlink PowerManagerService binder interface death recipient
in ThreadBase destructor.
Change-Id: Iab06ae9a8a6737bb002b6416a157b0fb50c11ad5
ervices/audioflinger/AudioFlinger.cpp
|
| 1bc36cafe025ff247b839a2e153b4317e845229f |
27-Sep-2011 |
Eric Laurent <elaurent@google.com> |
am 53719fc4: Merge "Fix issue 5373048: AudioCache decode errors"
* commit '53719fc4c5c441e8696f26bbfb9166b0bd19ef29':
Fix issue 5373048: AudioCache decode errors
|
| 82fd03b854a5e6879dc9eb6d57962414e7082894 |
27-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 5373048: AudioCache decode errors"
|
| 9cb839a0fcc98fe4278b39afb8b6d664c04f1673 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 214ecf4ba00fa228340eb2e9a0c478e7d1b35b84 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 17d0b8ac8c282a2ffe071f4ef61a1aad52e96365 |
27-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 078741e31e648d5d7585bb8b6729806e8cc55f69 |
26-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 4da465a0: Reconcile with ics-factoryrom-release
* commit '4da465a056f7a7322a5a4a0f235fe20e525a6eae':
Don't crash during full backup when CheckJNI is enabled
|
| 797ab6072402b12721dc226a9ebde3546e7640e9 |
26-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
|
| 3011088bf0a89a7a7826a86f59f88fa5b5c254e2 |
26-Sep-2011 |
Andreas Huber <andih@google.com> |
am d359b575: Merge "Properly connect to surface flinger in our shell tools"
* commit 'd359b575f7cc0ac36caacf7bbdcaef3394830a25':
Properly connect to surface flinger in our shell tools
|
| 070b91e1f67e6e2f129b6b492f38fbec7c8618e4 |
26-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Properly connect to surface flinger in our shell tools"
|
| 48e2d84610ae01666613c352ed926c09a9f43cd2 |
26-Sep-2011 |
Andreas Huber <andih@google.com> |
am 48719dc6: Merge "Propagate error signalled by the source all the way to the output EOS notification."
* commit '48719dc6221fdfbc3cc49a21166b136577fe37b9':
Propagate error signalled by the source all the way to the output EOS notification.
|
| dc9bacd838442a524585887e6ea6696836be2eda |
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
nclude/media/stagefright/ACodec.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/ACodec.cpp
|
| 4fb5acd7695ecac026082fa85dda14fde0b6e2ab |
26-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am c02ee953: Merge "Fix for 5205420 compression domain trimming fallback mechanism"
* commit 'c02ee953e7f726fd3337f2a7a876a4f45c3e4aff':
Fix for 5205420 compression domain trimming fallback mechanism
|
| e62c387164f176b2f2484fe3bd84d8dc115b5d6b |
26-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for 5205420 compression domain trimming fallback mechanism"
|
| 052dde287199887a3c401df250e6729b3cc2efda |
26-Sep-2011 |
Andreas Huber <andih@google.com> |
am 3bade950: Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
* commit '3bade9504a648ce7606b876dc7d71b4684e279c9':
Support even more .avi files with .mp3 content not aligned to chunk boundaries
|
| ece731de0c0af30917316d55313f25c56f91960d |
26-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
|
| 67e4d44711e94e2b099511ab933f02a37ce018f9 |
25-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| fbc916573e81b70e4339b7c92eb02992eda99ca8 |
25-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 32e1832dfac3a6bbcc5c0973ccd0e22de4d1a1ac |
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
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/include/AVIExtractor.h
|
| 357a5b4c95b2823cd196ec32323a92403ccfe187 |
23-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 42bfeb04: (-s ours) am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
* commit '42bfeb04478b32d6c62c4e4fd8d137732affdfc7':
DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
|
| cf41fc8eff715d7ee1336d7a00db4b8ab76e03c1 |
23-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 996fb989: (-s ours) DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
* commit '996fb989eb4cbe80c91cfe3ef4d32f349dffa72d':
DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
|
| d567784127618309bc164c2911752b7abf80954e |
23-Sep-2011 |
Eric Laurent <elaurent@google.com> |
am 65837ced: Merge "Fix issue 5355047: Automated effect tests fail."
* commit '65837cede462b551742f900f2e2f5a1d5dd576a2':
Fix issue 5355047: Automated effect tests fail.
|
| ce7f4f6345395eb3e715beaf4a74621956070f47 |
23-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 5355047: Automated effect tests fail."
|
| eaf349aaffc89c3ff754ddef856c80097b5a79a2 |
22-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5205420 compression domain trimming fallback mechanism
Transcode if clip's profile or level exceeds encoder's supported
profile or level.
Change-Id: Ib2f678828a58657b095ef6ef219fd0aa2bdccf91
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4xVSS_API.c
|
| 2f7a01be34e511f7a89ce9a3936659e11e7df506 |
14-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
DO NOT MERGE. Fix for 5247764 profile and level settings are not always correctly set
Cherry picked from master.
Correct video bitrate value is set from 3gpReader node.
Also, bitrate is limited to max supported by encoder as
per profile and level.
This patch also fixes bug
5309520 [Prime] Native crash while running CTS test testExportEffectOverlay.
Change-Id: Icd649c02465e88553b6e69ea8bcd01baf66ded9e
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 620c01ddeedb8ffd7db0119305c2f1375da80b68 |
23-Sep-2011 |
Andreas Huber <andih@google.com> |
am 7fa3b435: Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
* commit '7fa3b435d67e3ba2c879431f44e262c40716ebd8':
Add an option to dump the raw stream to a file in the stagefright cmdline tool.
|
| 031abfb6cc904da49b28423643d80a6485f4e3e6 |
23-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
| 7df9b2be02dc9246ba858a54f28ea71cb9d1da08 |
23-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
|
| d10c07603a28429beb7471c0fb23a5f9ec90bf26 |
23-Sep-2011 |
Andreas Huber <andih@google.com> |
Add an option to dump the raw stream to a file in the stagefright cmdline tool.
Change-Id: Ie19eca2cdf162d6973037ec554ef5916243ea7d7
mds/stagefright/stagefright.cpp
|
| 6bffdb8b598a2399e57f6ca48660fb7bdb2490b5 |
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
ervices/audioflinger/AudioFlinger.cpp
|
| 18d6f4ef8a3567fc81cf3d20ef34a043c45eb32a |
23-Sep-2011 |
Wei Huang <weih@google.com> |
am e448f557: am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit 'e448f557f620ae30dcead7a4423059dfb7d70add':
Update camera javadoc about AE and AWB lock.
|
| 0f0fed65815cdf083f70d723b3001a5dbd1837db |
23-Sep-2011 |
Wei Huang <weih@google.com> |
am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
Update camera javadoc about AE and AWB lock.
|
| b050002245f1606697488ddf5516e992d0c380be |
23-Sep-2011 |
Wei Huang <weih@google.com> |
Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
|
| 8e2555636291a59fe509c38082370b0a39bb737c |
23-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
am 91d34137: am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
* commit '91d34137903c278e5e077fa1edef9bbbcdd140f7':
Returning EOS in SurfaceMediaSource:read
|
| 3d5ec85e29edfa0639290610044517bec269c7df |
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
|
| 3e9bf4061475ae0d01c57e32c13e63808aa3e31f |
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
edia/libstagefright/SurfaceMediaSource.cpp
|
| c6f386a5164506b0f1020af5bc54fffe5c2b8902 |
22-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 79c9d7c2: Fix for 5274212 Transition clip contains more video frames from 1 video clip than the other
* commit '79c9d7c2b76fb995dbcc0502699009c8667ef1d9':
Fix for 5274212 Transition clip contains more video frames from 1 video clip than the other
|
| 738a66268a5d4ad948714dc095711cb4a21997f3 |
22-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5274212 Transition clip contains more video frames from 1 video clip than the other
Set the alpha blending value correctly.
Change-Id: I6aaed47144d09d182afb1c70d5bb72b7360fb51e
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| 0bffee5364fe6ddb7001e754ad3f5eb50b82cff5 |
22-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ca1d5399c5d6d23d16554be7c702fdf5232e55bd |
22-Sep-2011 |
Wu-cheng Li <wuchengli@google.com> |
Update camera javadoc about AE and AWB lock.
- Autofocus does not lock AE and AWB.
- stopPreview and takePicture do not clear AE and AWB locks.
bug:5356404
Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
nclude/camera/CameraParameters.h
|
| 58a2b35012414afcdf78c901a3cff9fa501f8dda |
22-Sep-2011 |
Edwin Wong <edwinwong@google.com> |
am 013ccb70: Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436"
* commit '013ccb7010ac9a231eb737ed268acb4b9653b268':
Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436
|
| e2c10206a506381ecd466e050f8b5cdf87db7100 |
22-Sep-2011 |
Edwin Wong <edwinwong@google.com> |
Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436"
|
| 5f6f4e4e89bc9b234d89276aea3eae7f677e2ff7 |
22-Sep-2011 |
Edwin Wong <edwinwong@google.com> |
Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.
BUG: 5284436
Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
rm/drmserver/DrmManager.cpp
|
| 7fb8a48531e39cf438d0720f0476974032eed82b |
21-Sep-2011 |
Andreas Huber <andih@google.com> |
am bfd1c9d9: Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
* commit 'bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23':
Support some .avi files containing H.264 video, log warnings if audio/video unsupported
|
| 10b3b8608c4739e772a80cf84a10fda98e842cd7 |
21-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
|
| c639aad6d8894f57c02e620f52ccf49e51b64866 |
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
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/include/AVIExtractor.h
|
| 436efe993a784d35a3fbfce02180b02ec0d14950 |
21-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
am faa75f61: Merge "Bug 5234242 audio continues after discontinuity"
* commit 'faa75f6146165016685291084ca79ddd377411b4':
Bug 5234242 audio continues after discontinuity
|
| dc7747d7da61a72b6d26dacf7569de9455d77474 |
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
edia/libmediaplayerservice/nuplayer/NuPlayerStreamListener.h
|
| 12d34be39e8ce1184216c112156d2de4d74ea298 |
21-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ee8b7dd139d74fd4ca321169a23c314fdf1c74b9 |
20-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 3617cb65: Reconcile with ics-factoryrom-release
* commit '3617cb652158c136b4b79f0e69d905794fc12843':
Add QVGA resolution to CamcorderProfile
Add PROPERTY_IMS_REG_REQUIRED.
|
| cba4873fa3bc325235b6b9de6ebe9721a8a25a14 |
20-Sep-2011 |
James Dong <jdong@google.com> |
am 3907c79a: am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '3907c79aebf8621a5a4880c9e66db3c49a44f359':
Add QVGA resolution to CamcorderProfile
|
| 93d5ab693626fa2700375e838e4bb90e4d50e605 |
15-Sep-2011 |
Andreas Huber <andih@google.com> |
Properly connect to surface flinger in our shell tools
Also raise the layer to INT_MAX to float in front of the toolbar.
Change-Id: I045a1c83924e6655f1734d15f2504b90312eec64
mds/stagefright/sf2.cpp
mds/stagefright/stagefright.cpp
mds/stagefright/stream.cpp
|
| ad8e8bfea2da077248a9f217c029e14fefb01096 |
20-Sep-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with ics-factoryrom-release
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
|
| 172378feba7001ac1656a6e66767f6bd86a4dfdc |
20-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e6310baa913c8fcfcaf5cbec91bd99335002256c |
20-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-factoryrom-release history after reset to ics-factoryrom
|
| c66c7513b7cd8e92274e478d8431ce3f64b8d2a4 |
20-Sep-2011 |
James Dong <jdong@google.com> |
Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| 12bbe5d7d47747c093ddac2977f594a4a3c1810e |
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
|
| 669012d77b00a2aacb6fd12837f2870f9ec17865 |
20-Sep-2011 |
James Dong <jdong@google.com> |
Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| ca84caeed8c990e9b81f7d43b6f0202549665496 |
19-Sep-2011 |
Andreas Huber <andih@google.com> |
am e2bb9960: Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams"
* commit 'e2bb99600e3a6eed97d2739f62c84998180a705d':
Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams
|
| 89aa8fe4cb00d2f24260005b008602232d678684 |
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
edia/libstagefright/SampleTable.cpp
edia/libstagefright/include/SampleTable.h
|
| 4a49123307cdf1982976b5af68ad6eb76f164535 |
19-Sep-2011 |
Andreas Huber <andih@google.com> |
am c7342fbf: Merge "In order to recover from video lagging behind audio, drop avc frames"
* commit 'c7342fbf992091cd37bb34b8fac2e6b6ca47fdf5':
In order to recover from video lagging behind audio, drop avc frames
|
| 84ada693b87f4d9344578e750a506b7789c13eb9 |
19-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "In order to recover from video lagging behind audio, drop avc frames"
|
| 7fd36eea4b47f27640d1603a3d5d6d9b315e5091 |
18-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c039e46c8cb830a559df83381d2dd2e5e939c423 |
18-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 0033abd397da67be1ff113616360f23dc1556681 |
17-Sep-2011 |
Jason Simmons <jsimmons@google.com> |
Merge "Configure the A@H TX media player with one string" into ics-aah
|
| 416208e21c94f79faf1678f095422258f909e2c0 |
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: I9008dab6ab94316a6ca4c1ac605bd026545bc28e
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
|
| 3fe62150fa3dd6d25cb84aad80bc9e27ddd16c45 |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libstagefright/avc_utils.cpp
edia/libstagefright/include/avc_utils.h
|
| a87a2b1c8590ed1712bc1e29d34110a31b2970b1 |
16-Sep-2011 |
Nick Kralevich <nnk@google.com> |
am 9404e1fb: Merge "AudioResampler: use relative instead of absolute labels"
* commit '9404e1fbd983c16667b9ec31941038c7af2df803':
AudioResampler: use relative instead of absolute labels
|
| 3169d9fa0a4ee7b00c12eb7892703a2a8ded161d |
16-Sep-2011 |
Nick Kralevich <nnk@google.com> |
Merge "AudioResampler: use relative instead of absolute labels"
|
| eb8b914ad9d4331e1cdf4346731770ce69fd0e77 |
16-Sep-2011 |
Nick Kralevich <nnk@google.com> |
AudioResampler: use relative instead of absolute labels
This change is needed to allow Android to compile with -fPIE
Bug: 5328392
Change-Id: I84d947975776800a7b79c6ac75a881af461a631c
ervices/audioflinger/AudioResampler.cpp
|
| e6582c88fc0ee96f1dff3637d97f61719e230213 |
16-Sep-2011 |
Andreas Huber <andih@google.com> |
am 9e7a6fc1: Merge "Various improvements to nuplayer playback"
* commit '9e7a6fc149c83fcb73a73730e59df985e0286227':
Various improvements to nuplayer playback
|
| 078cfcf7cce9185ec7559910d08b0bc02bfc88a3 |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/chromium_http/support.cpp
edia/libstagefright/foundation/AMessage.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/SimpleSoftOMXComponent.cpp
|
| c786d4432ecd5897c3246170ac003de0d05147ca |
16-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 85026dc3: (-s ours) am 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio
* commit '85026dc3996259c20277ba473c074de82335b9c5':
DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio
|
| 6bf2671a1f40c0c564cab2774765f5dba0583703 |
16-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 2e200ef7: (-s ours) DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio
* commit '2e200ef75541ee0f494877a42ae0e870799cc35c':
DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio
|
| 11e580afaee1e6070e7b682f5493f7bd6d0908be |
16-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
DO NOT MERGE - Fix for bug 5255159 Cannot play exported movie from Movie Studio
Ensure video encoder is not created and destroyed for every clip.
Change-Id: I9ce4db9312af801570dd51f4b075f262e27e3952
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| 09e42449d29c2356b259bfdc51132cfde9b57342 |
16-Sep-2011 |
Jason Simmons <jsimmons@google.com> |
Merge "Ensure that the TRTP retry buffer has contiguous sequence numbers" into ics-aah
|
| 98ba6fdf2f59682ecc825a7487c8cd6e30e6e832 |
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: If90ca25947d33df486ccedbb3f38e624618eb906
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
|
| 019b8896603d80e3a0a67c63b2124c31532927e6 |
15-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 4eb35d17: Merge "Fix for 5247764 profile and level settings are not always correctly set"
* commit '4eb35d178beedb6a952664ddfd514e8eed79e663':
Fix for 5247764 profile and level settings are not always correctly set
|
| aba2e956d1e7c324d046181b8e4ff155a09e87af |
15-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 1d971477: Fix for bug 5255159 Cannot play exported movie from Movie Studio
* commit '1d9714779c78297afccca96fa93f652991a14097':
Fix for bug 5255159 Cannot play exported movie from Movie Studio
|
| 547a4fffe81be23c5dc7ef27a0c43ae0ec8f5406 |
15-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for 5247764 profile and level settings are not always correctly set"
|
| d02a8dd64b67703dbc277edb0fa8369957f03073 |
15-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| a07e29a31b0c118158ba421e7c40984dda2279de |
15-Sep-2011 |
James Dong <jdong@google.com> |
am 1318864f: Merge "Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications"
* commit '1318864fa7ce6c85aaf629b1db08c79e4d0cf41e':
Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications
|
| 5dc2812abddde309234edc786a541d251c4f820a |
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"
|
| 276adbc8cab51c5cd60906fdbff9c7d5345ad0a6 |
15-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for bug 5255159 Cannot play exported movie from Movie Studio
Ensure video encoder is not created and destroyed for every clip.
Change-Id: I7a1d525e7bcdc839acc39d43e5046207c2d3b44f
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| 95651ebc7fbb2efba3f407f4825b7805874bbdf2 |
14-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5247764 profile and level settings are not always correctly set
Correct video bitrate value is set from 3gpReader node.
Also, bitrate is limited to max supported by encoder as
per profile and level.
This patch also fixes bug
5309520 [Prime] Native crash while running CTS test testExportEffectOverlay.
Change-Id: Icd649c02465e88553b6e69ea8bcd01baf66ded9e
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 709a3fb5571c1d9bd971662d21bb8aec607c7195 |
14-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 69591cfd3373eeae2aade289c7ece0237e0690a5 |
14-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| d95fdc569d82cdb850d3e6c701098e4bfc757fce |
14-Sep-2011 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 3f0c8217 to ics-aah
Change-Id: I6c72eae0add896919f06bf7e0172ddd7fc47e630
|
| 6de6b48237423a65ec041288c90e3f78fd3fce48 |
14-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Issue 5298399: Lost speech after a crash in gTalk."
|
| cfe2ba6b01a258e39f9c215ffc7b750e0b68f708 |
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
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| ff2ccd20c782918dd603b3cf53c3bf38d664bbde |
13-Sep-2011 |
Eric Laurent <elaurent@google.com> |
am 1fbe7a8e: Merge "Issue 4345021: Audio routed to multiple devices..."
* commit '1fbe7a8e828fd0fe8339d075da08aad701ab6e98':
Issue 4345021: Audio routed to multiple devices...
|
| 3a1dccab5f3be394572445f418a2f17f005db25e |
13-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Issue 4345021: Audio routed to multiple devices..."
|
| 60cd0a0d488e604d27fc7dbb02b00348693dfde2 |
13-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Issue 4345021: Audio routed to multiple devices...
There is a possiblility that the condition on which RecordThread::checkForNewParameters_l()
waits after updating the command completion status is never signalled.
This happens if the thread executing ThreadBase::setParameters() has timed out waiting
for the status (for instance if the audio HAL takes too long to execute the setParameters()
command. Then the RecordThread is stuck forever.
The fix consists in waiting for the condition with a timeout in RecordThread::checkForNewParameters_l().
Change-Id: I7fc671bc2fc43ba4acb65a2beb33ee05742f091e
ervices/audioflinger/AudioFlinger.cpp
|
| 9a22e68daf4bbc14a5382c3f064b8c14172768ac |
13-Sep-2011 |
Andreas Huber <andih@google.com> |
am bf208ec9: Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"
* commit 'bf208ec91ec80fd2a3c2474c236b09b37c1a02c4':
Support .avi tracks that have a sample size of 1, i.e. samples != chunks
|
| bf5db10436c0d194086237b3a90bb46b359ba688 |
13-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks"
|
| 7de73f4eb68f3aa478e19ba05a13bc84296f9894 |
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
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/include/AVIExtractor.h
|
| 9a5e04438df742c297c5dbcdb60e6fd4d8f8321d |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 0670646877c9fb407d7e6ffe6fab4c7076cd40d5 |
13-Sep-2011 |
Andreas Huber <andih@google.com> |
am fa6dfdcf: Don\'t post position updates too frequently
* commit 'fa6dfdcfd741980ba1c1d1971b69fc6f8a34dfeb':
Don't post position updates too frequently
|
| a607cb6f97eebf6615b6569d900f76a95dc5e700 |
13-Sep-2011 |
Hong Teng <hongteng@google.com> |
am c5cb77e4: Fix for -5234840 corrupted frames in transition. -Green frames in image transition.
* commit 'c5cb77e4ee0b21b5ecb235ec86b31f3fed828693':
Fix for -5234840 corrupted frames in transition. -Green frames in image transition.
|
| 714aa7b7c52ce07d5fb44870c0853b4d8e5a758e |
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
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
|
| 2dfdd19e456766962b8e4578c647d0a2d537949d |
13-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| bbdeb975603e0186e202ac34c891554b500f6d13 |
13-Sep-2011 |
Jason Simmons <jsimmons@google.com> |
Merge "Hold the AAHDecoderPump ThreadWrapper in a ref-counting pointer" into ics-aah
|
| aacf4e980181edab0c03e1c96fe1e6b0aa1f0493 |
13-Sep-2011 |
Jason Simmons <jsimmons@google.com> |
Hold the AAHDecoderPump ThreadWrapper in a ref-counting pointer
Change-Id: I8929905a7bf07a751b5deb4c74875172a33d874d
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player_substream.cpp
|
| 816cd5ae8896f4965b2f1a5ea72d59dcac7257cb |
12-Sep-2011 |
Hong Teng <hongteng@google.com> |
Fix for
-5234840 corrupted frames in transition.
-Green frames in image transition.
modified: vss/mcs/src/M4MCS_API.c
modified: vss/src/M4VSS3GPP_EditVideo.c
Change-Id: I2632d47c44f00bbc81e2b3e19b225178ab456810
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| 9245f7c6228675cde441b561742ee0d21cb420af |
12-Sep-2011 |
Andreas Huber <andih@google.com> |
am 7fc8f515: Merge "Turn an another assertion into a runtime error in ACodec\'s implementation"
* commit '7fc8f515a0add6837d525b4f2b4baa7ebe37fc7f':
Turn an another assertion into a runtime error in ACodec's implementation
|
| 9215ea4cd8bc5f9c9770c5c34a009dc7c6068f86 |
12-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Turn an another assertion into a runtime error in ACodec's implementation"
|
| cc54fbaa69c0b69929467449d2c19192f15b5039 |
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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
|
| 4d84f47e734a6904ef9b96a851701a615aacb039 |
12-Sep-2011 |
Andreas Huber <andih@google.com> |
am 465d42ef: Merge "Increase the avi extractor\'s confidence slighly over mp3\'s"
* commit '465d42ef781db15a603427115bd66341eb907c31':
Increase the avi extractor's confidence slighly over mp3's
|
| c6c4572cd35f739bfac2aa439b3664032e03dcd8 |
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
edia/libstagefright/AVIExtractor.cpp
|
| f9aef96a3ae9d56d06b3cf22fec165df6a2f57ea |
11-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 781a1b4fbd3fd56147e0bb4ed843f1b1bb0cb485 |
10-Sep-2011 |
Guang Zhu <guangzhu@google.com> |
am 973f553b: Make MediaScanner skip certain directories
* commit '973f553be4aabf9656d6c1596b47767896677b0a':
Make MediaScanner skip certain directories
|
| fb6f03425a791dcc4188462c860becf6ca6be4ea |
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
nclude/media/mediascanner.h
edia/libmedia/MediaScanner.cpp
|
| 2792afe3bc679c6f4784e5963898a947468704f6 |
09-Sep-2011 |
James Dong <jdong@google.com> |
am 6f84da50: Merge "Don\'t check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
* commit '6f84da50ad9a9fa044543fa5dde197f609b01a8f':
Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation
|
| 618b58c4237359328b06371d9d6e855d2e6ac42c |
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"
|
| 8edb8e82fa886564ee8e72178a1969e2437dd525 |
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
edia/libstagefright/OMXCodec.cpp
|
| a3bc6a944d5dadfa709c9f100eb14b8afcb7a6ba |
09-Sep-2011 |
Eric Laurent <elaurent@google.com> |
am 11e2e5de: Merge "AudioTrack: extend callback thread sleep time"
* commit '11e2e5dece7a92f50b73240dc0300343a7b495bf':
AudioTrack: extend callback thread sleep time
|
| 86e9c5c3e0007ca3d415f9d827e00cf9a6e89d5a |
09-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
am 5303254c: Merge "Always set geometry in queuebuffer"
* commit '5303254cc944449d08c8489caf288516445f7af0':
Always set geometry in queuebuffer
|
| 98afd841e8f0803a00d1970e4a28ea8999e9c498 |
09-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Merge "AudioTrack: extend callback thread sleep time"
|
| 7280088b2315b6c2eccd39f0f0363d498ec82f0d |
09-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Always set geometry in queuebuffer"
|
| 2267ba18d0d2b2d4bd7f5411821ad89ac2659a88 |
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
edia/libmedia/AudioTrack.cpp
|
| 7dc9b309f1ce01308bcfde9948ebfece32dc2870 |
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
edia/libstagefright/SurfaceMediaSource.cpp
|
| aa7ced607f2fd4da6d4b99737499fb39320c71b8 |
08-Sep-2011 |
Andreas Huber <andih@google.com> |
am 13561602: Merge "Audio player must not be used as a timesource before it\'s started."
* commit '135616025f06dfdfff3d6bed51885ef8de5f49b5':
Audio player must not be used as a timesource before it's started.
|
| f7eade99250520f2c9c8366a20a9256c4b34abc1 |
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
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
|
| b49fffa58ba8a92b506a9d0db79e293a88e0843a |
08-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2bff975a172e452462c95c25cc5f16ae5040c02f |
07-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5270905 fix MediaPlayer with IStreamSource
Change-Id: Ia8a6381a6c88b4a0a1378aab03f5275f0fa1125a
edia/libmedia/IMediaPlayer.cpp
|
| 8a667a2242eb4cebaf1b4262a68e1879e0446613 |
07-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
am 65e7815d: Merge "Bug 5270905 fix MediaPlayer with IStreamSource"
* commit '65e7815dd49a836e410bfa2817d9d48576547a9a':
Bug 5270905 fix MediaPlayer with IStreamSource
|
| 41610c37763fcea076cce18de9f5b4c7d9c30ea6 |
07-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 5270905 fix MediaPlayer with IStreamSource"
|
| 8d65510a2e9ff7b64f2f35bfe3cd745a717c9533 |
07-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5270905 fix MediaPlayer with IStreamSource
Change-Id: Ia8a6381a6c88b4a0a1378aab03f5275f0fa1125a
edia/libmedia/IMediaPlayer.cpp
|
| e9d447ff54dab886f7bc449f7db847402a26edb1 |
07-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
am 166c1b2e: Merge "Fixing bug in SurfaceMediaSource_test"
* commit '166c1b2e7a1a48a39ecd2400b94f9f21c9868810':
Fixing bug in SurfaceMediaSource_test
|
| 3991f099c643b718e78e0d938745ef2c5c431544 |
07-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Fixing bug in SurfaceMediaSource_test"
|
| 0f00a1030e82826d2aa4dd3787c1491965276e4f |
07-Sep-2011 |
Andreas Huber <andih@google.com> |
am 6a39c020: Merge "Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable"
* commit '6a39c0201ca72d6ccbc63e5fec75949a08fcb043':
Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable
|
| 74a0a0d7f766d63330a00c3fa8f133c44c1d5be6 |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| a6ca3b6e53877abb8987899adf0e0260d6702bfb |
07-Sep-2011 |
Andreas Huber <andih@google.com> |
am 01dba603: Merge "Stop metadata retriever from dereferencing a NULL pointer if"
* commit '01dba603d7c74756126297b843aca0befed8810c':
Stop metadata retriever from dereferencing a NULL pointer if
|
| aa9dfd5d07534c29337b5c72022f7dfecd85deea |
07-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Stop metadata retriever from dereferencing a NULL pointer if"
|
| ddf5f06aa1c312e30e68ff7628567498d539d434 |
07-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 7d60c64c6eceac310a173e04f4c3539bfd4be7d6 |
07-Sep-2011 |
Dave Burke <daveburke@google.com> |
am a57c639f: Merge "Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.""
* commit 'a57c639fa7639d80ad29b5b876934f46851dcc69':
Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
|
| d6e27296206b9f897401107f1c46f4ac2947be85 |
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
edia/libstagefright/MP3Extractor.cpp
|
| 1be9f48546785878c42fd7d750f9c8bdd9b9cd84 |
06-Sep-2011 |
Dave Burke <daveburke@google.com> |
Handle setDataSource failures properly. #5261671
Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9
edia/libmedia/mediaplayer.cpp
|
| e7484f36061a60aadadb01143d84964d931aa837 |
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
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 764f47d976cab9d2302ae8802f6f27d1ae221015 |
06-Sep-2011 |
Eric Laurent <elaurent@google.com> |
am b6738fc6: Merge "Issue 5247986: Battery drain due to audio wakelock"
* commit 'b6738fc6a5ab08c23ecc7c0d84316f5fa5e05064':
Issue 5247986: Battery drain due to audio wakelock
|
| a4f73a9e0e0863a567cc06defa0d9e0269388d4e |
06-Sep-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Issue 5247986: Battery drain due to audio wakelock"
|
| 408b8dc3c0a364c6f6b4991d15da9e6bcc2b8008 |
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
edia/libmedia/AudioTrack.cpp
|
| 2002f94ab433bece8b5055105d504da8386b9c70 |
06-Sep-2011 |
Dave Burke <daveburke@google.com> |
am f12abaf4: Merge "Handle setDataSource failures properly. #5261671"
* commit 'f12abaf40588615fa418fb711a4d754098b589f3':
Handle setDataSource failures properly. #5261671
|
| 2e3319a62be898e1f0405025d24962fc6a1a3f07 |
06-Sep-2011 |
Dave Burke <daveburke@google.com> |
Merge "Handle setDataSource failures properly. #5261671"
|
| 0662067b06658a4a56a8416c676f6cce8ccddb53 |
06-Sep-2011 |
Dave Burke <daveburke@google.com> |
Handle setDataSource failures properly. #5261671
Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9
edia/libmedia/mediaplayer.cpp
|
| 2140f4a1b8dd603d74624c758d6864fb92c7cb1e |
06-Sep-2011 |
James Dong <jdong@google.com> |
am 351f44af: Merge "Don\'t overwrite pending port setting change if there are more than one port setting change event."
* commit '351f44af54f001ee67908f9e1f601f8ffa7905d2':
Don't overwrite pending port setting change if there are more than one port setting change event.
|
| adc857e80a1045897ebad85e691dc04451d364e3 |
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."
|
| f928b167925692b201ac6ca685dad817e54df31d |
06-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2a378f6ef3bf90043868087fdd35cee75087c40d |
06-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 5694fb4b: Enable some logs to debug 5195693.
* commit '5694fb4b48eef9364473c34f0e013dc4baf576e6':
Enable some logs to debug 5195693.
|
| 35ef38a12e2412e3d2bae3baf802b326aa5671ae |
06-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 4a5d8c67: Fix 5240036: We didn\'t handle the 1920x1080 resolution.
* commit '4a5d8c671172fbafe9964d2d71137e7f69a26df9':
Fix 5240036: We didn't handle the 1920x1080 resolution.
|
| f64756945abb3f7d2849dd13a6ae3091d5b09ea0 |
05-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| d94b927cafef95db7de0c89b6ef8f246efc37c6c |
05-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Enable some logs to debug 5195693.
Change-Id: I1c71b6fa6b8dbcbf2a6685be5f24afddab4afc5d
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 31292d99f62a812af691e67e8e732c6ae582ee08 |
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
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| f6cf82b0e1ca335e2c4c2d5f0098ef401abb2532 |
03-Sep-2011 |
Eric Laurent <elaurent@google.com> |
am 929827b8: Merge "Fix issue 5252593: any app can restart the runtime"
* commit '929827b819415101d526ff68fb0b2c8adb885132':
Fix issue 5252593: any app can restart the runtime
|
| 3ba0dbaccdba00ea3ed5024c8dfd61acc4761227 |
03-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 71b63e3ef687c379368be6b02e70bd2feb0b6b8d |
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
edia/libmedia/AudioSystem.cpp
|
| 6a27e5cc0fec8aec44d5888e9b2298d3510d5aa5 |
02-Sep-2011 |
Andreas Huber <andih@google.com> |
am 69a5f6c3: Properly serialize access to FileSource::getSize by acquiring the mutex
* commit '69a5f6c3e04aa0f3f87eed7578a32782c97bd48f':
Properly serialize access to FileSource::getSize by acquiring the mutex
|
| 3a13fad63af40a8364fce796b1a54a8f0a2fbf32 |
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
edia/libstagefright/FileSource.cpp
|
| cce1c2bd3308934f7c207bc291ccb089189666b0 |
02-Sep-2011 |
Dave Burke <daveburke@google.com> |
am 1d477c53: Merge "Require INTERNET permission for network-based content. Bug #1870981"
* commit '1d477c53bf2f389813d04d5163d210fccf00ceb9':
Require INTERNET permission for network-based content. Bug #1870981
|
| d681bbb1767bed09415e050ba78975df214bcd68 |
30-Aug-2011 |
Dave Burke <daveburke@google.com> |
Require INTERNET permission for network-based content.
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
mds/stagefright/stream.cpp
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerService.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| e02eee1a408656be9beaf1b0ba656dd1ee103799 |
02-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5240036: We didn't handle the 1920x1080 resolution.
Change-Id: Id48c7db085bb73625acad365e0a036c8e45567dc
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
|
| 97857479de48fda4c33bb415b2fbb15193f768e8 |
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
edia/libstagefright/OMXCodec.cpp
|
| 95d2213d9c19e7c6044b9498ff198a784594c834 |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
am ae510085: Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset."
* commit 'ae51008564a7a32199a144544a4ab57b976ffa9d':
Guard the audio notifications with a separate lock to avoid deadlocks during reset.
|
| 1e2e3cc0ab5bb11e19879b54e1eb67e6d48fa32f |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
am 7f5ea61b: Merge "Signal an error when encountering a malformed .ts stream."
* commit '7f5ea61b0f0ac479f836c0c47b8b212d73486a0d':
Signal an error when encountering a malformed .ts stream.
|
| d942202ee0c92608c648735c3ad0f1bab4312420 |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset."
|
| 02f6e988107bc13ebe4828b734ea0fc3d9d11ae0 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 5403129e2a2f44620f2ac8109889e5a61be08732 |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
Signal an error when encountering a malformed .ts stream.
Change-Id: I3ab0215419214b652573945403eb45eb09d41aff
related-to-bug: 5114811
edia/libstagefright/mpeg2ts/ATSParser.cpp
|
| af7fab4815f79043f745b9060852642dbabb0f37 |
01-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| cc471328b4e5209e4b2dddd71beaf7fabd68206d |
01-Sep-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ac220500953f75d64d611bbed5e47cffc6467cfa |
01-Sep-2011 |
Wu-cheng Li <wuchengli@google.com> |
am 98bb251c: Add video snapshot camera parameter.
* commit '98bb251c8b527600e7a4cca6cc33499710bbfbf1':
Add video snapshot camera parameter.
|
| a8e409f8f9b40737d0b03355894b5e141d0aff6b |
30-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add video snapshot camera parameter.
The API is still hidden.
bug:5187868
Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
ervices/camera/libcameraservice/CameraService.cpp
|
| c7f4fe3e6cb658a354d10246b5a890ae6e569b28 |
01-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
am abf82f9e: Merge "Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource"
* commit 'abf82f9ea4960ead8716b183aac1792820cccdd1':
Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource
|
| 77d2e08add3ba24fdc527809408028efe3e06b6b |
01-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource"
|
| ed362eccc7eabc669f9f39169e26662a7215d198 |
30-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource
The buffers in SurfaceMediaSource were 4 earlier, whereas
we need 5 for one of the devices.
Change-Id: I87bf5e28bbb0f7c9661dc01b040baa903d95d2c2
nclude/media/stagefright/SurfaceMediaSource.h
|
| 0c1d74f99f487f300bdf1e553664b4620ccd85fb |
01-Sep-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 16757d25: Fix for 5156702 Rotate video output for thumbnails and export
* commit '16757d256453f0c765c13ca9d97ca89fc5565420':
Fix for 5156702 Rotate video output for thumbnails and export
|
| 740d70412e859b250d2fcb9b3e04f5cc81b38cb9 |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
am 9100473a: Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next"
* commit '9100473a7e908c7292008140f76ca5009a4335d4':
I have one HLS stream that switches stream PIDs from one bandwidth to the next
|
| 9a09daedb81cb470dbb5ad8b9f4d17fbfdfdf350 |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
am afbb70b4: Merge "Discontinuities are only signalled on streams that have been identified, i.e."
* commit 'afbb70b48e348410279816639eeb61f8a33064d2':
Discontinuities are only signalled on streams that have been identified, i.e.
|
| aec548b979f3d64712e8aa84cffdc4b7f094a798 |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next"
|
| ef96bbce63da03bc0f0ad86174567cfdd5990c1b |
01-Sep-2011 |
Andreas Huber <andih@google.com> |
Merge "Discontinuities are only signalled on streams that have been identified, i.e."
|
| 06528d7f18ad01377357d337eaa3e875a242bd2d |
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
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 18ac5407da14dad9731f40ffc9a56bee73830019 |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
|
| 1afe4059bc821a2e09103589c6714e1204a55f13 |
01-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
am d318b73e: Merge "Update SurfaceMediaSource_test to not use pbuffer configs"
* commit 'd318b73e8e7832f257797ce08b3eea02780b7909':
Update SurfaceMediaSource_test to not use pbuffer configs
|
| c6b551541a6abd68bc3f3add07c196be4badccf3 |
01-Sep-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Update SurfaceMediaSource_test to not use pbuffer configs"
|
| 236d9fdbe9b292c4c3195dbb7fd00ef48d9227b6 |
31-Aug-2011 |
James Dong <jdong@google.com> |
am e3fb1cb1: Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
* commit 'e3fb1cb1b1f333aadc780c85de0735143ad864b4':
Fix a crash where the EOS was signalled but some output buffer were still pending.
|
| f11b37bc9c92380cafadad7c8988f170687b8dfe |
31-Aug-2011 |
James Dong <jdong@google.com> |
Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."
|
| 877fd3c7c5bbb4187ff9df2479a1af25be3124a5 |
31-Aug-2011 |
Eino-Ville Talvala <etalvala@google.com> |
am b2c4f0bf: Merge "Fix SurfaceMediaSource timestamp handling."
* commit 'b2c4f0bf11f38fd31d80f1256c89b9db043a2929':
Fix SurfaceMediaSource timestamp handling.
|
| af6764da53c022768290e735bbcc3088bec333d8 |
31-Aug-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Fix SurfaceMediaSource timestamp handling."
|
| c6e29ec11ac23e763ef886e709ca1ad66128348e |
31-Aug-2011 |
Gloria Wang <gwang@google.com> |
am 3727e3d8: Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419."
* commit '3727e3d80d37fc8004ddaa4ec589bd8d9c304fad':
Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419.
|
| e31f4f78729f66b3a90f51671ad557b551ed0bea |
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."
|
| 5b75fdc8fbc026453888cbb2d3fe31345394618b |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 9b153bee7ae11a7dc3857df02038abae1a6e53e5 |
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: Ic8fd28b1bbd85e86a325f99013e7aa0c763f5f05
Signed-off-by: Mike J. Chen <mjchen@google.com>
Signed-off-by: John Grossman <johngro@google.com>
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| c0bcf75243267e7f6af4f3f7d45cb97c31d99abc |
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: I190ecddf1dc919761c2e4ec740c2f3b2c9541156
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>
nclude/media/MediaPlayerInterface.h
edia/libaah_rtp/Android.mk
edia/libaah_rtp/aah_decoder_pump.cpp
edia/libaah_rtp/aah_decoder_pump.h
edia/libaah_rtp/aah_rx_player.cpp
edia/libaah_rtp/aah_rx_player.h
edia/libaah_rtp/aah_rx_player_core.cpp
edia/libaah_rtp/aah_rx_player_ring_buffer.cpp
edia/libaah_rtp/aah_rx_player_substream.cpp
edia/libaah_rtp/aah_tx_packet.cpp
edia/libaah_rtp/aah_tx_packet.h
edia/libaah_rtp/aah_tx_player.cpp
edia/libaah_rtp/aah_tx_player.h
edia/libaah_rtp/aah_tx_sender.cpp
edia/libaah_rtp/aah_tx_sender.h
edia/libaah_rtp/pipe_event.cpp
edia/libaah_rtp/pipe_event.h
edia/libmediaplayerservice/Android.mk
|
| b6ac2bf63da6eedb0027e5670c16a528a4ceb01d |
31-Aug-2011 |
Andreas Huber <andih@google.com> |
am 49fb943d: Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"
* commit '49fb943db85c748fc7dd4f5ee4a461d7489fb1b0':
ATSParser now supports a mode in which PTS is considered to be absolute time
|
| 935456794a8d572368ebe942d13451f7d71a9f4e |
31-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"
|
| c07b7543cf271a4c2a741b9dbcf2d12f1bd2a6b5 |
31-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 21fcf0830c8b4fb544a09467bc96a8d0463ad966 |
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
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 5603988205785a2efd7b6a288edac4c037ee4d7e |
31-Aug-2011 |
Mathias Agopian <mathias@google.com> |
am c21843a8: Merge "fix Surface positions are not floats"
* commit 'c21843a8b5c395cbaae6db0f786bdee556075f5d':
fix Surface positions are not floats
|
| c3d8f74cda26197ec9066374fe31abe9ee77c1b1 |
31-Aug-2011 |
Mathias Agopian <mathias@google.com> |
Merge "fix Surface positions are not floats"
|
| 8343f2c317b48f9b9827781b16a5c9fd31743826 |
31-Aug-2011 |
Mathias Agopian <mathias@google.com> |
fix Surface positions are not floats
Added Surface.setPosition(float, float) which allows to set a surface's
position in float.
Bug: 5239859
Change-Id: I903aef4ad5b5999142202fb8ea30fe216d805711
nclude/private/surfaceflinger/LayerState.h
|
| e8eb2f4f0f8eff0313a27892ab8514223553d943 |
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
edia/libstagefright/OMXCodec.cpp
|
| c4c17d47b674b425fb6c399822c0ab3258543c0a |
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
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
|
| 4a7d90c6a93cc69422969438fba9e40f5a433d0d |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 9641158ef2bafc1de350218e0ec902f55f664dd3 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| e9eec0e0975c57c0dac91eb5b4cbb052b7dd011a |
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 native engine part.
Change-Id: Icde922194a123a90544942caa12430fc3c4ef10e
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/lvpp/VideoEditorTools.h
ibvideoeditor/vss/common/inc/M4DA_Types.h
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 8e8ff1cde94c09dfc410959d5649c86f60322ef5 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 514166986238c99e32995af204160b9d58805dc6 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| fd07e4e40fa914a6d89b4aece3a04342d7a17701 |
30-Aug-2011 |
Eric Laurent <elaurent@google.com> |
am 0e35c78d: Merge "226483: A2DP connected, but music out to speaker"
* commit '0e35c78d25a8df8b3bde566ad6c474f9df242ea4':
226483: A2DP connected, but music out to speaker
|
| b76e90de3c64626fe07a68469d0a59a31c8efb6b |
30-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "226483: A2DP connected, but music out to speaker"
|
| df4a59c61103e7e0e9332e167a0be67da5d82ff3 |
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
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 9f6530f53ae9eda43f4e7c1cb30d2379db00aa00 |
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
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 96c0b20f989a61c3b54cb41c83e73df4a8b5d590 |
30-Aug-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
am c5d0fac0: Merge "Bug 5156756 Fix AAC ADTS header size computation"
* commit 'c5d0fac081c4c496b29586bff79dfff05755b716':
Bug 5156756 Fix AAC ADTS header size computation
|
| 1619f3d3428e9d502dc477d31e0681fe1cd12b89 |
30-Aug-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Bug 5156756 Fix AAC ADTS header size computation"
|
| 04170bc2cf9d543b0ca6b87d24b2a256bf08e4d0 |
30-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| c152f91d1f27468031cb417a3d4013c7bb0bf92a |
30-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
am 3dfb1013: Merge "Fix 5200858: we need to pass timestamp to render correct frames."
* commit '3dfb1013e98178bace7a4437288018780141f556':
Fix 5200858: we need to pass timestamp to render correct frames.
|
| dac2f050b814bd72ff66b4ae58634c25fb2185ff |
30-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5200858: we need to pass timestamp to render correct frames."
|
| bf4c48bc678c8f531f39f0b48755967d844ad581 |
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
edia/libstagefright/AACExtractor.cpp
|
| ca426b4bff9840b3dc3c523d893185debf487efd |
30-Aug-2011 |
Jason Simmons <jsimmons@google.com> |
resolved conflicts for merge of 35c0bf31 to ics-aah
Change-Id: If736c93821359a2f97a0670ad3be8ada5f398bd7
|
| 1ae9d3b64102e317fbf32584a81e8be96db8ce64 |
30-Aug-2011 |
Andreas Huber <andih@google.com> |
am 499f3658: Merge "Return an error to the client instead of asserting if decoder instantiation fails"
* commit '499f36581c63579f24c3d9bbf95c7f8677cd1191':
Return an error to the client instead of asserting if decoder instantiation fails
|
| 13e6dfbd77a6e2c2832cbfe6dc66f3db8716538b |
30-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Audioflinger: reverse logic of BT NREC indication"
|
| bee5337da7659b3b7128622ba1f42618b11df5be |
29-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Audioflinger: reverse logic of BT NREC indication
The interpretation of BT NREC by AudioFlinger to enable
or disable AEC and NS was wrong: NREC to ON (default) means
the phone (Audio Gateway) must enable local AEC and NS.
Change-Id: I88a264e7fc9831c43bbace4f6b585baec73f2006
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 63970b42f101c87db7cfd26d43b0d300260b1582 |
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
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| dcdbcc5cacf8a60edec0a8202ff6380816625eb4 |
29-Aug-2011 |
John Grossman <johngro@google.com> |
Add a missing NULL check.
The get_next_write_timestamp method introduced to the audio HAL is optional.
HALs which do not implement it leave it set to NULL. Callers (there is
currently only one in the AudioMixer code) need to be certain to check for NULL
before invoking it.
Change-Id: I9e06d688311c388446bb53993291ebc0f98cff89
ervices/audioflinger/AudioFlinger.cpp
|
| 71c19fd4078b026dbe1c528c40e670a09893eff2 |
29-Aug-2011 |
Andreas Huber <andih@google.com> |
am b3c084af: Merge "Signal errors to the client instead of asserting in ACodec."
* commit 'b3c084af16dfd50c20c10320bf2b1e8d4d0cc5b8':
Signal errors to the client instead of asserting in ACodec.
|
| 1b5a697dc5435c76447eb5a2de373f5acdda119e |
29-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "Signal errors to the client instead of asserting in ACodec."
|
| 9b8626982264f05c6fb90ff1eed4d255871a438b |
29-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| d125366181feab7e45905a8051c94ab5a845e503 |
29-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5200858: we need to pass timestamp to render correct frames.
Change-Id: I262cefabea87f75883bcd074370deae054df3e88
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| e2d85bec773bb102f5a77ae3fcb2a820d71ad824 |
29-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
resolved conflicts for merge of fc3d6b6b to ics-aah
Change-Id: I63d2f5cc45de5be7fe5ce54bb36194067410180f
|
| a007d502e7572b225124eea31defbd27b59d4161 |
29-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5123908: Native crash rewinding movie"
|
| a6fd64b2f3370a4dc6622107f534fa225954d89f |
28-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
am 3451df1a: Merge "Default W, H allowed in SurfaceMediaSource dequeue"
* commit '3451df1a5cc1547fe1061a482a50a639fcc0e8e4':
Default W, H allowed in SurfaceMediaSource dequeue
|
| c7de3f6bbaa6c1b8b334574fad34d583e3a67f5d |
28-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Default W, H allowed in SurfaceMediaSource dequeue"
|
| bfbd3eb5826d42febe4b1e2bd220ab444d368a4b |
27-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
am b8a9e15c: Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
* commit 'b8a9e15c2aa3d317834555244a90f184b46e1dcb':
Modify enum value of OMX_COLOR_FormatAndroidOpaque
|
| 6004f2dc9af4088e34cc72b1ac3c4a3c5cd4ae14 |
27-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
|
| 3c1f8da74209676d9df4c26d3ea1346b927fd0bb |
27-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
am 2b9c5d8a: Merge "Fixing small syntax error in MPEG4 logging"
* commit '2b9c5d8a89065ab18e58d79ae65a81267b248e1c':
Fixing small syntax error in MPEG4 logging
|
| f4b25b1dca4f1798c6f3f989be0738258d6504de |
27-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Fixing small syntax error in MPEG4 logging"
|
| 790332a3170f967d58cee5d89cc92be8205d9aa3 |
27-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
Modify enum value of OMX_COLOR_FormatAndroidOpaque
The enum value chosen earlier had a conflict with one of the vendors.
Change-Id: I47832dd1157447f89324d56e8ab146260cd7927c
nclude/media/stagefright/openmax/OMX_IVCommon.h
|
| 5410afcbb0af5d29d9f710a1c2978c500f9792dc |
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
edia/libstagefright/MPEG4Writer.cpp
|
| cb67cd1b51ff9ab221e3124cf7e546515fef3c87 |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libstagefright/ACodec.cpp
|
| 4ff0fa0b92e01157dabfd18adb27532718f109be |
15-Aug-2011 |
Mike J. Chen <mjchen@google.com> |
Incorporate aah changes to AudioBufferProvider into VideoEditor
This is a squashed merge from master-tungsten of the following change:
commit e1bec6e10c8d7462a0970568153a2d9db1463e6e
Author: Jason Simmons <jsimmons@google.com>
Date: Thu Jun 16 14:22:57 2011 -0700
Change the interface of the AudioMixer and AudioBufferProvider to accept a presentation timestamp
Change-Id: I565b48450f98089767bf92b435826c9f4baeb01c
Change-Id: I76021f5de9aad92381678e299c8e8b5a77d577bf
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>
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| 535235cf879728dca680279c21b37d5b0be5b10f |
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: Id78bba8c002131d8b52b4170259a87fd94e63c73
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>
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioTrack.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioTrack.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.cpp
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/audioflinger/AudioResamplerSinc.cpp
|
| d2824a9a392e02a09929a34f0a3dad41ac1faacf |
26-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "Support for posting messages and synchronously waiting for a response."
|
| 0b293e76c8fe4e973ccd8a872bc5320ba28d49cc |
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
edia/libstagefright/AudioPlayer.cpp
|
| 5f9cd08076587935f798b2b2eba4aa202362f532 |
26-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5212886: free the reader after freeing decoders.
If we free the reader first, the decoder may still read from it
after the reader is freed. So we need to free the reader last.
Change-Id: Ib6c7d6991d544870f1b3892387d0db312d501755
ibvideoeditor/vss/mcs/src/M4MCS_API.c
|
| 072be1ea494b0f4ca6d184e6c53d9ba01e539de2 |
26-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5200962: Handle 0-length buffers from OMXCodec and drop it.
Change-Id: I67c42c41f649f8e37055721efb67ab3ca4b02f0b
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| 8d9d585ce5b1aa284289a27dda048c6317b104e7 |
26-Aug-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Bug 4364249 Play position is 0 after flushing AudioTrack"
|
| cd07594333cbe8b2c86c6609cce01a74d6cc33f8 |
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
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| 5df775d2f509c76e76a46615fca83dba95299f6e |
26-Aug-2011 |
Andreas Huber <andih@google.com> |
Support for posting messages and synchronously waiting for a response.
Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c
nclude/media/stagefright/foundation/ALooperRoster.h
nclude/media/stagefright/foundation/AMessage.h
edia/libstagefright/foundation/ALooperRoster.cpp
edia/libstagefright/foundation/AMessage.cpp
|
| 24245683b9285b0b53c8900f088cf146000501c4 |
25-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "When encountering a discontinuity, flush(clear) all content enqueued up to that"
|
| 9a442c1b9a051edc6d4ceb0daad2d0a8433e7b0b |
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
mds/stagefright/stream.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
|
| 9a82f8acd4138fe920e91bd73e0041d52b2db237 |
25-Aug-2011 |
Gloria Wang <gwang@google.com> |
Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug 5208736."
|
| 1a49a13f20a06c2b58b97ad311a90d8eb0956052 |
25-Aug-2011 |
Gloria Wang <gwang@google.com> |
Set mSeekNotificationSent as false for RTSP seeking.
Fix for bug 5208736.
Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
edia/libstagefright/AwesomePlayer.cpp
|
| 934d865a807e149b97d11b54c674d421b51bbe8a |
25-Aug-2011 |
James Dong <jdong@google.com> |
Merge "When Camera is launched by media recording framework, stagefright controls the stop and release."
|
| 159b678dc12130d91d133bcc044016242701b5ff |
25-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| aef59c544429aae73429a1325d43e830600e3b67 |
25-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5180429: Initialize native window transform to 0.
Change-Id: I2730895059d408fa731dc4ca8da3f7984fe196ae
ibvideoeditor/lvpp/PreviewRenderer.cpp
|
| 9197441e59be323e2f6f0c6506f7248eb6a944b2 |
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
edia/libstagefright/CameraSource.cpp
|
| 539a735a82fefb1944aa6135df73dfe9f541566c |
25-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Port setting change should happen before receiving any filled frame."
|
| f76e1672c674620cb056f338a25ee4826d55dfcb |
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
edia/libstagefright/SurfaceMediaSource.cpp
|
| 1797e5d00e0ba4048c2258f091e6fd80748aa0ad |
25-Aug-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"
|
| 0c5c7d2b119d2350c186ae9902919bcf28c3e277 |
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
nclude/media/stagefright/SurfaceMediaSource.h
nclude/media/stagefright/openmax/OMX_IVCommon.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/tests/Android.mk
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 8e4aece4f5a522c5f1695cd408a39d69e408029f |
24-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 3281e721c785304613c44853fc506b43cfea343c |
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."
|
| 16ecf765405a22118e9d3bd2d3c22df374794dcf |
19-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5151331 [CRESPO] testPerformanceExport failed
Ensure encoding width and height are multiple of 16.
Change-Id: Ia077a52a16273cb9f775ebe0f0c66a81a35b9e19
ibvideoeditor/vss/mcs/src/M4MCS_API.c
|
| ed422aa0dfab77312d25d52e7f204744ba16dc27 |
23-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "We were accidentally sending out an output buffer before the final port settings change"
|
| eca1762d92c43f2b7836941d14e453d4c0f9ed99 |
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
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
|
| 0e8f3d8060cecfa2046a421c120cb5d0320423ca |
23-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "AudioFlinger: add check for audio HAL init failure"
|
| a1884f9e9ec3836683efd7eb333ee442e8bc9d56 |
23-Aug-2011 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: add check for audio HAL init failure
Do not call audio HAL functions on the primary HW interface
if it could not be initialized properly.
Change-Id: If54059c8fd188d6c1686f9e0439994fe9411478a
ervices/audioflinger/AudioFlinger.cpp
|
| 14682764433491e70d9c8f6773ce82e0c5b62015 |
23-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 3d974e7763495d8fda6f264810619cb3bd265293 |
18-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5123908: Native crash rewinding movie
Simplify the VideoEditorSRC code and fix some bugs.
Change-Id: I6bcf3a5cea21a2eec4b51f167560c4b0d3a04a29
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
|
| 84f74fbfeec81eb59e874660fd52ad42820ea8a2 |
22-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Port setting change should happen before receiving any filled frame.
Change-Id: I12a54b80e7ef958b6d451b7add110d38f05ec439
edia/libstagefright/OMXCodec.cpp
|
| 8c32b164d00d3e4d73764d06956331f09693ef43 |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/MatroskaExtractor.h
|
| fe59a75356c01f45463d3d0ba51203491a952fe2 |
22-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2edd41583bb8c2b90c332980e0d1c34ae9ede34e |
22-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove useAndroidNativeBuffer(2) warning message."
|
| 759f2893897c7b7a4822923d8d8ac13eec712b26 |
20-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)"
|
| f764f8c0625762d98eacadb582c7308dba1c7b79 |
19-Aug-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "Stagefright: fix a compiler warning"
|
| 8f74b712fbf5c24de8bc799b7129dc802747a6f4 |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| 0a25bd5bacf5408ca205b15e53cfb6dc2fc1d171 |
13-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 4142219 Don't hard code platform-specific limitations.
Also fixes 5118207 add other video codec support for video editor export.
For importing video clips, Video Editor engine will query StageFright codecs
for supported codecs, profiles and levels.
For Export, the profile and level are configured in media_profiles.xml
Change-Id: I85c8bb8b87cfcf0f1351ecb8c4f369a8902e7a09
ibvideoeditor/vss/common/inc/M4DECODER_Common.h
ibvideoeditor/vss/common/inc/M4ENCODER_common.h
ibvideoeditor/vss/common/inc/M4VD_EXTERNAL_Interface.h
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
ibvideoeditor/vss/inc/M4PTO3GPP_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
ibvideoeditor/vss/inc/M4VSS3GPP_Extended_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4xVSS_API.h
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/mcs/inc/M4MCS_API.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/mcs/src/M4MCS_Codecs.c
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 67f43688334bcd72ae7c3b5b386c1b6a34711f4f |
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
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
|
| 50bb96ca6d19846b20b8016cf020e6a3a80e495e |
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."
|
| af64a8a6ad89f52685e822dca30742a4132c9ae6 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 7341123ed8fed903c593a38d57ffabad3ad62860 |
18-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "Some decoders require more gentle treatment"
|
| 14f95746466fb6abdbbf33ee26d92ebf3fbef98f |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| cdef698dae0c6dd89755f6494cc3d4b163f410ef |
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
edia/libstagefright/AwesomePlayer.cpp
|
| adb7d71831b85d5157ad64ec607821ebdfabfc65 |
18-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 2e17686223bad35101c23083dc79f1d12f3ff429 |
18-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Remove useAndroidNativeBuffer(2) warning message.
Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| f80b313837cca881971bb0afebf23a0381fb99a0 |
18-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5115581: Native crash while importing audio track
Add locking in storeBuffer and read.
Use the Vector class to simplify the code.
Change-Id: If36ddda432df2b6d6d728b27fa196d2a655e0ba4
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
|
| 97f2fb5bc753f021bfa51f58129bc1a36c047c47 |
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
edia/libstagefright/MP3Extractor.cpp
|
| a17b835f5b0bf42f4855fe57aef42799f28f3915 |
18-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."
|
| ee0846f97cf07f5f18d19161526743330aabb44e |
17-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "Make sure we have all the sample table metadata before declaring a track valid."
|
| 169c286ed166499c5099d2b336967e0bf3d25551 |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/include/SampleTable.h
|
| 1e7d2ba8b79e548286a649ca91402a2d41f59fa0 |
17-Aug-2011 |
James Dong <jdong@google.com> |
Merge "Don't time out prematurely for video encoding waiting for output buffers"
|
| ab3f1388c71aed957f94ddab976faa77ab77e67f |
16-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.
The API is still hidden.
bug:5086125
Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 2e90f158697dd9c0703730986bf1f6f9a5944a94 |
17-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 8a976a863cf921f97feff8be63f11775a1d8b76f |
17-Aug-2011 |
Kristian Monsen <kristianm@google.com> |
Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
|
| 61659f61b8dec729ffc03ef88e2d87f8941dcfc0 |
16-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "Error handling in ACodec and Nuplayer."
|
| c92fd24c10a6bf80b346d7e261325434d9c6964b |
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
nclude/media/stagefright/ACodec.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libstagefright/ACodec.cpp
|
| 99590d29c9d3081cadfccd036842f5ce9a7debef |
16-Aug-2011 |
Andreas Huber <andih@google.com> |
Properly initialize some instance variables.
Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34
edia/libstagefright/AwesomePlayer.cpp
|
| 64b944106c697933a453a1ffd8bcddb137fdbc4c |
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
edia/libstagefright/OMXCodec.cpp
|
| 421b31b7a859b6aa6185a36143158ef59f751adf |
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
edia/libstagefright/Android.mk
|
| 88e95be1f74ca9d8a536cad1d8b2e0d9d25ad00f |
15-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| b3626dda1df18de2398d6c91647c9d544dd5f6dc |
09-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Speed up thumbnail generation.
We accept a tolerance parameter while decoding. We also tell the
stagefright decoder to jump so we can move to the new frame faster.
Change-Id: Iede3c1f909f1c42b2d5a53c782083367b00f62fb
ibvideoeditor/vss/common/inc/M4DECODER_Common.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4DECODER_Null.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| a5cc7cce9b8aee73b08f6532710e186c02fdd1c0 |
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
ervices/audioflinger/AudioPolicyService.cpp
|
| 0270b188aa3929cc512ec6869caba1d6b60cc08c |
12-Aug-2011 |
Marco Nelissen <marcone@google.com> |
Don't remove effects on session 0
b/5159902
Change-Id: Id6f29fb1c687069f7480dd81d4745a558f202226
ervices/audioflinger/AudioFlinger.cpp
|
| db29e5238e28d59978755a2ff2e7e0f05393abdf |
12-Aug-2011 |
Jason Simmons <jsimmons@google.com> |
Add a null check to handle failure of android::createPlayer
Change-Id: Id56bd0c16104e46d8dc71f13d8a44aefe251fad4
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| a2e0a4259191fc486e0f563b992e3eadd7f9ae4b |
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
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
|
| a0dac9e24ae7520cb7d7f0505bf0936bffbcd047 |
12-Aug-2011 |
Jamie Gennis <jgennis@google.com> |
Stagefright: fix a compiler warning
Change-Id: Ia6b2027dfe80960450156d918bdd7fe1567cafea
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 6f3241d50fbe217df6cb82ff2b079135ea50c553 |
11-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Audio effects: track CPU and memory use separately"
|
| db7c079f284f6e91266f6653ae0ec198b1c5006e |
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
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 4451bb5747a401eb92d2939859e1275a15453671 |
11-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 08b82bddf54757ad6bd243181f1b68a79bb70e6d |
11-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Add connect calls for SurfaceTexture. Clean PreviewRenderer.
Now connect() is necessary for SurfaceTexture.
Also cleaned unused code in PreviewRenderer.
Change-Id: Ic49df01e79f38a48a8c2cf194d13ee575660c834
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 94fbe4c6e29a7ea9800ea94cacc2d095ff25ab77 |
11-Aug-2011 |
Kristian Monsen <kristianm@google.com> |
Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
|
| 8adb83ba4837b3c9de1a4221a5ca4c371a62e38c |
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."
|
| 83ed9d41b5aea53a5f3f0ae2fa14e101c079a12a |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 7231e169c1a00c6e69b3517ca9b851659dd96fed |
10-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "When using "secure input buffer mode" we instantiate a different OMX component"
|
| 35b4be1751893dfbc376b474f339b45b24bfffd4 |
10-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""
|
| c4847184f0d351ca2587ca66dc5ab8eab4dbe207 |
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
edia/libstagefright/OMXCodec.cpp
|
| 17741baf43818ca66c2a88db6b6e252d7abfff49 |
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.
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| d4495be0d417efbcf51d4b257228b8c10dc3617f |
10-Aug-2011 |
James Dong <jdong@google.com> |
Merge "Fix initial 0 duration video sample in the recorded videos"
|
| ff0299b487657d866adb5062d7fc9f02eaa15792 |
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."
|
| 56e6d29d951cf514817f0a2c8b02138403716f01 |
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
edia/libstagefright/Android.mk
|
| 674dac1847423117e7fb43787bca05d16edf51da |
10-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| f12d5faa1986384f2c899b50057142a6a2e40eec |
10-Aug-2011 |
Ashish Sharma <ashishsharma@google.com> |
Merge "Network traffic accounting for chromium stack support in mediaserver."
|
| 80ec929862bcfe8582984f3a28e7a4ca5f4f27bb |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 129a94a569c927d4c8906a12f3de74ca0585d3f2 |
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
|
| 5a217fba010e801c255503602bda4b86ac5a6ac9 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| beccb75d0c511950fb59500b05a591942d5c4751 |
09-Aug-2011 |
James Dong <jdong@google.com> |
Merge "Do not release recording frames if camera is gone"
|
| 3a34befc6fb04a4945a849e8bda8b84e4bf973fe |
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
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/mediaplayer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 7b0a960ef4bdf5529070d575b98222f55433f243 |
09-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for 4132872 inefficient export logic."
|
| 9618fc9eccabf1d6f0ab0051cd2c7fbd4795aeec |
09-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 820a509687599edb8ff1a7577de8b9295f416263 |
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
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 6e779fda8a4f6258f9b910290b2f296d18fb2585 |
04-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 4132872 inefficient export logic.
Also fixes 3371103 Transitions between images takes a long time
to generate.
Redundant transcoding is removed. Decode encode will be done only
once per clip.
For images, conversion to 3gp clip is removed (except for generating
Kenburn image clip).
Change-Id: Id722cd0296641bd643eb5c63f4d8028716259c01
ibvideoeditor/vss/common/inc/M4DA_Types.h
ibvideoeditor/vss/common/inc/M4DECODER_Common.h
ibvideoeditor/vss/common/inc/M4DECODER_Null.h
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
ibvideoeditor/vss/common/inc/NXPSW_CompilerSwitches_MCS.h
ibvideoeditor/vss/inc/M4VSS3GPP_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/M4DECODER_Null.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
ibvideoeditor/vss/src/M4VSS3GPP_Codecs.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| a1f10e8959cd4656aedb2613e855342102e59555 |
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
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| c3e6572e0ff535932b1f6ffb7bcf5acd891675fb |
08-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "AudioFlinger: protect input/output stream access"
|
| b8ba0a979067a4efb0b3819bf17770793e41c15e |
08-Aug-2011 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: protect input/output stream access
Some methods would not check that the output orinput stream of a thread
was still valid before calling functions on its interface.
This could cause a crash if those methods where called while the output or
input was being closed by another thread.
Make sure that the output or input stream pointer is cleared before closing the
stream.
Always check that the output or input pointer is not null before calling
functions at the stream interface.
Generalize the use of initCheck() method to verify that the output or input
stream is not null.
Change-Id: I9d9ca6b744d011bcf3a7bbacb4a581ac1477bfa5
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 2aa01fd002bba1dde45791c1138c1f71a8d0aa53 |
05-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Rename YV12 to I420.
Change-Id: I453b7044bf46950ef67091f3417ed3e6a65086a0
ibvideoeditor/include/II420ColorConverter.h
ibvideoeditor/include/IYV12ColorConverter.h
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/I420ColorConverter.cpp
ibvideoeditor/lvpp/I420ColorConverter.h
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/NativeWindowRenderer.h
ibvideoeditor/lvpp/YV12ColorConverter.cpp
ibvideoeditor/lvpp/YV12ColorConverter.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 43fcc396614a587851e2b7c4cea2876ec58b8648 |
02-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Use GL to render preview.
To speed up the preview, we direct the decoder output to a
SurfaceTexture, then draw the texture to a surface. The media
rendering parameters (crop, black-border) are implemented
using different vertex coordinates. The color effects are
implemented using fragment shaders. Currently only three color
effects are implemented, but that's all the appplication uses.
Change-Id: If84439fee572ed37ea077749ef9f2bd4f78703e1
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/NativeWindowRenderer.cpp
ibvideoeditor/lvpp/NativeWindowRenderer.h
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.h
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| 334d097870eefeb45137b6df026f7db861d47663 |
06-Aug-2011 |
James Dong <jdong@google.com> |
Do not release recording frames if camera is gone
Change-Id: Ia6038c1a3ca17207e43a955ec47c42cdff1f5a76
related-to-bug: 5129465
edia/libstagefright/CameraSource.cpp
|
| a23456b306f35b9ecf973bf5818ca39295e9e029 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/chromium_http/support.cpp
edia/libstagefright/chromium_http/support.h
edia/libstagefright/include/HTTPBase.h
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 49490c92ac2f791274a3fe760adeb3399a0df024 |
05-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| ea7c2fea6a031d37270cb5b22b432729626b266d |
05-Aug-2011 |
Gloria Wang <gwang@google.com> |
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug 5015079."
|
| 99930d45c40f2d79a7633d9dd9f8478d22307848 |
05-Aug-2011 |
Gloria Wang <gwang@google.com> |
Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug 5015079.
Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
|
| 1bea7ea4d571123992c38b6a406b58db1e7b4c7e |
05-Aug-2011 |
Gloria Wang <gwang@google.com> |
Merge "resolved conflicts for merge of 845fdba7 to master"
|
| cfff1f2b0bac432fac49f0b21e09e08f0e913622 |
05-Aug-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of 845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
|
| f89d780df70b7fbb8465bce4913c46cca019721f |
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
nclude/media/stagefright/MediaBuffer.h
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/rtsp/APacketSource.cpp
|
| e3c56d16412882e2dac697fbe6fa9852ee4dee31 |
04-Aug-2011 |
Gloria Wang <gwang@google.com> |
am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
|
| 6801b4dbd00b485ecdcd31b517ed885a8fa21c63 |
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
edia/libstagefright/chromium_http/support.cpp
edia/libstagefright/httplive/LiveSession.cpp
|
| b9410c5dacdb44f2f19bc2487dd9ef84445e1f32 |
04-Aug-2011 |
James Dong <jdong@google.com> |
Merge "Remove excessive logging"
|
| 982a4b50794f9202c894cbe7598166c3565e9900 |
04-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 90855078eb989944bca1824058d7231cd68e5021 |
21-Feb-2011 |
Henrik B Andersson <henrikb.andersson@sonyericsson.com> |
Bug fixes in OMA DRM v1 Forward Lock Agent
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.
Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
rm/libdrmframework/plugins/common/util/include/SessionMap.h
rm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
rm/libdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
|
| dae8421c638562686839e56555cb08753077f268 |
04-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add camera bayer image format."
|
| 79e2ab42c38d1099bcd7c8840caa5a85c9fcb104 |
02-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add camera bayer image format.
The API are hidden.
bug:5086073
Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 874f0f1223041d70dbcc9777d0d14c995810a4d8 |
04-Aug-2011 |
Gloria Wang <gwang@google.com> |
Merge "Check the syncword for each frame. Fix for bug 5117233."
|
| fdb04b61f91c45eed0edd28aa33d7085a5e6eb74 |
04-Aug-2011 |
Gloria Wang <gwang@google.com> |
Check the syncword for each frame.
Fix for bug 5117233.
Change-Id: I714c9b671832c9606cabdfe6bb21697c08de2eff
edia/libstagefright/AACExtractor.cpp
|
| 59bd0da8373af0e5159b799495fda51e03120ea4 |
01-Aug-2011 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: disable AEC and NS with BT headsets
Disable AEC and NS when the Bluetooth SCO headset in use indicates it
implements those pre processings.
Change-Id: I93f3d10b0a27243d5dbff7182639576fc0c6d862
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| ff3f6808a07a6280071ac1aef7032d6a20ef7393 |
03-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Audio Effect Framework: add effect suspend/restore"
|
| 7c3a65a647ee854d9a1bc27786ebe914161d1636 |
03-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 59255e4fc7d8ff52874b85b1988dc0785140cf81 |
28-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Audio Effect Framework: add effect suspend/restore
Add the possibility for the effect framework to suspend
(temporarily disable process) and restore audio effects.
This feature will be usefull to disable pre processing under certain
conditions and better control coexistence of audio effects
on output mix and specific sources.
Change-Id: I79b195982cc48748d5708308fb1647b9c3c34cc6
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| c6354e9396b4d8929058a283cfc77327b47e9944 |
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>
edia/libstagefright/OMXCodec.cpp
|
| cece4b32d340f0ca514160647b9883e3777bc376 |
01-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Remove unused mLastVideoBuffer and bAppliedVideoEffect.
Change-Id: I29511aaa714494a1a6caa4ed95bbc26370b37246
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
|
| 8292f43746a359d31af631efcffccd142c0a50c3 |
02-Aug-2011 |
James Dong <jdong@google.com> |
Merge "Start thread pool for binder calls"
|
| 48a29a976eb649f9c90e9d69214747d1aa659de1 |
02-Aug-2011 |
James Dong <jdong@google.com> |
Remove excessive logging
Change-Id: Ie0b37da59ad326184c983626c45ea78908e7c2b7
related-to-bug: 5109084
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
|
| 874aef204ebca8d6778d208a1c8eef231b6ccbf3 |
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."
|
| 746d7c7f577b549b8a56862b73ae4f4f1247c593 |
02-Aug-2011 |
Gloria Wang <gwang@google.com> |
Merge "Fix ordering assumption of argument evaluation."
|
| cf2222281be56fe2c7bf805c73f2d3c67c1aa6e5 |
02-Aug-2011 |
Gloria Wang <gwang@google.com> |
Merge "Fix ordering assumption of argument evaluation."
|
| a3a07b6619de9bee5daccd6d78beec84b26adc95 |
02-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| e048e90967aa52e01b6b3ca445e4ade75c0dc878 |
31-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Remove PreviewLocalRenderer (simplify the code).
Change-Id: I1f04e591cd0a33eb70bd93d5600aba12e727386e
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
|
| 57c86189bc07d9ccb0fd044e66df736d0bf19639 |
29-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Pass camera frame metadata from camera service to Java.
bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
amera/Camera.cpp
amera/ICameraClient.cpp
nclude/camera/Camera.h
nclude/camera/ICameraClient.h
edia/libstagefright/CameraSource.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 40cdc56efa47580d89a93750cefecb8ccbaf9a72 |
02-Aug-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add camera recording hint parameter.
The API is still hidden.
bug:4266229
Change-Id: I5e4c24e9e2808582aecb55ac4f1d5be3ed7e36a2
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| b6f2fced47866a5d095b2b18d2e28d7c4321e3a6 |
02-Aug-2011 |
James Dong <jdong@google.com> |
Start thread pool for binder calls
Change-Id: Ie67f54ba06d7fdb42bcb041c1e0a50d8477ae423
related-to-bug: 5095635
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 2f53a63142801e174e6ebf79cfbcd9055d8c538b |
02-Aug-2011 |
Mathias Agopian <mathias@google.com> |
Merge "connect/disconnect is now called from our EGL wrapper"
|
| a971214f96f9373cf603b09ff74c55efe569e4fb |
01-Aug-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '8fb7bd4d02cd4ad2111699778e64464d979f03bb':
Stagefright: Return error if codec takes too long to return a buffer.
|
| 1de2393648b9fe43977ef88b72489fec05d629a9 |
01-Aug-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3':
Stagefright: Return error if codec takes too long to return a buffer.
|
| c3da3434cb57f47284ea06bb9065eaa2fe033efb |
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
edia/libmedia/mediaplayer.cpp
ervices/camera/libcameraservice/CameraService.cpp
|
| de162ff337723798381890151247b129c4fbe314 |
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
edia/libmedia/IMediaPlayer.cpp
|
| 93a1e245c94f14b6fb68361f76e46285431dab26 |
01-Aug-2011 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Stagefright: Return error if codec takes too long to return a buffer."
|
| 9ea5908d386e0ac482b025bc3235d9eb71d77e06 |
01-Aug-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix NALU extraction of unit starts with a 0x00 nalType"
|
| 7f048fdd69753e0ba95d3ef1484b30bcf39164c0 |
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
edia/libstagefright/avc_utils.cpp
|
| 197f047db2909c3d8cc84b95f69d18410a935fb8 |
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 5103507.
Change-Id: Ic23ad50ec5f443146f00324b66d5e2bd5b9ffd0d
rm/common/IDrmManagerService.cpp
|
| 20f725ebcef13ded1b4b85c61c8a4b37cd030656 |
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
edia/libstagefright/httplive/LiveSession.cpp
|
| d08f77028840b2758c5b03048edafd3c965d8fe4 |
01-Aug-2011 |
The Android Automerger <android-build@android.com> |
merge in ics-release history after reset to master
|
| 0f33feef678c3c1f6304cb116ffcd5ab849dc3df |
28-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 5090721: audio record broken
Commit 6dbdc40 introduced a deadlock when exiting the
AudioFlinger RecordThread.
Change-Id: I1f63e54c5aeff05da4e4d028b53f734c62c78677
ervices/audioflinger/AudioFlinger.cpp
|
| b7c5f8fa2ee707f010b60ff7bea07c2bf1e17e2d |
29-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge "Part of fix for bug 5065047 build libchromium as a shared lib"
|
| 0065ef783eca9b5e0abb230c422e05ac73d2eff7 |
29-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add frame metadata parameter to camera data_callback."
|
| ff09ef8f18eed29bce50c7817df2fd52d2b50cf6 |
27-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add frame metadata parameter to camera data_callback.
bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 2d461d443d4d0a35acb9cfd49cafad8941b17a0b |
28-Jul-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5083973 M4VSS3GPP_editCleanUp called twice problem.
Set VSS context to NULL after cleanup.
Change-Id: I1086fbe60a7777b00e80f0ea504f58a183fd3241
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| 6dbe883644940badc684957cfc381bfd115f205e |
28-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 5090721: audio record broken
Commit 6dbdc40 introduced a deadlock when exiting the
AudioFlinger RecordThread.
Change-Id: I1f63e54c5aeff05da4e4d028b53f734c62c78677
ervices/audioflinger/AudioFlinger.cpp
|
| a3924af33a8005a0aeb20b97fd06e0c523b0d1af |
27-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 4599730 Get audio channel count on MediaPlayer"
|
| f9d566ef54954c5e7b913275438e8022fb194ad6 |
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
edia/libstagefright/MP3Extractor.cpp
|
| cd25fed09742235fac10953b9d4b77268c695063 |
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
nclude/media/mediaplayer.h
edia/libstagefright/AwesomePlayer.cpp
|
| 673aebfc7e6e8d38ad29a66d68c71ea8e9121eb1 |
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>
edia/libstagefright/omx/OMXMaster.cpp
|
| 85fb61eb8b39d4d3fcebc796c3f7ade1d58567aa |
27-Jul-2011 |
Iliyan Malchev <malchev@google.com> |
libcameraservice: call put_parameters on camera HAL
Change-Id: I492d1034ade50f9e157141debaa9783a90a04a91
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| a7280a59259018d997896c043fd2db95f631f12e |
27-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "AudioFlinger: fix crash when deleting pre process."
|
| 99b25ba8da5fdb7a524b53c5db290f7a64f1259c |
27-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 4604090: notification sound interrupted."
|
| dcd955bd86756be551cfd0a07e53caa55ab1a7fe |
27-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "AudioRecord: Fix getInput()"
|
| f0de042dc6df6d3a1f3db3a95a1c7964109c6541 |
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"
|
| 76cdb30c5bf3110354051aca2a16b5c8fbad3398 |
27-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Remove unnecessary encoder input format check.
This was preventing the export function from working because the
encoder may accept a format other than YV12. As we always
convert frames to what the encoder accepts, the check is
unnecessary.
Change-Id: I2056f560b4737d33956b277fb39ebe85278464ae
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| ec437d8d3db79459d7b19e1734e6fe309bd621e8 |
27-Jul-2011 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: fix crash when deleting pre process.
If a pre processing effect is detroyed while enabled and capture is active,
there was a possibility that the effect engine is released by the framework
while still processed by the audio HAL.
The fix consists in not releasing the engine in EffectModule::removeHandle()
but just flag the effect as being detroyed to avoid further calls to functions
on the engine effect interface.
The effect interface is then removed from the audio HAL safely in
EffectChain::removeEffect_l() while holding the EffectChain mutex.
Change-Id: I71fab30d9145062af8644f545a1f1d4d3e7e7f02
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| d1a243e41caffa8fd346907eed4625c9c47c1a86 |
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
edia/libmedia/AudioRecord.cpp
|
| 7efb8efc88ba529c1c57366a305855c2051ebb8b |
22-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Add YV12 color converter interface for VideoEditor.
The original assumption in VideoEditor is that the decoder output
and encoder input are in YV12 format. However on different
hardware platform the actual formats may be different. So now we
load a platform-specific YV12 color conversion module which
knows the actual format and can convert to/from YV12, which is
the format used in VideoEditor internally for processing.
Bug: 5061733
Change-Id: I852f85efd30c05cf6c42810059ee4d2ef37ee3da
ibvideoeditor/include/IYV12ColorConverter.h
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/YV12ColorConverter.cpp
ibvideoeditor/lvpp/YV12ColorConverter.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 7fc25dd82dec8474139315b8e905f103c13406f5 |
21-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add camera face detection API.
API are still hidden.
bug:4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| abb85fd9090817686bbdaa5a5b29547728a8d385 |
26-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Clear buffer lists in stop() so we won't free the buffers again.
Bug: 5073626
Change-Id: Ia41fc089568b48de005235d66c9b5b1a5f72b5ca
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| feb0db689c17dced50afaee54c659f1676e2d505 |
22-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 4604090: notification sound interrupted.
The problem is that the audio HAL fails to acquire the wake lock when playing the notification.
This is because of a change that removed the mediaserver process form the system group for honeycomb.
The fix consists in requesting the wake lock from PowerManagerService when AudioFlinger mixer
wakes up.
A consequence of this change is that audio HALs or pcm drivers do not have to hold wake locks
anymore as in the past.
Change-Id: I4fb3cc84816c9c408ab7fec75886baf801e1ecb5
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 288b66b60c9b3af3d84408885d0a4030c45eea9a |
26-Jul-2011 |
Gloria Wang <gwang@google.com> |
Merge "Fix for bug 4371230. - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client"
|
| 8f00151cbe693d52f3e233757c57fab3b6396d21 |
22-Jul-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4371230.
- Generate unique ID for each DrmManagerClient in native side
- Fix the bug where multiple clients could use the same ID
- Return the correct unique ID back to Java
- Add a flag in the unique ID to separate native client and Java client
Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
|
| b283ac1ac6758aba907bfe56713d279e8aafd38b |
26-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Adding Metadata mode to SurfaceMediaSource"
|
| 6e6e8a6cc9ab99ab299929fa0246e6ced64f8ce3 |
25-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Added APIs for audio preprocessing"
|
| 57dae99c9fcd6becd2b5ed0c53f277ba4d7dbcfc |
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
nclude/media/AudioEffect.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioEffect.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| a4635b0cde4a4b7bf0f9aed6aaade60d88eb2fe6 |
25-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Do not support still image capture mode for timelapse video recording"
|
| 6d240dc8c5e0bc1ba43a2f5e2f4fc3b5f4ae88db |
25-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "AudioFlinger: add dump of audio pre processing."
|
| e6cf962d41cb05b57e55ef80f75a24c62671dcfe |
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
edia/libstagefright/Android.mk
|
| 1d2bff0e588afe183a1baaae731519b4e957bbdb |
25-Jul-2011 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: add dump of audio pre processing.
Dump of media.audio_flinger service was only listing effects on output threads.
Moved the dump of effect chains from PlaybackThread to ThreadBase class so that
pre processings on RecordThread are also listed.
Change-Id: If8bc74023c12b9c2371f1b300743b156ceca7b87
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| be1cc822304d3a29c106ad5b6f330aed3e8c5658 |
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"
|
| 726e4527b7a750e688fec4c1e7c5f7b9a33d1623 |
24-Jul-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "QueryCodecs() signature change"
|
| 348a3aca420da133b2283ee12216e8e0f939e88d |
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."
|
| 3cecf640c4daf2df616b278bd9986018c8182908 |
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
nclude/media/IMediaRecorder.h
nclude/media/mediarecorder.h
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| a361483bb5dbd3bbf132c5b99b2df7d197c3fc50 |
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
nclude/media/stagefright/MetadataBufferType.h
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 77882a8deb5167235ae591e49c9dcff9abb373c1 |
23-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Connect MediaRecorder Native to SurfaceMediaSource"
|
| d35924d9928f29dcee6f5666b5bbd084640c7b34 |
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
mds/stagefright/stagefright.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 0b3f21761eae9b7d230ddd9b4be76ef02d4cec15 |
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
edia/libstagefright/WAVExtractor.cpp
|
| 29a142c7237821b6dc7bd1e8b56bb1efdc56767b |
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
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| b33f3407bab0970a7f9241680723a1140b177c50 |
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
nclude/media/IMediaRecorder.h
nclude/media/MediaRecorderBase.h
nclude/media/mediarecorder.h
nclude/media/stagefright/SurfaceMediaSource.h
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| 85eafc680a0bf5e0253cf611ac525769fc9bef3e |
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
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/SurfaceMediaSource.cpp
|
| fe388eedca9f46ed3fee9579258acecd93e88641 |
22-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Renaming SurfaceEncoder to SurfaceMediaSource"
|
| 10b7197cf9016093bdff20b6f7768543fd1c5720 |
22-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Adding SurfaceEncoder for encoding FilterFrames"
|
| 10681df94d517bb7186fff927f345fa2e01de8e1 |
22-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 4988574: 8 bit PCM audio playback broken."
|
| 47a55f57090847e6e6683ab25291506f8a66f759 |
22-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Retry datasource fetches a few times before giving up (NuCachedSource2)."
|
| 5bc965b1ff21c64e5f30130957bfe96300e15ed3 |
22-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures."
|
| 8a1f7cc319b9c3c8d40fefb4439c746e5b250820 |
22-Jul-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for issue 5055001 Movie studio is unusable after importing music
Change-Id: I9b3da1122e807c034cf44dd51b5e1d92dd84d73f
ibvideoeditor/vss/mcs/src/M4MCS_API.c
|
| 0683eba6b35c396c21f10e926709f2f8fc05f090 |
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
nclude/media/stagefright/DataSource.h
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/include/ChromiumHTTPDataSource.h
edia/libstagefright/include/NuCachedSource2.h
|
| deaba1c70b8ebdd1fffb40665a40e0593bd9cf3e |
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
edia/libstagefright/chromium_http/support.cpp
|
| edc15ad8fcde12dc4f642d80d077239b1532eeca |
22-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 4988574: 8 bit PCM audio playback broken.
Fixed regression in audio track control block frame size
calculation introduced by commit c310dcb.
Change-Id: Ia731b946ae4e43316b98d80229e3b08a696e47d6
ervices/audioflinger/AudioFlinger.cpp
|
| fada58a21be01913a8e3f25c898d26d2fc8ba630 |
22-Jul-2011 |
James Dong <jdong@google.com> |
Log setVideoSurface() and setVideoSurfaceTexture() failures.
Change-Id: Iaea34e74a0cf569fc85b926949253dea6baa6142
related-to-bug: 5063370
edia/libmedia/mediaplayer.cpp
|
| 1a2fafbaa36390a06cc9a066fcbe147c8c47ea77 |
01-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Renaming SurfaceEncoder to SurfaceMediaSource
Related to bug id: 4529323
Change-Id: Id820d45a536bd2c65e0a59def564eb5b3ea4a71c
nclude/media/stagefright/SurfaceEncoder.h
nclude/media/stagefright/SurfaceMediaSource.h
edia/libstagefright/Android.mk
edia/libstagefright/SurfaceEncoder.cpp
edia/libstagefright/SurfaceMediaSource.cpp
edia/libstagefright/tests/Android.mk
edia/libstagefright/tests/SurfaceEncoder_test.cpp
edia/libstagefright/tests/SurfaceMediaSource_test.cpp
|
| 3399b7267185646c69b04352211fca4fad9d7547 |
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
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/SurfaceEncoder.h
edia/libstagefright/Android.mk
edia/libstagefright/SurfaceEncoder.cpp
edia/libstagefright/tests/Android.mk
edia/libstagefright/tests/DummyRecorder.cpp
edia/libstagefright/tests/DummyRecorder.h
edia/libstagefright/tests/SurfaceEncoder_test.cpp
|
| 59d49c0b3b56b24c5b6d98cdfdcd75c537322f2e |
20-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Adding AndoirdOpaque Colorformat to OMX
Adding an enum to indicate an android opaque OMX
colorformat. This will inform the encoder that
the actual colorformat will be relayed by the
Frames read from the GRAlloc Buffers
Related to bug id: 4529323
Change-Id: Iddc5bd1ce8ca2b2506a57aadf5fc91ff0c7b78ef
nclude/media/stagefright/openmax/OMX_IVCommon.h
|
| f3fd9435441ce19b45d17bf17d2fa4510c13cd7a |
21-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Remove hard-coded requirement for number of buffers."
|
| 0aaa69f88effc1c7d154c727d67d358100b53848 |
21-Jul-2011 |
Hong Teng <hongteng@google.com> |
Merge "fix for issue 4142219 Don't hard code platform-specific limitations engine part."
|
| a1d92359056176b6f6646efc918e0587e3de2b6f |
21-Jul-2011 |
Hong Teng <hongteng@google.com> |
Merge "fix for issue 4142219 Don't hard code platform-specific limitations-jni/java part"
|
| 3a1f8a404b38aaa82d57c77cb83e48665e66e553 |
21-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Merge "Untangle MediaScanner error handling. Bug: 5056917"
|
| 0cd7889d37cc60300dceaa975dab041fd35e34fd |
21-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Audio framework: support for audio pre processing"
|
| 7188e55f54a43c55fd6b96454720c447f1dc454e |
21-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Untangle MediaScanner error handling.
Bug: 5056917
Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
nclude/media/mediascanner.h
nclude/media/stagefright/StagefrightMediaScanner.h
edia/libmedia/MediaScanner.cpp
edia/libmedia/MediaScannerClient.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 8806b706693c0992724f6603353af18aeb4a0f80 |
07-Jul-2011 |
Hong Teng <hongteng@google.com> |
fix for issue 4142219
Don't hard code platform-specific limitations
engine part.
Change-Id: Ibc8a539e5bbac738f60ef935670a333b7017e20e
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/lvpp/VideoEditorTools.h
ibvideoeditor/vss/common/inc/M4ENCODER_common.h
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| cabd5f867ec69c0dfe8333cba46323cb58917402 |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| 9ea1fc71df220b6bf610587ed15b6e400a215da5 |
21-Jul-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for issue 4988956 No audio can be heard during preview"
|
| afa9771b5abe7646077a8353f8bf710506803f7a |
21-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Let the media recording framework release the Camera object when it is the owner"
|
| 1c3c54395729dfae20357d4e510038084cc416cc |
20-Jul-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for issue 4988956 No audio can be heard during preview
Change-Id: I61fc9086f2c00259e4f54535a5938b161d95b144
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
|
| 3bd3020c00ec8264ac1fe3870800f326487f9221 |
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
edia/libstagefright/CameraSource.cpp
|
| 60c93010e8f96a179574ec66c00ec47a675319e3 |
20-Jul-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "MediaPlayer: add a disconnect from ANativeWindow"
|
| 7dff060f29858d6db2464845bb9097ac5960bbe6 |
20-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Content found in the wild violated the MPEG4 systems specs"
|
| 1b37de259e00e22f261f2711e0a318aa386581c7 |
19-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Remove hard-coded requirement for number of buffers.
This change use two threads to read and return buffers from/to the
encoder, so we won't block on read even if there are not enough
input buffers.
Bug: 4972572
Change-Id: Iab07da5b55ef384e1d2723b4f5d3164e5a509ebd
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| f3dadf2204119eb7ef263535d53d36cd14b9bf47 |
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
edia/libstagefright/ESDS.cpp
|
| 50d42da58a88dcdb082cff079766af71c0871470 |
20-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "More HLS fixes"
|
| d6a46a6bda23667e06ee5ccca3781e407c7d1204 |
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
|
| bea47bc22b2939b324b47fd0d70e6c7e6fbc82d2 |
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
edia/libmedia/mediaplayer.cpp
|
| 2cd60e3069e93c11676019c8405d3941cd2ac5b7 |
19-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Disconnect the native window in CameraService::Client::disconnect."
|
| 7574da5a501fc9289fee49fdaf1fdb9d47dae2b6 |
19-Jul-2011 |
Wu-cheng Li <wuchengli@google.com> |
Disconnect the native window in CameraService::Client::disconnect.
bug:5048372
Change-Id: I6886907a672ddf5580b988ca5bc13e3dc26d4385
ervices/camera/libcameraservice/CameraService.cpp
|
| 9bc7af17974f448291a44912566ec7472a0d798b |
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
ervices/camera/libcameraservice/CameraService.cpp
|
| 460ba2a3a1fa9318463d3c00595b6732e3d776de |
19-Jul-2011 |
Mathias Agopian <mathias@google.com> |
call the new setScaling method in the appropriate places
Change-Id: Iabd738b195d326b6bdf04fdfee75e1dd9d411cbd
ibvideoeditor/lvpp/PreviewRenderer.cpp
|
| 2e460c5b7f48aaabff33698ba6b11b04906eefa8 |
19-Jul-2011 |
James Dong <jdong@google.com> |
Remove PV AVC decoder
Change-Id: Icf056c852f95b5d6a07473728ddbf5b641990381
edia/libstagefright/codecs/avc/dec/Android.mk
edia/libstagefright/codecs/avc/dec/SoftAVC.cpp
edia/libstagefright/codecs/avc/dec/SoftAVC.h
edia/libstagefright/codecs/avc/dec/include/avcdec_api.h
edia/libstagefright/codecs/avc/dec/include/pvavcdecoder.h
edia/libstagefright/codecs/avc/dec/include/pvavcdecoderinterface.h
edia/libstagefright/codecs/avc/dec/src/avc_bitstream.cpp
edia/libstagefright/codecs/avc/dec/src/avcdec_api.cpp
edia/libstagefright/codecs/avc/dec/src/avcdec_bitstream.h
edia/libstagefright/codecs/avc/dec/src/avcdec_int.h
edia/libstagefright/codecs/avc/dec/src/avcdec_lib.h
edia/libstagefright/codecs/avc/dec/src/header.cpp
edia/libstagefright/codecs/avc/dec/src/itrans.cpp
edia/libstagefright/codecs/avc/dec/src/pred_inter.cpp
edia/libstagefright/codecs/avc/dec/src/pred_intra.cpp
edia/libstagefright/codecs/avc/dec/src/residual.cpp
edia/libstagefright/codecs/avc/dec/src/slice.cpp
edia/libstagefright/codecs/avc/dec/src/vlc.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 8ebe5be6b0b3caa7d9d6277a1216ed786bd1e66a |
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
|
| b2ac59b3a1748eef58c228a7e808d40bd1741dcf |
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
|
| e82c319beb2275ad0832cf77252943e16df04b1a |
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
|
| d94bb8b524e09f978b6a16699b968628ff279208 |
19-Jul-2011 |
Conley Owens <cco3@android.com> |
Merge "stagefright aacenc: Mark codeWord as UWord16"
|
| d36635c4d90e8b891c7197a92370796635b7684c |
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
|
| 8ebcf0222143b2b59d24946ef260894f367e096c |
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
|
| 7b9bcbb0975049c05c3b4a4048802807433ace42 |
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
|
| bb29abfe798e0a3329380481834e5839db141902 |
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
|
| 0ab6faaca562abcb1d116824198388f5a3c8c73d |
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
|
| 9f8f2f857b5791b10f5da9b5cc04d3d8f7988c29 |
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
|
| 54b0ae0dc7ba9be652285250f4976d8db89c30ee |
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
|
| c57d9ff30a5bff931f8ffa8d3fa390628268a8a8 |
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
|
| 6f1dd23b28752fdf47795c6575c537943711b1c1 |
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
|
| 4a028164ee8ce74a7872ce4bcce196b70d9eb4e2 |
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
|
| 3bfc65a3ca36b2f1cec52b83e4f75147b41c27e0 |
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
|
| af7e9726a19d106494e96078dedfda7baaeb59cd |
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
|
| a77079f09897f27e97b073d3835fb4b62949a159 |
19-Jul-2011 |
Deckard Autoverifier <deckard@android.com> |
Merge "stagefright: Include stdlib.h for malloc/free"
|
| 24123b996366a20bedab4dffbc69c8e439fe04d3 |
19-Jul-2011 |
Deckard Autoverifier <deckard@android.com> |
Merge "stagefright amrwbenc: Remove a duplicate, unused file"
|
| e625479f58d7d9234c8ae7cb0c0a604bf43a9115 |
19-Jul-2011 |
Deckard Autoverifier <deckard@android.com> |
Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
|
| aacb82162005eec4c06cba90389eded2c189a448 |
19-Jul-2011 |
Deckard Autoverifier <deckard@android.com> |
Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"
|
| 630e65cc858d7592446c5f9174e713e29d58588b |
19-Jul-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "CameraService: (dis)connect from preview windows"
|
| 4a621e6d3438876eb1d9001719c688a2329ee675 |
19-Jul-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "MediaPlayer: add ANativeWindow (dis)connect calls"
|
| 5f05b87b673093064e64bb5ac532555f881f0ddc |
18-Jul-2011 |
Conley Owens <cco3@android.com> |
am f139965e: (-s ours) am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit 'f139965e4acc8eadb57f1d18d34ea3a89ab622d0':
stagefright aacenc/amrwbenc: Remove trailing whitespace
|
| bd8299bd5471902596cc2a27dc9404bda92edfe6 |
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
|
| 3259fc9acfc740a30b3a52bf70fe6e402d2d1010 |
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
|
| ac04df0bbb3a1b9627cbc0eb298a596c665a3e7c |
18-Jul-2011 |
Conley Owens <cco3@android.com> |
Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
|
| db4d3717b4677b3239546a248dc0a7d82db4ba50 |
18-Jul-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Add option to query hardware decoders only"
|
| df57a0d6d3b0609e69ff79afa63fe44dfa91f6f5 |
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
mds/stagefright/stagefright.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 7c7f10bd4fda9a084e5e7f0eb3a040dfcbf01745 |
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
nclude/media/AudioEffect.h
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libeffects/data/audio_effects.conf
edia/libeffects/factory/Android.mk
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/factory/EffectsFactory.h
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 67a124dcac0578aed94aebf451675a5f4c8a1e4e |
18-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Always consider playlists corresponding to different bandwidths different."
|
| 634538b2017ca0760a68d8be016fedaeed30f136 |
18-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix seek behaviour at startup and teardown of media session that hasn't been started"
|
| 15d83d6cc0f16369dc141df3910d81e6b474896f |
18-Jul-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with gingerbread-release
Change-Id: I74130bf01f70959376b8453e0288c4436cdbec2b
|
| 4c0971c15b706bc4e926bd3ca9f3d5ad934b4dc1 |
18-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Use a single packet for the data phase"
|
| a9390d4d571817cdb1d659b4b22b04130dc77a48 |
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
edia/libeffects/preprocessing/Android.mk
edia/libeffects/preprocessing/PreProcessing.cpp
|
| ef441d965504dbf31c5db690e5b34fcdcecd92ff |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpServer.cpp
|
| 8dae4ca229d21f68f3ee76c76b49b6f0a47aad53 |
16-Jul-2011 |
Andreas Huber <andih@google.com> |
Always consider playlists corresponding to different bandwidths different.
Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
edia/libstagefright/httplive/LiveSession.cpp
|
| e0b5bb23f0a26d248275d203885b820659da7320 |
16-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Log CPU usage"
|
| 2048d0cfccce48be26816dec8711a6691ebff71c |
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
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
|
| a57a9a491272aa884494b2ec7854960827a73742 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 4378ace44b9de477608a6c2fbf7134bc0345555f |
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."
|
| d75de03f90a17862b18a3d2404e7117d8c53dbbf |
15-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged"
|
| 4d8d0c30abfa4b8d75866d42094cc797e05068fa |
09-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Log CPU usage
Change-Id: Ie447e59be139153e526b7ad467c46c659d26816f
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
|
| 6fb40672ac0f0b2f479367fa0ba4e8944df06dad |
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
edia/libstagefright/XINGSeeker.cpp
edia/libstagefright/include/XINGSeeker.h
|
| 7e43a5a2dcfa9bc64ef477472a33c87a84695c09 |
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/LiveSession.h
|
| 3c76eaebad1e420937088e52ec89efcb76bb875d |
15-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 5031179 possible fix for assert in join"
|
| 2857b959c5c12116bef85d4e7e0125d74a469eec |
15-Jul-2011 |
Mathias Agopian <mathias@google.com> |
Merge "Use the ANativeWindow APIs instead of the Surface APIs"
|
| 0ed3ec00d0242c9dc77532fe0cf0082645b6662c |
14-Jul-2011 |
Jamie Gennis <jgennis@google.com> |
CameraService: (dis)connect from preview windows
This change makes CameraService connect and disconnect from preview
windows (Surfaces and SurfaceTextures) that get set.
Change-Id: I726971688367d5ce0d9aa90c44168037bce33deb
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 61c7ef5bde2c7ed94a078396aa65da67b47e5402 |
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
nclude/media/mediaplayer.h
edia/libmedia/mediaplayer.cpp
|
| dc3d6784c73882c888423f0cb9b4de1b14e1dc02 |
15-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
|
| a3f4d7f096e5c91dc6af085761b1459866c043d9 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 40d76d70587ed095692615b0a1b657da861f7ffc |
15-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5031179 possible fix for assert in join
Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
edia/libstagefright/omx/OMX.cpp
|
| f70947fcd251dffbbf29414cf43bea971d9df3e8 |
14-Jul-2011 |
Mathias Agopian <mathias@google.com> |
Use the ANativeWindow APIs instead of the Surface APIs
Surface inherits from ANativeWindow, the APIs on the later
are the only public APIs.
Change-Id: Ibddebfe535e026d872cc13287a102660c004385f
ibvideoeditor/lvpp/PreviewRenderer.cpp
|
| 6f93135e5c8945ad2589af0c01652bc104eae819 |
14-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
|
| 5442cb59e8483e18b3a02400d431d167ea7074b3 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 15825c7b6f6b19092a5949b4e46aea4fa229932c |
14-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Support profile and level query for SW video decoders"
|
| 2864c9a3a29311beb5ef96d8fc3c7745df2dd2cd |
14-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Include all supported mime types when querying decoder profile/level support."
|
| 49c8340bd83cc5d64b1fcaed4afbda5fd4d74a3e |
14-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Remove legacy http support from stagefright, chromium is the new hotness."
|
| 0ee92ffd74ac8594b68aa3c73b341dc0c6330b3f |
14-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "OMX CallbackDispatcher uses C++ Thread not pthread"
|
| 81eedd1746be590d5d506dfb9ff23619f9d9898f |
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>
nclude/private/binder/binder_module.h
ervices/audioflinger/AudioPolicyService.cpp
|
| 3d34a30c5ecf404b429ade5068400cb86695ff32 |
14-Jul-2011 |
Andreas Huber <andih@google.com> |
Remove redundant include, now that NuHTTPDataSource.h is no more.
Change-Id: I7bed503ba341b5ea3b7a3cac7aa2a1f349c8ed03
ibvideoeditor/lvpp/PreviewPlayer.h
|
| dab718bba3945332dc75e268e1e7f0fe2eb91c4a |
14-Jul-2011 |
Andreas Huber <andih@google.com> |
Remove legacy http support from stagefright, chromium is the new hotness.
Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
nclude/media/stagefright/ShoutcastSource.h
edia/libstagefright/Android.mk
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/include/HTTPBase.h
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/NuHTTPDataSource.h
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| a4b77bc0dbefc58b337c35b03ef21147a2cbdd4e |
14-Jul-2011 |
Andreas Huber <andih@google.com> |
Include all supported mime types when querying decoder profile/level support.
Change-Id: Ia1c930eee489bfebb482ac5079bd6ac9354532f2
mds/stagefright/stagefright.cpp
|
| 9d35d0c4a1371d52c4ce4d34575967026d9135af |
14-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Remove old-style software decoders."
|
| 87e031caf905145cb6e362a8c60f02736b87deef |
13-Jul-2011 |
Andreas Huber <andih@google.com> |
Remove old-style software decoders.
Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/ThreadedSource.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/amrwb/AMRWBDecoder.cpp
edia/libstagefright/codecs/amrwb/Android.mk
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/codecs/avc/dec/Android.mk
edia/libstagefright/codecs/g711/dec/Android.mk
edia/libstagefright/codecs/g711/dec/G711Decoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/codecs/mp3dec/Android.mk
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
edia/libstagefright/codecs/on2/dec/Android.mk
edia/libstagefright/codecs/on2/dec/VPXDecoder.cpp
edia/libstagefright/codecs/vorbis/dec/Android.mk
edia/libstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
edia/libstagefright/include/ThreadedSource.h
|
| 4cfad9814ae3cbf761f88a4f4a94793c627f11de |
13-Jul-2011 |
Mathias Agopian <mathias@google.com> |
Merge "get rid of overlay HAL"
|
| 42e549e4ab54802d788c43e3a04a85b7a1a95e97 |
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
nclude/media/IStreamSource.h
edia/libmedia/IStreamSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
|
| 9cded98816c40fd55053b1e38fc7fd8a68da8866 |
13-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Clean up MtpServer initialization and threading:"
|
| dec7388c3edf09eaaccaaf57f6301e716319a34d |
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
edia/mtp/MtpServer.cpp
|
| 350d9162155e1f3eab1821f5eeed762faa01f0cc |
13-Jul-2011 |
Iliyan Malchev <malchev@google.com> |
Merge "Add support for TI H264 encoder"
|
| 319d2e3f4e17a14c9af55ee0a7bcd180d1ce68a5 |
13-Jul-2011 |
Mathias Agopian <mathias@google.com> |
get rid of overlay HAL
Change-Id: I461f633d172ab10e05326ef10544c67dea664c0e
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| 1374eddc4455b26d1dffdca10fc70534b3f08c1d |
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>
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 3da12031574a361e819ff0b06429b5f35c31deb6 |
12-Jul-2011 |
android-merger <android-build@android.com> |
reset, and keep history
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| 8deb152167af1dbf39d532737f105368ee8973f5 |
12-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Make MetadataBufferType.h C-friendly"
|
| 334655795fb9b23eb8d011c6f7ccf807816f74f0 |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
|
| 63b96e48deb0a4c5b594693922bd9101ffc3ef93 |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
|
| 5a5f9d636ed6c116993c6cad5abdad7a734992e8 |
12-Jul-2011 |
James Dong <jdong@google.com> |
Make MetadataBufferType.h C-friendly
Change-Id: I4388d8f6cf30f08858aec73aa971647feae4a5e3
nclude/media/stagefright/MetadataBufferType.h
|
| ca9718b81d1edb3d094a11502737293dcb7526e7 |
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
edia/libstagefright/include/OMX.h
edia/libstagefright/omx/OMX.cpp
|
| c90f3907a7866eb802f03959460341f5dba00434 |
12-Jul-2011 |
android-merger <android-build@android.com> |
temporary revert for testing
Revert "DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read."
This reverts commit f0f1ceeb517ff226532a407da6d55602f195e5b5.
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| 2dade0141b45b3538183bd2d6c0c53a0345e92af |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ida75833739d363061c2e688a6c7f7d7b3f3edd1e
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/3gpwriter/src/Android.mk
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
|
| 5e0067b486c3862316aa1f293cf9690c0cf54bda |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
amera/Android.mk
rm/drmserver/Android.mk
rm/libdrmframework/Android.mk
rm/libdrmframework/plugins/passthru/Android.mk
edia/libeffects/factory/Android.mk
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/visualizer/Android.mk
edia/libmedia/Android.mk
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/omx/Android.mk
edia/mtp/Android.mk
ervices/audioflinger/Android.mk
|
| a5a0cea84cdf116f4de4f812c26be73e70a260e6 |
12-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Audio Effect API: process reverse stream function"
|
| 52f556b976a9caceee183d8af2118ddbee02c70a |
11-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Merge "Eliminate single-process mode. Bug: 5010576"
|
| 3623b481fa2734b95d4553dafabca931e5d0502a |
11-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Do not wait for unlaunched threads in stop()"
|
| 411ba422e3635d534928ffd81abf54f4f291c739 |
09-Jul-2011 |
James Dong <jdong@google.com> |
Do not wait for unlaunched threads in stop()
Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| fcf0efd3919435cb27091a8af6db3de35b6899ba |
11-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Release camera if CameraSource::start() has not been called"
|
| 457116d3a01618acf9a875020ca5860551ba03a6 |
11-Jul-2011 |
James Dong <jdong@google.com> |
Support profile and level query for SW video decoders
Change-Id: I9c20db128be96cd36cf2083e08e8c21f5e6d1fdf
nclude/media/IOMX.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/codecs/avc/dec/SoftAVC.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
|
| ba7b8f881a9b6b21803752326d2932a3bd42d7cf |
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
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/visualizer/EffectVisualizer.cpp
|
| 6d566304093bc0f79b47d96ed8d840620c163264 |
11-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 4973565: implement getFormat() like Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe.
Change-Id: I9c684fa971d5ef3f975017cbaaf06ba789a6c41f
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
|
| 9b88b72ee2c3fd01fb46e77b7e6d80f3bd52e958 |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
|
| ae4c1ac6401185539c03ce0819e174fd1b04b136 |
09-Jul-2011 |
James Dong <jdong@google.com> |
Release camera if CameraSource::start() has not been called
Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
|
| 619d29fa1f5efab134441418d82a82a573b4de46 |
09-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Eliminate single-process mode.
Bug: 5010576
Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
ervices/camera/libcameraservice/CameraHardwareStub.h
|
| bca946c7a54343f1517347bc74d3fff4e6303d3b |
08-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Use advertised h264 encoding parameters by default if the profile is not baseline"
|
| 6c21234e3d254fc58227cd2063500a0dcd173689 |
08-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix build warning; LOG_TAG was misplaced"
|
| d552b88515c6ccd18695e5db5e6032a6425d8c63 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/OMXCodec.cpp
|
| 5159c7ec97b575c0486159f0543d2da90c3c3b68 |
08-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Fix build warning; LOG_TAG was misplaced
Change-Id: I4fb0590f626445188f9053367707878b2fa0fa30
ervices/audioflinger/AudioResamplerCubic.cpp
|
| bc8e52dadeb078c45e62ebda17fd95e67f689654 |
02-Jul-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix of issue 4973565 Cannot export movie.
Also fixes 4441452 Native Crash after applying transition
Change-Id: Ic48c44bc2c5d07e57edb8f63393cea424d3275f4
ibvideoeditor/osal/inc/M4OSA_Error.h
ibvideoeditor/vss/common/inc/M4AD_Common.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
|
| 9b186a44051d0ef7f4ca67150f204299b15a448e |
08-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Moved and renamed effect API header files"
|
| 6d8b694d999e9be7d5dcc336535832a80fb6f61f |
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
nclude/media/EffectBassBoostApi.h
nclude/media/EffectEnvironmentalReverbApi.h
nclude/media/EffectEqualizerApi.h
nclude/media/EffectPresetReverbApi.h
nclude/media/EffectVirtualizerApi.h
nclude/media/EffectVisualizerApi.h
nclude/media/Visualizer.h
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.h
edia/libeffects/testlibs/Android.mk_
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.h
edia/libeffects/visualizer/Android.mk
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/Android.mk
edia/libmedia/Visualizer.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
|
| dc7d07e5e402b31068a55c8b055d1a82d61f9ca5 |
07-Jul-2011 |
James Dong <jdong@google.com> |
Add support for some custom YUV420 color formats to recordvideo utility
Change-Id: I2f0dfba466efb94b704dca761162d7c7457a43cf
mds/stagefright/recordvideo.cpp
|
| 5895e970ae119210773a5184c019178e2516b132 |
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"
|
| 0d0edfb024f65f7e1097bf1814ae229ce9cb367d |
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
nclude/media/mediametadataretriever.h
nclude/media/stagefright/MediaExtractor.h
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| d26edf9435bf5bdb43b5a1f71192bb1477a1cc7f |
02-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 4571308 Provide correct video frame timestamps"
|
| 13b263c0fb2f03f12089150c3d05b545c25257ca |
01-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Charge network traffic to the uid of the process using the MediaPlayer."
|
| ea317826269a1faecc2c61b76e2dab9bb7e70a62 |
01-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Ignore all flush-complete notifications with port == OMX_ALL"
|
| 3eeab1a71b7e222b60c5413916c2f3c7ec61e37d |
01-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Add extended metadata buffer support by defining different types of metadata buffers"
|
| 9b80c2bdb205bc143104f54d0743b6eedd67b14e |
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
nclude/media/MediaPlayerInterface.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/HTTPBase.h
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/LiveSession.h
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 0af941927ef8f35f2da5380dfd8d04b7f4ed3532 |
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
edia/libstagefright/ACodec.cpp
|
| 577dd43e0a80b4ccc621d52f06fea0761fc7f602 |
01-Jul-2011 |
Andreas Huber <andih@google.com> |
Merge "Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec."
|
| 0bb6b4c5da2451ee0973372b0a3858b15c742689 |
30-Jun-2011 |
Andreas Huber <andih@google.com> |
Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec.
Change-Id: Ie03b285265099dbac9b12f3f41d9ad758d0b50ad
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 3edf4509ad62582c682cbcf572396da4036506a3 |
01-Jul-2011 |
Edwin Wong <edwinwong@google.com> |
Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video.""
|
| b13adac0f1ce1792151192966e428d1eed3ef826 |
01-Jul-2011 |
James Dong <jdong@google.com> |
Merge "add private copy constructor and assignment operator to four media source classes"
|
| ab23dc0443e874a82110119896cce0103d89a529 |
01-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Return ERROR_END_OF_STREAM when the input source reaches eos"
|
| cebcdaef5b559f4db2a9d8b305d9d7da03525b62 |
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
|
| e301545a292987b6f7f3b316003eb8b76e3a5e2e |
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
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 0f30bd90272c818aa37c0bb22d22eaa7d3689879 |
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
|
| 69c2b29eb72396068b9d116c2a54f283025c7d6b |
30-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Revert "Parse RTP-Info even for live streams.""
|
| ac5767a96df9fae46a37ffba62611472135a0f6d |
30-Jun-2011 |
Andreas Huber <andih@google.com> |
Revert "Parse RTP-Info even for live streams."
This reverts commit d873413ff9f742f259c29d7d0b58265db6b24529.
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| e946f0bfe7f5c63d4b10497ccc87ddb5b002b51d |
29-Jun-2011 |
James Dong <jdong@google.com> |
add private copy constructor and assignment operator to four media source classes
o this patch addresses the encoder and decoder sources for audio and video
Change-Id: I918784ca22138267c270836c91312540eedebc7f
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| e5bf6409774fe73f968b7db215f535b64de66139 |
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
edia/libstagefright/ACodec.cpp
|
| 7dbd2c46824000ce473966637c11b8564682cb55 |
30-Jun-2011 |
Chih-Chung Chang <chihchung@google.com> |
Remove curtain effects (they are unused).
Change-Id: I8e1ccad3e9ddf4c272e85e7ca04582b4863c242d
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/lvpp/VideoEditorTools.h
ibvideoeditor/vss/common/inc/M4VFL_transition.h
ibvideoeditor/vss/inc/M4VSS3GPP_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/video_filters/src/M4VFL_transition.c
|
| 9969866cfe5b17c6e481b90d81b011a0cece78a0 |
30-Jun-2011 |
Chih-Chung Chang <chihchung@google.com> |
Make line-ending consistent (unix style).
Change-Id: Id837b042952ff5d97907591f337b2222cff2c8a9
ibvideoeditor/Android.mk
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/DummyAudioSource.h
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.h
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.h
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/lvpp/VideoEditorTools.h
ibvideoeditor/osal/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/stagefrightshells/Android.mk
ibvideoeditor/vss/video_filters/src/M4VIFI_RGB565toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
|
| ba499b591db0e26081e38545493144755eb72fff |
30-Jun-2011 |
James Dong <jdong@google.com> |
Return ERROR_END_OF_STREAM when the input source reaches eos
Change-Id: I334313b054dcf388d2e05d56efb10ceea4980638
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| 9906d2e28146b24fc516bfd2568caeb463944d96 |
30-Jun-2011 |
Mathias Agopian <mathias@google.com> |
Merge "SF transactions are now O(1) wrt IPC instead of O(N)."
|
| 2df788fb0c402938f827bf9c9ce2ca3ab1dcd464 |
29-Jun-2011 |
Mathias Agopian <mathias@google.com> |
SF transactions are now O(1) wrt IPC instead of O(N).
Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
mds/stagefright/sf2.cpp
mds/stagefright/stagefright.cpp
mds/stagefright/stream.cpp
nclude/private/surfaceflinger/LayerState.h
|
| 4ea52aea75c385e8d9de8cc04554aa5d93ca272b |
29-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp"
|
| fcc93ba6265f6cb1f193ac8b5827d37514dcf653 |
29-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Instantiate a NetworkChangeNotifier to have chromium transparently handle interface"
|
| 0055e9e1c67e4614135da2cc0866caf3e7bfa3d6 |
28-Jun-2011 |
Andreas Huber <andih@google.com> |
Fix a format string that triggered a compile-time warning in OMXCodec.cpp
Change-Id: Ib4b6cce1b4102034605da8edfb0dd8bc9a578168
edia/libstagefright/OMXCodec.cpp
|
| 553f66e21be6e11120460830fc78793a4d11b465 |
20-Jun-2011 |
Andreas Huber <andih@google.com> |
Instantiate a NetworkChangeNotifier to have chromium transparently handle interface
changes.
Change-Id: If48d2934ce29d68b9c31a1d120fe8f134f277a33
edia/libstagefright/chromium_http/support.cpp
|
| 72bb3424c2422f178705b351eb70d14b69f0301e |
29-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Support for "streaming" non-transport streams by first converting them to ts packets."
|
| 63d794763a680c29edccce3a6fac3d6d9c13c8e3 |
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
edia/libstagefright/chromium_http/support.cpp
|
| 95068be1426dc0a4dc856cf9e35550c31b901711 |
29-Jun-2011 |
Wu-cheng Li <wuchengli@google.com> |
Unlock the camera if media recorder fails to start recording.
bug:4965716
Change-Id: Icb1f7f18e9ea6c4f0427ade2ed338e7d56be5e01
edia/libstagefright/CameraSource.cpp
|
| 9dd21dd09e821d24eda6af225fa173f4aa2d366c |
29-Jun-2011 |
James Dong <jdong@google.com> |
Simplified regulBitRate() method and fixed a copy and paste error in stop() method
Change-Id: I589aea9471130e690594f91598853a1f08dca081
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 32eea24fe93fd43e8078b1080db17304b27ed95a |
28-Jun-2011 |
James Dong <jdong@google.com> |
Add extended metadata buffer support by defining different types of metadata buffers
Change-Id: I6aa6b5da004c240c9986f6b9036950e234c8bd42
nclude/media/stagefright/MetadataBufferType.h
|
| b26a1176517579bd4d23f2a2cc91eca2e59b245c |
28-Jun-2011 |
Andreas Huber <andih@google.com> |
Support for "streaming" non-transport streams by first converting them to ts packets.
Change-Id: Ia753a1ab99039f54ce3678a38e997902372b5fa5
mds/stagefright/stream.cpp
|
| 3e1763ecdf14769a534f75e94a56785f63174b47 |
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
nclude/media/stagefright/MPEG2TSWriter.h
edia/libstagefright/MPEG2TSWriter.cpp
|
| 0a932b40bdc8c427ff275426ee19960d8648021d |
28-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Multiple changes to ACodec/codec tools:"
|
| 1065b3f17d3048948e7d522049d1980b90df3dc1 |
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
mds/stagefright/sf2.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/ACodec.cpp
|
| e764bbf9020b8f31632b28216c86f557bb5acd2c |
28-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "New option in the stagefright commandline tool."
|
| 306bafcd7cabeb9059e066296cd225b8b03968a2 |
28-Jun-2011 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."
|
| 16f7863149b400ca52e2e3cb83e50534fee6b58b |
28-Jun-2011 |
Andreas Huber <andih@google.com> |
New option in the stagefright commandline tool.
Use '-S' to allocate decoder buffers from a surface
Use '-T' to allocate decoder buffers from a surface texture
Change-Id: Ib71ea53d0fd1b2def08bfeac2fd8bcbdc1938161
mds/stagefright/stagefright.cpp
|
| 67b47c917296a539081c55e71880fda98e0cc219 |
28-Jun-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for issue 4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, &lastBufferTimeUs) fails"
|
| 01158eac3464fc6e7837be594d6a8d14172154bc |
27-Jun-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for issue 4905998 OMXCodec::drainInputBuffer, findInt64(kKeyTime, &lastBufferTimeUs) fails
Change-Id: I353bd9e8aa1eceb9c14040a9953777967500fb1d
ibvideoeditor/vss/common/inc/M4AD_Common.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
|
| 9540d81f926a92b2c44618c212b9efff359dc090 |
27-Jun-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for issue 4949999 getFormat() returns NULL
Change-Id: Ie534e2660b0de2c3ac697b4e1f61e3aaf2c4cffe
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 1e06f435434681f8750cc21763868fd025e8480e |
17-Jun-2011 |
Sundar Raman <sunds@ti.com> |
CameraService: Decouple dequeue and lock
Decouple lockBuffer from dequeueBuffer. Add lock_buffer to preview_stream_ops,
so HALs will be fully in charge of managing buffers.
Change-Id: I7b53487d618bdf08ba904c5a0f41af462a7ca773
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| 50255a92dfb2ffd35955035ae9ac9d4b85f606b8 |
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
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 34bac59216838c056ffc27fa8dc9c0bf583eaf82 |
27-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix the new color converter to respect the destination crop rect."
|
| e5b2a43058438da3f5795dd9abf9419d640a004f |
27-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Log video dimensions and crop rectangle."
|
| bab4b56c93a3fc26767687bffd5d10c5250b35ea |
27-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Update paths to test content used to run the omx_tests."
|
| 593e2773f616a926af45e74359e21a898c89875f |
27-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4571308 Provide correct video frame timestamps
Change-Id: I0f726817fc02d3e2a4cf82ed801ef977994e6bcc
edia/libstagefright/AwesomePlayer.cpp
|
| efc2e4255b8565f5ad6ef8d1cf0e2695e74190d4 |
27-Jun-2011 |
James Dong <jdong@google.com> |
Fix copy and paste errors for mime type strings in the 3GP reader
Change-Id: Ia91b06f4dba9e4265260b28aabeeffeceff6d157
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| b1af69b8f91cf71bef79f56faf981f9a77e507b6 |
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"
|
| 3571d50a2582bc9c63f09cd81b4f490ea3522bd9 |
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
edia/libstagefright/colorconversion/ColorConverter.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/SoftwareRenderer.h
|
| 884946a23cfe804491ef6067bd9361371d7848fd |
24-Jun-2011 |
Andreas Huber <andih@google.com> |
Log video dimensions and crop rectangle.
Change-Id: Ia56b09df4f6e9a14c4dcc499a6637fc39f8e3bb5
edia/libstagefright/OMXCodec.cpp
|
| 078f12ed36b71a5fa7654b774369090b98cc684c |
24-Jun-2011 |
Andreas Huber <andih@google.com> |
Update paths to test content used to run the omx_tests.
Change-Id: I23201ac1541df032426cb05b9dc872b28882f992
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| 4ca2c7c913f8bd4ada13aca56d36045d42d1e00f |
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
amera/Android.mk
amera/Camera.cpp
amera/ICameraRecordingProxy.cpp
amera/ICameraRecordingProxyListener.cpp
nclude/camera/Camera.h
nclude/camera/ICameraRecordingProxy.h
nclude/camera/ICameraRecordingProxyListener.h
nclude/media/IMediaRecorder.h
nclude/media/MediaRecorderBase.h
nclude/media/mediarecorder.h
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
ervices/camera/libcameraservice/CameraService.cpp
|
| 486247017e0bfb9db9994a53a28c0dacfebf8567 |
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
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.h
|
| c5a57efb706ec79032fc09c43b16d11ed0876604 |
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>
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| cb62bc3fe54222cf05824e6f98fefafee552049a |
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>
nclude/media/stagefright/ColorConverter.h
nclude/media/stagefright/openmax/OMX_IVCommon.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| 8e51d58fca9b7669f271378f9245e180f4360cbc |
23-Jun-2011 |
Gloria Wang <gwang@google.com> |
- Public part of the Metadata API.
- Modify the media framework test for Metadata.
Change-Id: Ib8fa4991f114e1bb88a17ca662844b9b8e1d0faf
nclude/media/Metadata.h
edia/libmedia/Metadata.cpp
|
| 06371d97f549981cd2d524c8868fde2ef10dc1e9 |
23-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Parse RTP-Info even for live streams."
|
| 46dd1e8633c12eeb85c283df11d6d992fb2c7594 |
23-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Reconstruct sync frame indication for content served by the MPEG2TSExtractor"
|
| b5c7784c96a606890eb8a8b560153ef4a5d1a0d9 |
23-Jun-2011 |
Thomas Le Guevel <thomaslg@google.com> |
Fix for: 4676350 Do not use dual copyright declaration for video editor code
Change-Id: I2856be051fa3b3ddfe67e096e45fb0b34beb92be
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyAudioSource.h
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.h
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.h
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/lvpp/VideoEditorTools.h
ibvideoeditor/osal/inc/LVOSA_FileReader_optim.h
ibvideoeditor/osal/inc/LV_Macros.h
ibvideoeditor/osal/inc/M4OSA_CharStar.h
ibvideoeditor/osal/inc/M4OSA_Clock.h
ibvideoeditor/osal/inc/M4OSA_CoreID.h
ibvideoeditor/osal/inc/M4OSA_Debug.h
ibvideoeditor/osal/inc/M4OSA_Error.h
ibvideoeditor/osal/inc/M4OSA_Export.h
ibvideoeditor/osal/inc/M4OSA_FileCommon.h
ibvideoeditor/osal/inc/M4OSA_FileCommon_priv.h
ibvideoeditor/osal/inc/M4OSA_FileReader.h
ibvideoeditor/osal/inc/M4OSA_FileReader_priv.h
ibvideoeditor/osal/inc/M4OSA_FileWriter.h
ibvideoeditor/osal/inc/M4OSA_FileWriter_priv.h
ibvideoeditor/osal/inc/M4OSA_Memory.h
ibvideoeditor/osal/inc/M4OSA_Mutex.h
ibvideoeditor/osal/inc/M4OSA_OptionID.h
ibvideoeditor/osal/inc/M4OSA_Semaphore.h
ibvideoeditor/osal/inc/M4OSA_Thread.h
ibvideoeditor/osal/inc/M4OSA_Thread_priv.h
ibvideoeditor/osal/inc/M4OSA_Time.h
ibvideoeditor/osal/inc/M4OSA_Types.h
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/osal/src/LVOSA_FileReader_optim.c
ibvideoeditor/osal/src/M4OSA_CharStar.c
ibvideoeditor/osal/src/M4OSA_Clock.c
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/osal/src/M4OSA_FileReader.c
ibvideoeditor/osal/src/M4OSA_FileWriter.c
ibvideoeditor/osal/src/M4OSA_Mutex.c
ibvideoeditor/osal/src/M4OSA_Random.c
ibvideoeditor/osal/src/M4OSA_Semaphore.c
ibvideoeditor/osal/src/M4OSA_Thread.c
ibvideoeditor/osal/src/M4PSW_DebugTrace.c
ibvideoeditor/osal/src/M4PSW_MemoryInterface.c
ibvideoeditor/osal/src/M4PSW_Trace.c
ibvideoeditor/vss/3gpwriter/inc/M4MP4W_Types.h
ibvideoeditor/vss/3gpwriter/inc/M4MP4W_Utils.h
ibvideoeditor/vss/3gpwriter/inc/M4MP4W_Writer.h
ibvideoeditor/vss/3gpwriter/src/Android.mk
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Interface.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
ibvideoeditor/vss/common/inc/From2iToMono_16.h
ibvideoeditor/vss/common/inc/LVM_Types.h
ibvideoeditor/vss/common/inc/M4AD_Common.h
ibvideoeditor/vss/common/inc/M4AD_Null.h
ibvideoeditor/vss/common/inc/M4AIR_API.h
ibvideoeditor/vss/common/inc/M4AMRR_CoreReader.h
ibvideoeditor/vss/common/inc/M4Common_types.h
ibvideoeditor/vss/common/inc/M4DA_Types.h
ibvideoeditor/vss/common/inc/M4DECODER_Common.h
ibvideoeditor/vss/common/inc/M4ENCODER_AudioCommon.h
ibvideoeditor/vss/common/inc/M4ENCODER_common.h
ibvideoeditor/vss/common/inc/M4OSA_CoreID.h
ibvideoeditor/vss/common/inc/M4PCMR_CoreReader.h
ibvideoeditor/vss/common/inc/M4READER_3gpCom.h
ibvideoeditor/vss/common/inc/M4READER_Amr.h
ibvideoeditor/vss/common/inc/M4READER_Common.h
ibvideoeditor/vss/common/inc/M4READER_Pcm.h
ibvideoeditor/vss/common/inc/M4SYS_AccessUnit.h
ibvideoeditor/vss/common/inc/M4SYS_Stream.h
ibvideoeditor/vss/common/inc/M4TOOL_VersionInfo.h
ibvideoeditor/vss/common/inc/M4VD_EXTERNAL_Interface.h
ibvideoeditor/vss/common/inc/M4VD_Tools.h
ibvideoeditor/vss/common/inc/M4VFL_transition.h
ibvideoeditor/vss/common/inc/M4VIFI_Clip.h
ibvideoeditor/vss/common/inc/M4VIFI_Defines.h
ibvideoeditor/vss/common/inc/M4VIFI_FiltersAPI.h
ibvideoeditor/vss/common/inc/M4VPP_API.h
ibvideoeditor/vss/common/inc/M4WRITER_common.h
ibvideoeditor/vss/common/inc/M4_BitStreamParser.h
ibvideoeditor/vss/common/inc/M4_Common.h
ibvideoeditor/vss/common/inc/M4_Utils.h
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
ibvideoeditor/vss/common/inc/MonoTo2I_16.h
ibvideoeditor/vss/common/inc/NXPSW_CompilerSwitches.h
ibvideoeditor/vss/common/inc/NXPSW_CompilerSwitches_MCS.h
ibvideoeditor/vss/common/inc/SSRC.h
ibvideoeditor/vss/common/inc/VideoEditorResampler.h
ibvideoeditor/vss/common/inc/marker.h
ibvideoeditor/vss/inc/M4EXIFC_CommonAPI.h
ibvideoeditor/vss/inc/M4PTO3GPP_API.h
ibvideoeditor/vss/inc/M4PTO3GPP_ErrorCodes.h
ibvideoeditor/vss/inc/M4PTO3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4VSS3GPP_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
ibvideoeditor/vss/inc/M4VSS3GPP_Extended_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalConfig.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalFunctions.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4xVSS_API.h
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/mcs/inc/M4MCS_API.h
ibvideoeditor/vss/mcs/inc/M4MCS_ErrorCodes.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalConfig.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalFunctions.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/mcs/src/M4MCS_AudioEffects.c
ibvideoeditor/vss/mcs/src/M4MCS_Codecs.c
ibvideoeditor/vss/mcs/src/M4MCS_MediaAndCodecSubscription.c
ibvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/M4AD_Null.c
ibvideoeditor/vss/src/M4AIR_API.c
ibvideoeditor/vss/src/M4AMRR_CoreReader.c
ibvideoeditor/vss/src/M4ChannelConverter.c
ibvideoeditor/vss/src/M4PCMR_CoreReader.c
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
ibvideoeditor/vss/src/M4READER_Amr.c
ibvideoeditor/vss/src/M4READER_Pcm.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/src/M4VD_Tools.c
ibvideoeditor/vss/src/M4VIFI_xVSS_RGB565toYUV420.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
ibvideoeditor/vss/src/M4VSS3GPP_Codecs.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/src/VideoEditorResampler.cpp
ibvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
ibvideoeditor/vss/video_filters/src/Android.mk
ibvideoeditor/vss/video_filters/src/M4VFL_transition.c
ibvideoeditor/vss/video_filters/src/M4VIFI_BGR565toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_Clip.c
ibvideoeditor/vss/video_filters/src/M4VIFI_RGB565toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_RGB888toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.c
|
| 22192eaa6f8ee8ec6ed0737d01fe27cd6bd4d916 |
23-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle."
|
| 68cbeba4e21aa53f52fb99b74dfa1910af31a3eb |
23-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix warnings for uninitialized local variables"
|
| eddf9ef9235608e0231379a7bc614853bf5bcfa3 |
23-Jun-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Added audio_bytes_per_sample() helper function"
|
| 17e5dcbf4b22a7dc1ae1a72d14cf5f8d747f1123 |
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
edia/libstagefright/codecs/amrwbenc/src/cmnMemory.c
|
| ab00df4d8585b181e9058eb1b9c7996aa3bbaeab |
22-Jun-2011 |
Gloria Wang <gwang@google.com> |
- Add two sanity checks.
- Remove one unnecessary line.
- Clear the extendedData vector in DecryptHandle.
Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
rm/common/DrmSupportInfo.cpp
rm/common/IDrmManagerService.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
|
| d0965dde97f2815ae0a15fe6b40946f8a741a81e |
23-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Fix warnings for uninitialized local variables
Change-Id: Ic9b03b0fd215444e76c7b7bebb385f7831c557e0
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| fed045821d5eae63b34549cb44b7d26602f5c543 |
22-Jun-2011 |
Andreas Huber <andih@google.com> |
Reconstruct sync frame indication for content served by the MPEG2TSExtractor
Strip data up to the first IDR frame if necessary.
Change-Id: I4a096785eb1a17b7484983788e223d188454771d
mds/stagefright/stagefright.cpp
|
| 10774791af82faacb12307d3d7d79c80afc96574 |
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"
|
| 2a4592119fe1d303fff2f268fffe7a84f38f8027 |
22-Apr-2011 |
Martin Storsjo <martin@martin.st> |
stagefright: Only use __int64 on MSVC, not on all win32 compilers
Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
edia/libstagefright/codecs/common/include/voType.h
|
| 267dbd822ff060843ce409c0f1b50f6d5468ea31 |
22-Dec-2010 |
Martin Storsjo <martin@martin.st> |
stagefright aacenc: Make the mem_malloc function 64-bit safe
Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
edia/libstagefright/codecs/aacenc/src/memalign.c
|
| ea1b2a40def72caa03a40460bf04911b0d9b4d46 |
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
edia/libstagefright/codecs/common/cmnMemory.c
|
| 3b573f7bf1c5736d500e39013b8d32478a1429e6 |
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
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/timedtext/Android.mk
edia/libstagefright/timedtext/TextDescriptions.cpp
edia/libstagefright/timedtext/TextDescriptions.h
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
|
| 45c254c0c535e1d62f23d14cab7385d536c1e2bf |
22-Jun-2011 |
James Dong <jdong@google.com> |
Add some error log messages to indicate the failure of a recording session
Change-Id: I8c5885200bcf6a59736076efc021f07f45a0fdac
edia/libstagefright/MPEG4Writer.cpp
|
| 6ef9a104959c1d15232fe3a319e4a270eed3ddb5 |
22-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Timestamp adjustment will not work well if we ask video encoder to produce B frames"
|
| f2ab12d0dcef27fd52dcae53221e9c51a369fef6 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 81eacb8bbf331501bb68c7f1fdd7ca1811b03f8f |
21-Jun-2011 |
Andreas Huber <andih@google.com> |
Log an error instead of asserting if the OMX plugin reports an error.
Change-Id: I2bae80706495c5c5d4257cd607c2141c070c5ff9
edia/libstagefright/omx/OMXMaster.cpp
|
| 185a19319e61ccd5e8806b7d00a20192dbcaf1f8 |
21-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."
|
| fb6c6167c81c6ade0956d05924eebdeeec65d973 |
21-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Don't assert on malformed .mp4 content that contains fewer samples than"
|
| 440060f943d9dab6cc5060a6e3159e173d52d9f7 |
21-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Boost software vp8 decoder performance using multi-threaded decoding if possible"
|
| 9067e30b3ccb3a07e41b61af22c036378053a9a3 |
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/include/M3UParser.h
|
| 65a2670e84f44f6cdd80d625a7248fc65319ab8c |
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
edia/libstagefright/SampleTable.cpp
|
| 409e5a07f044239aac2059c9ba3b3f6f48eeaba1 |
21-Jun-2011 |
Gloria Wang <gwang@google.com> |
Fix a memory leak in the Forward Lock plugin.
For bug 4770217.
Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 551e95607ce83c0d491a2c12cdae4aa92197dc2c |
21-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Restore legacy soft-aac decoder behaviour. Substitute silence on decode error."
|
| 3d1d7767afc7c488197ec40a22739159c5110721 |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 122baae2f2aedca38fab723f7ad672044b0ce413 |
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
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
|
| c0fc64242a504a6c72670b0db2d648d2a3e208d2 |
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()."
|
| 8c67a583db53eebe65bd0c3abb41909c60a02eb0 |
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."
|
| 03168ed2f76e12e5dd41740697ea8206759924c1 |
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
edia/libstagefright/OMXCodec.cpp
|
| f3ac3e3c94c14dbf1cdf6a4577f0b3aa8edfad06 |
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
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
|
| a6925e6149faf4a936a5b557a769d117454413d8 |
01-Jun-2011 |
Andreas Huber <andih@google.com> |
Parse RTP-Info even for live streams.
Change-Id: Ib2c39ce8d5366f5ea350e71b7a54f5f7c2b510b9
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| e6ebb09642944b1d0cc06a788308e9b843dee595 |
20-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove unneeded #include <sys/resource.h>"
|
| f9fb13966a8e6ba039e88a46d096cd1cce2eb283 |
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
edia/libstagefright/OggExtractor.cpp
|
| 31dab950e4ffeaaa33d39c2ca3d0b72fe028265c |
18-Jun-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Fix some problems with GetObjectHandles and GetNumObjects commands"
|
| dc3185e3e27b05e18c4ac34432a25a0c279ff351 |
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>
edia/mtp/MtpServer.cpp
|
| b5512a1bd218269de30e1d66bac55c81e227dc0c |
18-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Use system property to control whether we will enable B frame support in MPEG4Writer"
|
| 05e65807d48c2c7b954af82eda0532a48948e96a |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 671a636931295d9c33ffca74551a804479d01241 |
17-Jun-2011 |
Eric Laurent <elaurent@google.com> |
Added audio_bytes_per_sample() helper function
Change-Id: Ibfcd75c4c241a53d5f052c25ada091904991048a
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| a6c4758fdac248b863567da99f0c13eb12448a95 |
17-Jun-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix regression in audio effect factory"
|
| 342484f01824ab45af953c7c9193b1e5ad6326de |
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
edia/libeffects/factory/EffectsFactory.c
|
| daeba2d6b9df5252afacec835a23340e5d9910ec |
16-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "-Fix some typo -Remove one unnecessary memory allocation"
|
| 01bded1246cd770b54b8011527f5c29e1b5663e3 |
16-Jun-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Allow camera to be disabled via Device Policy Manager"
|
| c10ce33302f91896fc2a87c13b00518a4bc26e3a |
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
rm/common/IDrmManagerService.cpp
rm/libdrmframework/include/PlugInManager.h
|
| 50b0f02dea21f31ec1fbe45b86893aa9233483b8 |
16-Jun-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with gingerbread-release
Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6
|
| b8e9897b8ad5d722e424d7a7e256153307ecbd93 |
15-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Remove unneeded #include <sys/resource.h>
Suggested in code review for previous change.
Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
edia/libmedia/ToneGenerator.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libstagefright/AACWriter.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/omx/OMX.cpp
|
| fce442c23e65fa1973947df683eec9a5c36057a5 |
15-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge "Merge chromium to r11.0.672.0: Compile fix"
|
| 7b92cb6aecba28927ed5d66ec1ba0a9f496477f0 |
15-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 4608375"
|
| a307c3371987a864a4f066b84f9ffb8ab803b41f |
15-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Enforce the rule that the timestamp from timelapse video source monotically increases"
|
| b432603d711cd504d0de62f7fbb095b90c9a4283 |
14-Jun-2011 |
Gloria Wang <gwang@google.com> |
To remove log spam in the Forward Lock DRM plugin.
Fix for bug 4619159.
Change-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 86106f8b0641444c97a39e9788eeef55ab2a2ac6 |
14-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4608375
Update priority and policy together for audio threads
Change-Id: Ib3b07b32586c222c4aacbf23414ae8b05db502be
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/omx/OMX.cpp
|
| 6771263604cf8e464b5cd1278823b0898af3a2a9 |
14-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053."
|
| 3f1545d22a71f960c9598a24e7e48ec16dd16267 |
14-Jun-2011 |
Dima Zavin <dima@android.com> |
Merge "audio: update for audio/audio_policy header names/locations"
|
| 04cf3b24dcfefb2da0864adde0f51a7f49c351f4 |
14-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Add an option to force to use HW codec in stagefright cmd tool"
|
| b250340f83edde0f2b3a10b380c519c209fc91e9 |
14-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Add B frame support for MPEG4Writer"
|
| 1fc87828715ef5cda402f1960231621672f91513 |
14-Jun-2011 |
James Dong <jdong@google.com> |
Enforce the rule that the timestamp from timelapse video source monotically increases
Change-Id: Ie5ccb43e0192420300da58525ec52af7544e8e9e
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 7394a4f358fa9908a9f0a7c954b65c399f4268e6 |
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>
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| cfc7a7feb81b946341bc01ade68291bf8b6e1037 |
14-Jun-2011 |
James Dong <jdong@google.com> |
Add an option to force to use HW codec in stagefright cmd tool
Change-Id: If6c277dd5a3f7a0b62acd6721343618b0be085fc
mds/stagefright/stagefright.cpp
|
| 965e4239ca1cf6c824c1f8ce23116f9ba8cf6ebd |
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
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 50872c0b6563b75bb02e0de2fd578b40db8227db |
14-Jun-2011 |
Gloria Wang <gwang@google.com> |
Duplicated fileDesc is not closed when input file is not forward-lock content.
Fix for bug 4606053.
Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 4b85d1750153085fe5d076b67802dfb1ea2bbb13 |
20-Apr-2011 |
Mathias Agopian <mathias@google.com> |
unify SurfaceTexture and Surface
Add the concept of synchronous dequeueBuffer in SurfaceTexture
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Add SurfaceTexture logging
fix onFrameAvailable
nclude/private/surfaceflinger/SharedBufferStack.h
|
| afcedc9e6f17d8213d9bd8f6c36643dcc816d0ef |
11-Jun-2011 |
Iliyan Malchev <malchev@google.com> |
CameraService: return stide when dequeueing a buffer
Change-Id: I11c7f0b57f7d619cdc392b2d34c538ae898de7ac
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| aaf95a50b2202acb14fa437d065afc611a9265ff |
11-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Avoid duplicated code calculating the stts sample duration"
|
| 62dfda30f41d33682ee96038c404ab59995684e0 |
10-Jun-2011 |
Dianne Hackborn <hackbod@google.com> |
am 15e9d474: am 88748e6d: am d86302df: Quiet the log.
* commit '15e9d474d1033adbedc8632309df26c3d6dfaee3':
Quiet the log.
|
| 79761ab096f57c3027fad9556c2bc436672d614e |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 04f9739d49b55ddc6183a906dffb3ada3477dc50 |
10-Jun-2011 |
James Dong <jdong@google.com> |
am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
* commit 'dc03da0444803983aef4988475f2d5dcdf0283e9':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
|
| b32d99fe192d0b3513d53bf659fd6808acf37c17 |
10-Jun-2011 |
Conley Owens <cco3@android.com> |
am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit 'e668c0b69896996040f394e0a95f71dd4b9c6257':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
|
| d5fee4df48a1a2d24219ef892230621396d9ab9d |
10-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_IndexParamPortDefinition"
|
| b8df88558caf8f66ce432974705afe00bf00928d |
10-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Correctly handle crop rect event in SoftAVC.cpp"
|
| e94a0e6973735e34b743fb1eef609ddb2c2ff4f6 |
10-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populate it."
|
| da494b94120bad138a2cc4eb7dac0557546ae519 |
10-Jun-2011 |
Dianne Hackborn <hackbod@google.com> |
am 88748e6d: am d86302df: Quiet the log.
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
Quiet the log.
|
| 870e9f714acdf680cdd32d1bfe849a90637d2ec5 |
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
|
| 536fb67eac9e3a0acf2ae76ecd986323e4537fcd |
10-Jun-2011 |
Dianne Hackborn <hackbod@google.com> |
am d86302df: Quiet the log.
* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
Quiet the log.
|
| 767ad02b2ca9e6ad02b8cf56098cffad52970642 |
10-Jun-2011 |
Dianne Hackborn <hackbod@google.com> |
Quiet the log.
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
edia/libmedia/MediaScanner.cpp
|
| e9f6d0579603372fd2547e6c5ba6e114c6f8cba7 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| abcd31d61be0542cdd60542081c7d7d3526bf987 |
10-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Add timestamp and data pointer checks in CameraSource"
|
| 15c950ba38b8f41d1c4301e5a42286385d1dde45 |
09-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 4c2e9437c6a0bdf7e166a6e3a0987ba41bf31889 |
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."
|
| 695d014c6feb0751132e999082ebcb7e089a3245 |
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
|
| dab863f7585a2b2c2e10119afd7c4bab1e920afd |
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
|
| 635dbf9f98fe65734aff8a3f4786987525882d71 |
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."
|
| 8d9a6e7b93ca96d6cf0f201ff5b139423e4d1d1f |
09-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
|
| cbaae3bfbd3a96aef34bb996e9e11945e18fdfc8 |
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
|
| 639ffaca514deb9de538bc2dc6e712380db68fd3 |
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
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.h
|
| 2c32a92c84445d312b0dee4c82f84c036f2ca651 |
09-Jun-2011 |
Conley Owens <cco3@android.com> |
Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
|
| 30215039c4089648da02193981f6443776f2389a |
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
|
| 2bb7e36e78521f49d2550aab34b34c25c23f7435 |
09-Jun-2011 |
Marco Nelissen <marcone@google.com> |
Make sure we don't read from invalid fds
b/4580570
Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
edia/libstagefright/HTTPStream.cpp
|
| 6ad97c72b9e63b4175a1df7b99448536402a7d1f |
09-Jun-2011 |
Andreas Huber <andih@google.com> |
am 752a5b3d: (-s ours) am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
* commit '752a5b3df55da655792d382025171d94073e05f9':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
|
| a0b1d4b161599c2bb2a47119e50c51e75bbe980e |
08-Jun-2011 |
Andreas Huber <andih@google.com> |
Make dumpsys(media.player) more useful by having AwesomePlayer populate it.
Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
nclude/media/MediaPlayerInterface.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 103487c0cb5c06f47225484486a98bc84745a059 |
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
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| f6e1ff257eb3c4f98587170d0c6367bf58cfb115 |
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
edia/libstagefright/OMXCodec.cpp
|
| 1c962398233b184a498018fe1a649a8827b2160f |
07-Jun-2011 |
Andreas Huber <andih@google.com> |
am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
* commit '8e97372913c9236ffdee175c6da99dc00c22b3e1':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
|
| 26adde897188059057b3ffcfde1d60171fc6888c |
07-Jun-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/base: updates for camera HAL memory management
-- when the camera HAL allocates memory
-- it requests is as N buffers by S bytes each
-- it may specify a file descriptor to get mmapped; if -1, then we use ashmem
-- when issuing data and data-timestamp callbacks, the camera HAL specifies a
buffer index
-- range checking is performed on the buffer indices
-- memory requested by a camera HAL is not incStrong'ed, and needs to be
expliciftly released by the camera HAL (by calling the release method on the
camera_memory_t handle)
Change-Id: I0f09603aa786c238590e7288388ab673787e6032
Signed-off-by: Iliyan Malchev <malchev@google.com>
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| 64125da2f3b76f2d88bb757cb6bf5bd5e29a0639 |
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
edia/libstagefright/chromium_http/support.cpp
edia/libstagefright/chromium_http/support.h
|
| 6e49bd393f263bd17a65eb5c1a0e649933c78504 |
07-Jun-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Improve android.hardware.Camera.Area javadoc."
|
| 0c08325b66b74e1353d84662c684e4380bb8292f |
07-Jun-2011 |
Wu-cheng Li <wuchengli@google.com> |
Improve android.hardware.Camera.Area javadoc.
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
nclude/camera/CameraParameters.h
|
| 5e7271d6e24efb891e0de141a06228c99866f49f |
07-Jun-2011 |
Iliyan Malchev <malchev@google.com> |
CameraParameters: add PIXEL_FORMAT_RGBA8888
Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8
Signed-off-by: Iliyan Malchev <malchev@google.com>
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 5ffc7628f0efa122207eec86473c3e23dbd17445 |
07-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Fix the comment for the location box @xyz"
|
| 380e88a9ef232d14e4062f9ee6b0e572faf10536 |
07-Jun-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| d048e38a50fcf5b47f557346bb2624c250011ae7 |
06-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove dead code related to gettid"
|
| d5623ca906f64cc257cd695abd2a6b52b085f65f |
04-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"
|
| 20214f3908a6f085ea531c65496347953e2d25b6 |
04-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Initial-checkin for ON2 Software AVC/H264 decoder"
|
| 98cfde007490a5903b729a4718c0dada755ae8f8 |
04-Jun-2011 |
James Dong <jdong@google.com> |
Add timestamp and data pointer checks in CameraSource
Change-Id: I99e188f631df2257813aa7ec657d6ecfc8859d9e
edia/libstagefright/CameraSource.cpp
|
| 432ec3768cc4a3b1b01afedc456689d75c89ee2b |
04-Jun-2011 |
James Dong <jdong@google.com> |
Fix the comment for the location box @xyz
Change-Id: I5347e346eef40a8ba90e7a3fa786b4654d18606b
edia/libstagefright/MPEG4Writer.cpp
|
| 0512ab559d4670c2204078470d7ef5d376811c57 |
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
edia/libmedia/AudioSystem.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/JetPlayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MidiFile.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| 57ca262f8d1c0aabeea294ddb53e4db172fc6bec |
03-Jun-2011 |
James Dong <jdong@google.com> |
Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h
Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
nclude/media/stagefright/openmax/OMX_IVCommon.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| 158b194da537c18a6ad1d7ef3cd63c87b2310269 |
02-Jun-2011 |
Andreas Huber <andih@google.com> |
Merge "Don't advertise the (old-style) software decoders unless they're actually present."
|
| 2f0a8405f00a6e2e7e9f1cc47ac803ac01d5dfd5 |
02-Jun-2011 |
Andreas Huber <andih@google.com> |
Don't advertise the (old-style) software decoders unless they're actually present.
Change-Id: I3753a21e1a7de86432c9c087be9d52028e3a1e1b
edia/libstagefright/OMXCodec.cpp
|
| 0c1bc742181ded4930842b46e9507372f0b1b963 |
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
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/on2/h264dec/Android.mk
edia/libstagefright/codecs/on2/h264dec/SoftAVC.cpp
edia/libstagefright/codecs/on2/h264dec/SoftAVC.h
edia/libstagefright/codecs/on2/h264dec/inc/H264SwDecApi.h
edia/libstagefright/codecs/on2/h264dec/inc/basetype.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/ARM_DELIVERY.TXT
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/ARM_MANIFEST.TXT
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_BitDec_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_Bitstream.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCTTable.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_IDCT_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_MaskTable.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_Version.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armCOMM_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/armOMX.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/api/omxtypes_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/build_vc.pl
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/filelist_vc.txt
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_Bitstream.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_IDCTTable.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/src/armCOMM_MaskTable.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/armVCCOMM_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/omxVC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/api/omxVC_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy16x16_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_Copy8x8_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/api/armVCM4P10_CAVLCTables.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_CAVLCTables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_DequantTables_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_QuantTables_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Clip8_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm11/vc/src/armVC_Version.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/ARM_DELIVERY.TXT
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/ARM_MANIFEST.TXT
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_BitDec_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Bitstream.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCTTable.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_IDCT_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_MaskTable.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_Version.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armCOMM_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/armOMX.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/api/omxtypes_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/build_vc.pl
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/filelist_vc.txt
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_Bitstream.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_IDCTTable.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/src/armCOMM_MaskTable.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/armVCCOMM_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/api/omxVC_s.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy16x16_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_Copy8x8_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/comm/src/omxVCCOMM_ExpandFrame_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/api/armVCM4P10_CAVLCTables.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Average_4x_Align_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_CAVLCTables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingChroma_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DeblockingLuma_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_DequantTables_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Align_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_Copy_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_Interpolate_Chroma_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_QuantTables_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_TransformResidual4x4_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/armVCM4P10_UnpackBlock4x4_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_InterpolateLuma_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Average_4x_Align_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingChroma_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DeblockingLuma_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DecodeCoeffsToPair_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_DequantTables_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Align_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_Copy_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_DiagCopy_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagHorVer4x4_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfDiagVerHor4x4_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfHor4x4_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_InterpolateLuma_HalfVer4x4_unsafe_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_QuantTables_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_TransformResidual4x4_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_UnpackBlock4x4_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DeblockLuma_I.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_DequantTransformResidualFromPairAndAdd_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_HorEdge_I_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingChroma_VerEdge_I_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_HorEdge_I_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_FilterDeblockingLuma_VerEdge_I_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_InterpolateLuma_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntraChroma_8x8_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_16x16_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_PredictIntra_4x4_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantChromaDCFromPair_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/omxVCM4P10_TransformDequantLumaDCFromPair_s.S
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Clip8_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_AC_unsafe_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Lookup_Tables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_SetPredDir_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_FindMVpred_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_IDCT8x8blk_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_MCReconBlock_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvInter_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I_s.s
edia/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/src/armVC_Version.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/ARM_DELIVERY.TXT
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/ARM_MANIFEST.TXT
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM_Bitstream.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/api/armCOMM_Version.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/api/armOMX.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/api/omxtypes.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/build_vc.pl
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/filelist_vc.txt
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/src/armCOMM_Bitstream.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/api/armVC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/api/omxVC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_Average.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/armVCCOMM_SAD.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_16x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Average_8x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ComputeTextureErrorBlock_SAD.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy16x16.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_Copy8x8.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_ExpandFrame_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_LimitMVToRect.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_16x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/comm/src/omxVCCOMM_SAD_8x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/api/armVCM4P10_CAVLCTables.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CAVLCTables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_CompareMotionCostToMV.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DeBlockPixel.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DecodeCoeffsToPair.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_DequantTables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_FwdTransformResidual4x4.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfDiag_Luma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfHor_Luma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_InterpolateHalfVer_Luma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Chroma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_Interpolate_Luma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_PredictIntraDC4x4.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_QuantTables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_SADQuar.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_TransformResidual4x4.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock2x2.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/armVCM4P10_UnpackBlock4x4.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_Average_4x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Half.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Integer.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_BlockMatch_Quarter.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockChroma_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DeblockLuma_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeChromaDcCoeffsToPairCAVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DecodeCoeffsToPairCAVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_DequantTransformResidualFromPairAndAdd.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_HorEdge_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingChroma_VerEdge_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_HorEdge_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_FilterDeblockingLuma_VerEdge_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_GetVLCInfo.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateChroma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfHor_Luma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateHalfVer_Luma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InterpolateLuma.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_ChromaDC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformDequant_LumaDC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_InvTransformResidualAndAdd.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEGetBufSize.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MEInit.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_MotionEstimationMB.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntraChroma_8x8.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_16x16.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_PredictIntra_4x4.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_16x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_4x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SADQuar_8x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SAD_4x.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SATD_4x4.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_SubAndTransformQDQResidual.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantChromaDCFromPair.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformDequantLumaDCFromPair.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_ChromaDC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p10/src/omxVCM4P10_TransformQuant_LumaDC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_DCT_Table.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_Huff_Tables_VLC.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/api/armVCM4P2_ZigZag_Tables.h
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_ACDCPredict.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Half.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_BlockMatch_Integer.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CheckVLCEscapeMode.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_CompareMV.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DCT_Table.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_DecodeVLCZigzag_intra.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_EncodeVLCZigzag_intra.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLCBuffer.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_FillVLDBuffer.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_GetVLCBits.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Huff_Tables_VLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_PutVLCBits.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_SetPredDir.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/armVCM4P2_Zigzag_Tables.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_16x16.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Half_8x8.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_16x16.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_BlockMatch_Integer_8x8.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DCT8x8blk.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Inter.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeBlockCoef_Intra.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodePadMV_PVOP.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_Inter.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraACVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_DecodeVLCZigzag_IntraDCVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeMV.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_Inter.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraACVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_EncodeVLCZigzag_IntraDCVLC.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_FindMVpred.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_IDCT8x8blk.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MCReconBlock.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEGetBufSize.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MEInit.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_MotionEstimationMB.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_PredictReconCoefIntra.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInter_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantIntra_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvInter_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_QuantInvIntra_I.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_inter.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/m4p2/src/omxVCM4P2_TransRecBlockCoef_intra.c
edia/libstagefright/codecs/on2/h264dec/omxdl/reference/vc/src/armVC_Version.c
edia/libstagefright/codecs/on2/h264dec/source/DecTestBench.c
edia/libstagefright/codecs/on2/h264dec/source/EvaluationTestBench.c
edia/libstagefright/codecs/on2/h264dec/source/H264SwDecApi.c
edia/libstagefright/codecs/on2/h264dec/source/TestBenchMultipleInstance.c
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_hor_ver.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_chroma_ver.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_half.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_quarter.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_hor_ver_quarter.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_mid_hor.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_half.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/h264bsd_interpolate_ver_quarter.s
edia/libstagefright/codecs/on2/h264dec/source/arm11_asm/win_asm.bat
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdClearMbLayer.s
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdCountLeadingZeros.s
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdFillRow7.s
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdFlushBits.s
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm/h264bsdWriteMacroblock.s
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/asm_common.S
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdClearMbLayer.S
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdCountLeadingZeros.S
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFillRow7.S
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdFlushBits.S
edia/libstagefright/codecs/on2/h264dec/source/arm_neon_asm_gcc/h264bsdWriteMacroblock.S
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_byte_stream.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_byte_stream.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_cavlc.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_cavlc.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_cfg.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_conceal.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_conceal.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_container.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_deblocking.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_deblocking.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_decoder.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_dpb.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_dpb.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_image.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_image.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_inter_prediction.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_inter_prediction.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_intra_prediction.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_macroblock_layer.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_macroblock_layer.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_nal_unit.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_nal_unit.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_neighbour.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_neighbour.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_pic_order_cnt.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_pic_order_cnt.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_pic_param_set.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_pic_param_set.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_reconstruct.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_reconstruct.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_sei.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_sei.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_seq_param_set.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_seq_param_set.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_slice_data.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_slice_data.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_slice_group_map.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_slice_group_map.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_slice_header.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_slice_header.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_storage.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_storage.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_stream.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_stream.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_transform.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_transform.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_util.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_util.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_vlc.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_vlc.h
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_vui.c
edia/libstagefright/codecs/on2/h264dec/source/h264bsd_vui.h
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 92a746c3b18d035189f596ce32847bf26247aaca |
02-Jun-2011 |
James Dong <jdong@google.com> |
Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based"
|
| b33d2ac90cfce0fe6db8c3e979e7ae2bbfc28163 |
02-Jun-2011 |
James Dong <jdong@google.com> |
Do not call getEstimatedBandwidth if the streaming is not HTTP-based
Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
nclude/media/stagefright/DataSource.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| 84f03d564ac868924e6ddbff88418fe94f1d3e53 |
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.
|
| c6854100cea4fcd0f20cb2ac8235c02d1849b3a1 |
02-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Remove unnecessary level of priority indirection
Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| 26e0ac2f3849f97fa5f37b13f97a9b24b05ed6c5 |
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
edia/libstagefright/HTTPStream.cpp
|
| 72e95e7ee6fe2892201575e7f7e4dd798fb225f6 |
02-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit dd51bdc4cf4b7c9f09e7dc4116651c6681d5287c
ibvideoeditor/lvpp/AudioPlayerBase.cpp
ibvideoeditor/lvpp/AudioPlayerBase.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
|
| d217a8c4632b3e3065f8c2a26b9ce4dc4c97171f |
02-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
nclude/media/AudioTrack.h
nclude/media/ToneGenerator.h
nclude/media/stagefright/AudioPlayer.h
edia/libmedia/ToneGenerator.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/AudioPlayer.cpp
|
| 984eae0d1715c2caa6da6cccb55b919db9da1da2 |
05-May-2011 |
Glenn Kasten <gkasten@google.com> |
Use AudioTrack::event_type not int in callback
Change-Id: I09ff321f9457c0a9ee58e59bee38ed53799e494b
ibvideoeditor/lvpp/AudioPlayerBase.cpp
ibvideoeditor/lvpp/AudioPlayerBase.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
|
| 013b5a67d6f8e12a1b06e74863daec1bee4d99c1 |
05-May-2011 |
Glenn Kasten <gkasten@google.com> |
Use AudioTrack::event_type not int in callback
Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
nclude/media/AudioTrack.h
nclude/media/ToneGenerator.h
nclude/media/stagefright/AudioPlayer.h
edia/libmedia/ToneGenerator.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/AudioPlayer.cpp
|
| 8a72c54e74eb365971288a81687e5c2aa47963e7 |
01-Jun-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Use channel mask instead of channel count for track creation"
|
| 0d255b2d9061ba31f13ada3fc0f7e51916407176 |
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
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
|
| 5b1b8a93a07326f1cbc627f09e02988375189e0a |
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
nclude/media/mediaplayer.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/ChromiumHTTPDataSource.h
edia/libstagefright/include/HTTPBase.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| a3355430a36bbfa7b2c0d90eb30834f1c5dac337 |
20-May-2011 |
Wu-cheng Li <wuchengli@google.com> |
Allow camera to be disabled via Device Policy Manager
bug:4185309
Change-Id: I8be89d892b8f540fd05913c93f97b92346a0a282
ervices/camera/libcameraservice/CameraService.cpp
|
| 65580f9adf6c4d98449ad0716488f9fe3869aa5a |
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
nclude/media/AudioEffect.h
nclude/media/EffectsFactoryApi.h
nclude/media/IAudioFlinger.h
edia/libeffects/factory/EffectsFactory.c
edia/libmedia/AudioEffect.cpp
edia/libmedia/IAudioFlinger.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| e1315cf0b63b4c14a77046519e6b01f6f60d74b0 |
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
nclude/media/AudioEffect.h
nclude/media/EffectApi.h
nclude/media/EffectBassBoostApi.h
nclude/media/EffectEnvironmentalReverbApi.h
nclude/media/EffectEqualizerApi.h
nclude/media/EffectPresetReverbApi.h
nclude/media/EffectVirtualizerApi.h
nclude/media/EffectVisualizerApi.h
nclude/media/EffectsFactoryApi.h
nclude/media/IAudioFlinger.h
edia/libeffects/data/audio_effects.conf
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/factory/EffectsFactory.h
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/testlibs/Android.mk_
edia/libeffects/testlibs/AudioFormatAdapter.h
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/testlibs/EffectReverb.h
edia/libeffects/visualizer/EffectVisualizer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| a3e73df3b402f1ebdbef7c8a8e3111d852e7bd35 |
26-May-2011 |
James Dong <jdong@google.com> |
Merge "Extract embedded cover art (aka poster frame) in mp4 files"
|
| 2de4113c10975648ad9d1cffa45847870a0d01b3 |
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."
|
| 515e855eae78aa495da58356486aaa666cb57fd1 |
26-May-2011 |
James Dong <jdong@google.com> |
Extract embedded cover art (aka poster frame) in mp4 files
Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
mds/stagefright/stagefright.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 8d91237333c60c4a6839358109265e8847df23f3 |
26-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
|
| ecc0840163093942f3418aa4b27e9279c187b173 |
26-May-2011 |
Gloria Wang <gwang@google.com> |
Merge "For out of band timed text support (timed text in a separate file)."
|
| 965d08ba16ee82bc85f69546360c18e7da907406 |
11-May-2011 |
Gloria Wang <gwang@google.com> |
For out of band timed text support (timed text in a separate file).
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
nclude/media/mediaplayer.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/TimedTextPlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/TimedTextPlayer.h
edia/libstagefright/timedtext/Android.mk
edia/libstagefright/timedtext/TimedTextParser.cpp
edia/libstagefright/timedtext/TimedTextParser.h
edia/libstagefright/timedtext/TimedTextPlayer.cpp
edia/libstagefright/timedtext/TimedTextPlayer.h
|
| 386d609dc513e838c7e7c4c46c604493ccd560be |
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
nclude/media/stagefright/MediaDefs.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/include/MP3Extractor.h
edia/libstagefright/include/avc_utils.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
edia/libstagefright/rtsp/APacketSource.cpp
|
| 53bebaf2495b2034b5b5900cb39485b00bdac15b |
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."
|
| a2b2c9f9661a54e431430b029ce76332c6914f0b |
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."
|
| ade8c2d682d4f8c9424dece53e39400c237d22bf |
25-May-2011 |
James Dong <jdong@google.com> |
Merge "Convert line breaks to Unix style"
|
| f29f13077582425c242a36565bd71130fedf3cd0 |
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.
edia/libstagefright/NuHTTPDataSource.cpp
|
| fa855e0e46fc706a2120bc4659aaeaf2ef395a4d |
25-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge "Merge chromium to 10.0.634.0: Compile fix"
|
| a533975a8e3bb741948750a68a2c962a48777fe0 |
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
edia/libstagefright/chromium_http/support.cpp
|
| 931db87f8fd6fa1fd5b918f3b1fc107e8dca2e0e |
25-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Make sure all references to the decoder plugin are accounted for"
|
| 90d99759c4607106adcf1dbcc8546aedb2ff089f |
25-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer"
|
| 5a65e30064dc8dffa4f3d868f1c46038972c40c5 |
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
edia/libstagefright/include/SimpleSoftOMXComponent.h
edia/libstagefright/include/SoftOMXComponent.h
edia/libstagefright/omx/SimpleSoftOMXComponent.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| f2af5a2c607e71ff4cd39da28b077c0a68b206fe |
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
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
|
| 68cb8cfaaf4d01125397ff3bea30603bdc5001d4 |
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
|
| 9eff287f4f59d6a0c9ca1d5dd8a7bb6e64acf5a4 |
24-May-2011 |
James Dong <jdong@google.com> |
resolved conflicts for merge of d5762583 to master
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
|
| 62bcf26ee0ac7e7460a35800520de363c898ec33 |
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
|
| b1d713703b00dc972ceb2a655d5bac72381f303d |
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
|
| 8331a49259adf0529dc41ba66fc88fbe5af95129 |
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
|
| cd0b0fe858a9f109281031717d5c0001953b9054 |
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
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/WVMExtractor.h
|
| 77a88767df2992660fd3b38020c795baeb8d86e5 |
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().
|
| 003f6d613698484869476f01aa3fe2c28d3120bc |
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().
|
| 37b2d62df28a1f8e9489ee8adad030a3d24213d7 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 162f7d15ac5c8c23d1c3de171239f3a4e6e06b2a |
23-May-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"
|
| e2e838afcf03e603a41a0455846eaf9614537c16 |
22-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
Convert line breaks to Unix style
Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
edia/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
edia/libstagefright/codecs/aacenc/basic_op/basicop2.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.h
edia/libstagefright/codecs/aacenc/basic_op/typedef.h
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
edia/libstagefright/codecs/aacenc/inc/aac_rom.h
edia/libstagefright/codecs/aacenc/inc/aacenc_core.h
edia/libstagefright/codecs/aacenc/inc/adj_thr.h
edia/libstagefright/codecs/aacenc/inc/adj_thr_data.h
edia/libstagefright/codecs/aacenc/inc/band_nrg.h
edia/libstagefright/codecs/aacenc/inc/bit_cnt.h
edia/libstagefright/codecs/aacenc/inc/bitbuffer.h
edia/libstagefright/codecs/aacenc/inc/bitenc.h
edia/libstagefright/codecs/aacenc/inc/block_switch.h
edia/libstagefright/codecs/aacenc/inc/channel_map.h
edia/libstagefright/codecs/aacenc/inc/config.h
edia/libstagefright/codecs/aacenc/inc/dyn_bits.h
edia/libstagefright/codecs/aacenc/inc/grp_data.h
edia/libstagefright/codecs/aacenc/inc/interface.h
edia/libstagefright/codecs/aacenc/inc/line_pe.h
edia/libstagefright/codecs/aacenc/inc/memalign.h
edia/libstagefright/codecs/aacenc/inc/ms_stereo.h
edia/libstagefright/codecs/aacenc/inc/pre_echo_control.h
edia/libstagefright/codecs/aacenc/inc/psy_configuration.h
edia/libstagefright/codecs/aacenc/inc/psy_const.h
edia/libstagefright/codecs/aacenc/inc/psy_data.h
edia/libstagefright/codecs/aacenc/inc/psy_main.h
edia/libstagefright/codecs/aacenc/inc/qc_data.h
edia/libstagefright/codecs/aacenc/inc/qc_main.h
edia/libstagefright/codecs/aacenc/inc/quantize.h
edia/libstagefright/codecs/aacenc/inc/sf_estim.h
edia/libstagefright/codecs/aacenc/inc/spreading.h
edia/libstagefright/codecs/aacenc/inc/stat_bits.h
edia/libstagefright/codecs/aacenc/inc/tns.h
edia/libstagefright/codecs/aacenc/inc/tns_func.h
edia/libstagefright/codecs/aacenc/inc/tns_param.h
edia/libstagefright/codecs/aacenc/inc/transform.h
edia/libstagefright/codecs/aacenc/src/aac_rom.c
edia/libstagefright/codecs/aacenc/src/aacenc.c
edia/libstagefright/codecs/aacenc/src/aacenc_core.c
edia/libstagefright/codecs/aacenc/src/adj_thr.c
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
edia/libstagefright/codecs/aacenc/src/band_nrg.c
edia/libstagefright/codecs/aacenc/src/bit_cnt.c
edia/libstagefright/codecs/aacenc/src/bitbuffer.c
edia/libstagefright/codecs/aacenc/src/bitenc.c
edia/libstagefright/codecs/aacenc/src/block_switch.c
edia/libstagefright/codecs/aacenc/src/channel_map.c
edia/libstagefright/codecs/aacenc/src/dyn_bits.c
edia/libstagefright/codecs/aacenc/src/grp_data.c
edia/libstagefright/codecs/aacenc/src/interface.c
edia/libstagefright/codecs/aacenc/src/line_pe.c
edia/libstagefright/codecs/aacenc/src/ms_stereo.c
edia/libstagefright/codecs/aacenc/src/pre_echo_control.c
edia/libstagefright/codecs/aacenc/src/psy_configuration.c
edia/libstagefright/codecs/aacenc/src/psy_main.c
edia/libstagefright/codecs/aacenc/src/qc_main.c
edia/libstagefright/codecs/aacenc/src/quantize.c
edia/libstagefright/codecs/aacenc/src/sf_estim.c
edia/libstagefright/codecs/aacenc/src/spreading.c
edia/libstagefright/codecs/aacenc/src/stat_bits.c
edia/libstagefright/codecs/aacenc/src/tns.c
edia/libstagefright/codecs/aacenc/src/transform.c
edia/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
edia/libstagefright/codecs/amrwbenc/inc/acelp.h
edia/libstagefright/codecs/amrwbenc/inc/basic_op.h
edia/libstagefright/codecs/amrwbenc/inc/bits.h
edia/libstagefright/codecs/amrwbenc/inc/cnst.h
edia/libstagefright/codecs/amrwbenc/inc/cod_main.h
edia/libstagefright/codecs/amrwbenc/inc/dtx.h
edia/libstagefright/codecs/amrwbenc/inc/grid100.tab
edia/libstagefright/codecs/amrwbenc/inc/ham_wind.tab
edia/libstagefright/codecs/amrwbenc/inc/homing.tab
edia/libstagefright/codecs/amrwbenc/inc/isp_isf.tab
edia/libstagefright/codecs/amrwbenc/inc/lag_wind.tab
edia/libstagefright/codecs/amrwbenc/inc/log2.h
edia/libstagefright/codecs/amrwbenc/inc/log2_tab.h
edia/libstagefright/codecs/amrwbenc/inc/main.h
edia/libstagefright/codecs/amrwbenc/inc/math_op.h
edia/libstagefright/codecs/amrwbenc/inc/mem_align.h
edia/libstagefright/codecs/amrwbenc/inc/mime_io.tab
edia/libstagefright/codecs/amrwbenc/inc/oper_32b.h
edia/libstagefright/codecs/amrwbenc/inc/p_med_o.h
edia/libstagefright/codecs/amrwbenc/inc/p_med_ol.tab
edia/libstagefright/codecs/amrwbenc/inc/q_gain2.tab
edia/libstagefright/codecs/amrwbenc/inc/q_pulse.h
edia/libstagefright/codecs/amrwbenc/inc/qisf_ns.tab
edia/libstagefright/codecs/amrwbenc/inc/qpisf_2s.tab
edia/libstagefright/codecs/amrwbenc/inc/stream.h
edia/libstagefright/codecs/amrwbenc/inc/typedef.h
edia/libstagefright/codecs/amrwbenc/inc/typedefs.h
edia/libstagefright/codecs/amrwbenc/inc/wb_vad.h
edia/libstagefright/codecs/amrwbenc/inc/wb_vad_c.h
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
edia/libstagefright/codecs/amrwbenc/src/autocorr.c
edia/libstagefright/codecs/amrwbenc/src/az_isp.c
edia/libstagefright/codecs/amrwbenc/src/bits.c
edia/libstagefright/codecs/amrwbenc/src/c2t64fx.c
edia/libstagefright/codecs/amrwbenc/src/c4t64fx.c
edia/libstagefright/codecs/amrwbenc/src/cmnMemory.c
edia/libstagefright/codecs/amrwbenc/src/convolve.c
edia/libstagefright/codecs/amrwbenc/src/cor_h_x.c
edia/libstagefright/codecs/amrwbenc/src/decim54.c
edia/libstagefright/codecs/amrwbenc/src/deemph.c
edia/libstagefright/codecs/amrwbenc/src/dtx.c
edia/libstagefright/codecs/amrwbenc/src/g_pitch.c
edia/libstagefright/codecs/amrwbenc/src/gpclip.c
edia/libstagefright/codecs/amrwbenc/src/homing.c
edia/libstagefright/codecs/amrwbenc/src/hp400.c
edia/libstagefright/codecs/amrwbenc/src/hp50.c
edia/libstagefright/codecs/amrwbenc/src/hp6k.c
edia/libstagefright/codecs/amrwbenc/src/hp_wsp.c
edia/libstagefright/codecs/amrwbenc/src/int_lpc.c
edia/libstagefright/codecs/amrwbenc/src/isp_az.c
edia/libstagefright/codecs/amrwbenc/src/isp_isf.c
edia/libstagefright/codecs/amrwbenc/src/lag_wind.c
edia/libstagefright/codecs/amrwbenc/src/levinson.c
edia/libstagefright/codecs/amrwbenc/src/log2.c
edia/libstagefright/codecs/amrwbenc/src/lp_dec2.c
edia/libstagefright/codecs/amrwbenc/src/math_op.c
edia/libstagefright/codecs/amrwbenc/src/oper_32b.c
edia/libstagefright/codecs/amrwbenc/src/p_med_ol.c
edia/libstagefright/codecs/amrwbenc/src/pit_shrp.c
edia/libstagefright/codecs/amrwbenc/src/pitch_f4.c
edia/libstagefright/codecs/amrwbenc/src/pred_lt4.c
edia/libstagefright/codecs/amrwbenc/src/preemph.c
edia/libstagefright/codecs/amrwbenc/src/q_gain2.c
edia/libstagefright/codecs/amrwbenc/src/q_pulse.c
edia/libstagefright/codecs/amrwbenc/src/qisf_ns.c
edia/libstagefright/codecs/amrwbenc/src/qpisf_2s.c
edia/libstagefright/codecs/amrwbenc/src/random.c
edia/libstagefright/codecs/amrwbenc/src/residu.c
edia/libstagefright/codecs/amrwbenc/src/scale.c
edia/libstagefright/codecs/amrwbenc/src/stream.c
edia/libstagefright/codecs/amrwbenc/src/syn_filt.c
edia/libstagefright/codecs/amrwbenc/src/updt_tar.c
edia/libstagefright/codecs/amrwbenc/src/util.c
edia/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
edia/libstagefright/codecs/amrwbenc/src/voicefac.c
edia/libstagefright/codecs/amrwbenc/src/wb_vad.c
edia/libstagefright/codecs/amrwbenc/src/weight_a.c
edia/libstagefright/codecs/common/Config.mk
edia/libstagefright/codecs/common/cmnMemory.c
edia/libstagefright/codecs/common/include/cmnMemory.h
edia/libstagefright/codecs/common/include/voAAC.h
edia/libstagefright/codecs/common/include/voAMRWB.h
edia/libstagefright/codecs/common/include/voAudio.h
edia/libstagefright/codecs/common/include/voIndex.h
edia/libstagefright/codecs/common/include/voType.h
|
| a4ec6711259414cccf6da6b9a0c60fc4817992f0 |
20-May-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with honeycomb-mr1-release
Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95
|
| bcc59ca170cc438d0b8adc676bd668bf133a8cd7 |
20-May-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with honeycomb-release
Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f
|
| 883d7c1b80e5533807fa5351fd640eea6d358d96 |
20-May-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with honeycomb-release
Change-Id: Ibbe91b2c58ef41c449cb4b125b4b6e4034a71ed5
|
| 7d75e3c8a3de6263deb803f92717e8a8794fbe27 |
20-May-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile with gingerbread-release
Change-Id: If7c568d850eaffbcfc237e8b875bc5684c6dc651
|
| 8294aac281863e584027c3f2c7d2007c4140bf24 |
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.
|
| cb83fae8b1f07cb0c8fe9433ae00b56ce7c6a6e3 |
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.
|
| ff2e0968976f26612b34f7a88e6e1e4ed1cd277b |
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.
|
| fa6efe7757a41f7125fc49312230283b63618111 |
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
edia/libstagefright/NuHTTPDataSource.cpp
|
| b127de057abe04876d18db3d371854035a395c58 |
20-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"
|
| a03838331660ca2c0aa8283a7c00ef607db0cfee |
19-May-2011 |
James Dong <jdong@google.com> |
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuHTTPDataSource.h
|
| e39350924f4e743ec04cc9640526e06990c8cbda |
19-May-2011 |
James Dong <jdong@google.com> |
resolved conflicts for merge of a8939e0d to master
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
|
| cfb0efbe5d517ad94e88c7b65884ae14c790c1ac |
19-May-2011 |
Gloria Wang <gwang@google.com> |
am 8d161fe1: (-s ours) am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '8d161fe1eafe80e01d84d2be55ae47314f944721':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
|
| e9ca6fe963ae271f38eb01a5d2246ff4fbb9afdc |
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
|
| 5348dc86f3ac3cebebcda271cf990dbcc87f5a7f |
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
|
| 5a4e4804aa5340a4cf7ef4250d31fd901f53ddb2 |
19-May-2011 |
James Dong <jdong@google.com> |
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
|
| d269313a492de87326ad4acdb0f1187bc4400285 |
18-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Properly forward rotation information from input format to output format."
|
| b5746d9058c3e81a195f82f5345e1ffe0a26c0b2 |
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
edia/libstagefright/OMXCodec.cpp
|
| a07896f465f1d38f330584b762efa6090ecbdc6e |
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:
|
| fdce3778fbb3dd91ebc4d5fff9fd85fe8991d049 |
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:
|
| 3a0c5e310103946115dc28fa22d23e236ff0213f |
18-May-2011 |
Gloria Wang <gwang@google.com> |
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
|
| 0b3c6b19b15fc8cab922b1b4d58a51b424c425b3 |
18-May-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Add auto-white balance locking to the Camera API."
|
| e55147f462e04d41bff7ead6e9ea61a5b83bda4b |
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
edia/libstagefright/codecs/amrnb/enc/src/set_sign.cpp
|
| 773f457645786b139fa8fe180ef27e78ad7ab2f9 |
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
edia/libstagefright/codecs/amrnb/common/src/az_lsp.cpp
|
| 2cf9c5073ca3342ee52673ad68763fadd2c2be79 |
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
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MetaData.cpp
|
| 07ec01904613a0bac32caaa8444b4690998faed7 |
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
nclude/media/mediarecorder.h
edia/libstagefright/MPEG4Writer.cpp
|
| fd99e1dda6a46ac3312cacb3bc1b633b2df95df2 |
13-May-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Add auto-white balance locking to the Camera API.
Adds a new camera parameter for locking auto-white balance to its
current value. Also adds a function for checking if auto-white balance
lock is supported by the current platform. Lock semantics match that
of the auto-exposure lock.
Hidden for now.
Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| dc449831cf73a7f1c0f242d1ba655dbeca01e8f7 |
17-May-2011 |
Andreas Huber <andih@google.com> |
am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit 'c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
|
| 967ad6eb256c525e39d339a24f1bfc970f47470d |
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
|
| 44ade918fd2e82db86a2f0aeb49229950e78822b |
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
|
| 70361bfe567cc86343126a7ca2f92cb109711aa0 |
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
|
| 58fb39120c633e3b8aa31b8f0a78e8efc193d59d |
17-May-2011 |
Andreas Huber <andih@google.com> |
Claim support for .3gpp2 A/B files.
Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8
related-to-bug: 4406745
edia/libstagefright/MPEG4Extractor.cpp
|
| 3778838eee9470825bea7e5bad376f1dc9a94392 |
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
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 3d0de325381b66880626357f6b68ea09da0a9dda |
17-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Instead of using an RGB surface and conversion yuv420->rgb565"
|
| 4bbaa8808ebc6ebe6488210f2cef70c18eb06028 |
16-May-2011 |
Mike Lockwood <lockwood@android.com> |
resolved conflicts for merge of b107f4de to master
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
|
| 868495a086b7b9ee9c23c3d32884a857509d2cf2 |
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
|
| 9e9bcb2c0c8e28291775138344cc687b3e6e92ef |
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
|
| 7efab4282a7179b2f53a3dbccee3e70d7fce6a7f |
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>
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
|
| a4a1d9b8e4e218b75ffa2d5e155d1f9fbf008877 |
16-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix module tags on stagefright software decoders."
|
| a920660c2ae1548471c40c664ed3ac01b87c57b6 |
16-May-2011 |
Andreas Huber <andih@google.com> |
Fix module tags on stagefright software decoders.
Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb
related-to-bug: 4427361
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/avc/dec/Android.mk
edia/libstagefright/codecs/g711/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/Android.mk
edia/libstagefright/codecs/mp3dec/Android.mk
edia/libstagefright/codecs/on2/dec/Android.mk
edia/libstagefright/codecs/vorbis/dec/Android.mk
|
| 86b7f47aa7482424cf8fd248f1315311919be3b0 |
10-May-2011 |
James Dong <jdong@google.com> |
Support platform and camera dependent recording start time offset
related-to-bug: 4390777
Change-Id: Icb52973ad4ac716f04fb103ef527915a966d06d5
nclude/media/stagefright/MPEG4Writer.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/MPEG4Writer.cpp
|
| 9b1e4f1a18ac2489e24b4272a0a7ccfd0018efcc |
14-May-2011 |
James Dong <jdong@google.com> |
Merge "Add support for platform-specific recording start time offset"
|
| 07b1bb529a1ae76c46a71b01338c166f9490629d |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/MPEG4Writer.cpp
|
| 2352f4854a5cbfb4ba180f1c19f3e9a3b2315327 |
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
nclude/drm/drm_framework_common.h
nclude/media/stagefright/MediaErrors.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
|
| b5212db69734962f55e1493d3e696794172ced51 |
13-May-2011 |
James Dong <jdong@google.com> |
Track id really starts with 1, not 0
Change-Id: I55dcfdc2dc2a64285dfa93024f7b885210cc827e
edia/libstagefright/MPEG4Writer.cpp
|
| 825315658910c47b10d415d01fa5a0416fa0df89 |
13-May-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 6b25afcd9df2f1f0cc3ae03bf133f75464910560 |
13-May-2011 |
Gloria Wang <gwang@google.com> |
Merge "Add one more DRM error code. For bug 4422428."
|
| 5c26937264d9748a3db2a554c188e517523aa31a |
13-May-2011 |
Gloria Wang <gwang@google.com> |
Add one more DRM error code. For bug 4422428.
Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6
nclude/drm/drm_framework_common.h
nclude/media/stagefright/MediaErrors.h
|
| cd45ccddb00662f2af8409b895fbcdd0434da8b1 |
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
edia/libstagefright/chromium_http/support.cpp
edia/libstagefright/chromium_http/support.h
|
| 6708b9a3fb654f5623ba5a696288fdba310a5e1a |
13-May-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix audio effect framework issues"
|
| b469b9490b3cd9e0f0466d9b9ab228f6c793b82e |
09-May-2011 |
Eric Laurent <elaurent@google.com> |
Fix audio effect framework issues
Fix two issues in audio effect framework reported by partners.
1 - Fixed duplicated audio buffer sent to effect process function when
pausing a track.
Modified Effectchain::process_l() function to clear the effect chain
input buffer before calling the effect process functions when no track
is active on the session. Previous code was clearing the buffer after
calling the process functions and when transitioning from active
to inactive, the last processed buffer was passed again once to effect
process function before being cleared.
2 - Fixed potential mutex cross deadlock when disconnecting an effect
while playback is active. This is because EffectChain::process_l()
was calling PlaybackThread::hasAudioSession() thus creating an inversion
in the mutex lock order (EffectChain mutex locked before ThreadBase mutex).
The fix consists in removing the call to hasAudioSession() from process_l()
and requires each effect chain to keep count of the number of audio tracks
attached to it (previously only the active tracks were accounted for).
Change-Id: Iee4246694ea8c7a66c012120c629d72dd38f9c35
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 86e152e70a1aab83cba2c75c76d7c0e2d00b61dc |
13-May-2011 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from honeycomb-plus-aosp
Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b
|
| 5149f107b6556b48aa6260dc413459b0aaeaac39 |
13-May-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."
* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
Tweak audio APIs for better forward/backward/sideways compatibility.
|
| 64760240f931714858a59c1579f07264d7182ba2 |
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>
mds/stagefright/audioloop.cpp
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/MediaRecorderBase.h
nclude/media/stagefright/AudioSource.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| b84d042a1216694e1db6b1fc2b053d348cab5593 |
12-May-2011 |
Andreas Huber <andih@google.com> |
Merge "A fix to the MPEG4Extractor to support 16-bit sample sizes."
|
| 9f753df58a70f20db220af31cb202bbd21b30f36 |
12-May-2011 |
Andreas Huber <andih@google.com> |
A fix to the MPEG4Extractor to support 16-bit sample sizes.
Change-Id: Ic531f1ff0dd171f6f14aaad56aacbf3952a3aeae
edia/libstagefright/SampleTable.cpp
|
| 00f4951088805442e86ff9c2a20ddad79fc2410a |
11-May-2011 |
Andreas Huber <andih@google.com> |
The decoder wrapper is no longer needed. Also disable building old-style decoders.
Change-Id: Ie022f1a6dffe619c1b0385aa13f63e097282cfe4
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/DecoderWrapper.cpp
edia/libmediaplayerservice/nuplayer/DecoderWrapper.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libstagefright/Android.mk
|
| ac0aafc3bc0043b37d21e9063f8589e19327946a |
12-May-2011 |
Jean-Baptiste Queru <jbq@google.com> |
Tweak audio APIs for better forward/backward/sideways compatibility.
Change-Id: I293e99107aed260db68edccad35cdc15ed88c1d3
nclude/media/EffectApi.h
ervices/audioflinger/AudioFlinger.cpp
|
| bbba88cb1bdc34705d1477208990a06904c022e7 |
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
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/openmax/OMX_Video.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacdec/SoftAAC.cpp
edia/libstagefright/codecs/aacdec/SoftAAC.h
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
edia/libstagefright/codecs/amrnb/dec/SoftAMR.h
edia/libstagefright/codecs/amrwb/AMRWBDecoder.cpp
edia/libstagefright/codecs/amrwb/src/mime_io.cpp
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder.h
edia/libstagefright/codecs/avc/dec/Android.mk
edia/libstagefright/codecs/avc/dec/SoftAVC.cpp
edia/libstagefright/codecs/avc/dec/SoftAVC.h
edia/libstagefright/codecs/g711/dec/Android.mk
edia/libstagefright/codecs/g711/dec/SoftG711.cpp
edia/libstagefright/codecs/g711/dec/SoftG711.h
edia/libstagefright/codecs/m4v_h263/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp
edia/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h
edia/libstagefright/codecs/mp3dec/Android.mk
edia/libstagefright/codecs/mp3dec/SoftMP3.cpp
edia/libstagefright/codecs/mp3dec/SoftMP3.h
edia/libstagefright/codecs/on2/dec/Android.mk
edia/libstagefright/codecs/on2/dec/SoftVPX.cpp
edia/libstagefright/codecs/on2/dec/SoftVPX.h
edia/libstagefright/codecs/vorbis/dec/Android.mk
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
edia/libstagefright/codecs/vorbis/dec/SoftVorbis.h
edia/libstagefright/include/SimpleSoftOMXComponent.h
edia/libstagefright/include/SoftOMXComponent.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMXMaster.cpp
edia/libstagefright/omx/OMXMaster.h
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/OMXPVCodecsPlugin.cpp
edia/libstagefright/omx/OMXPVCodecsPlugin.h
edia/libstagefright/omx/SimpleSoftOMXComponent.cpp
edia/libstagefright/omx/SoftOMXComponent.cpp
edia/libstagefright/omx/SoftOMXPlugin.cpp
edia/libstagefright/omx/SoftOMXPlugin.h
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| 272eb55a3855d8455bc0a12e5359d51f4010332a |
11-May-2011 |
Dima Zavin <dima@android.com> |
update for new audio.h header location
Change-Id: I593b91a84a603d8c7f51a83232cced5af4980baf
Signed-off-by: Dima Zavin <dima@android.com>
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
|
| 6e9fd1a24da7e9d7cabf0079a4291647154f8e39 |
11-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Leave the number of output buffers up to surface flinger and friends."
|
| 4f4bedbfcbd443c9d0041a1e353d558fe6900757 |
11-May-2011 |
Andreas Huber <andih@google.com> |
Leave the number of output buffers up to surface flinger and friends.
Change-Id: Iebb90f45793793aeb08d1cf9706e29a7cefae792
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| df659ac173b247b4ad440fb2979ff51ff45e0aa4 |
11-May-2011 |
Andreas Huber <andih@google.com> |
Make sure the ogg extractor returns appropriate error codes.
Change-Id: I36cbf58aa6fa9195e1cc052f91e1183f57069d03
edia/libstagefright/OggExtractor.cpp
|
| 681755fc0d0797506456f46a2a10555916d6be32 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/WVMExtractor.h
|
| c0dfc5b02d4179769bbdd25c10d430576ec09568 |
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
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 0f056290cb16763453f18bbef80cde673041dbbc |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| 70ccfd44c4bfe95ddecc2df6c3695efc48229d72 |
06-May-2011 |
James Dong <jdong@google.com> |
Add send session recording summary report to application
Change-Id: I9c63ddae432f0c93486c39776ed0a058a8649602
nclude/media/mediarecorder.h
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 4650ff0e86f9e815e3152a806a06c700418d071d |
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
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MetaData.cpp
|
| 43ec1dfc5dc3934680a52a026c5519ddc51bdbd3 |
06-May-2011 |
James Dong <jdong@google.com> |
Add end of recording summary track info
Change-Id: I2fcf589e70db225776ef7c8d0f28505ceb824c45
related-to-bug: 1854633
nclude/media/mediarecorder.h
edia/libstagefright/MPEG4Writer.cpp
|
| ae8149b8f534f319b0f0059673bcb60b88ef9f84 |
09-May-2011 |
James Dong <jdong@google.com> |
Merge "Refactor MPEG4Writer::writeTrackHeader() method"
|
| 37f269cd7255c7f323d820a2d8a3edcf0f458078 |
09-May-2011 |
The Android Automerger <android-build@android.com> |
am bdaa3abd: (-s ours) am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit 'bdaa3abdf264372f337cfa9236e53b1e3cfde525':
DO NOT MERGE Handle GET_POWER failures
DO NOT MERGE: Don't send pause again when coming back from full screen
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
DO NOT MERGE MTP: Implement GetThumb command
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
DO NOT MERGE Fix media scanner uri handling.
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
DO NOT MERGE MTP and media provider support for multiple storage devices:
DO NOT MERGE MountService: Fix running media scanner at boot.
DO NOT MERGE Fix deadlock in MountService
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
DO NOT MERGE MountService: Add support for multiple volumes
|
| b21c564ce47041f9dd3ab65e36fed57c4937a42d |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 77e827c40377da3a654a0b42b870b7733629a1ad |
09-May-2011 |
The Android Automerger <android-build@android.com> |
am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTE
* commit '44e39d608cfddcbf56123480123822f26f20f259':
DO NOT MERGE Handle GET_POWER failures
DO NOT MERGE: Don't send pause again when coming back from full screen
DO NOT MERGE MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
DO NOT MERGE MTP: Implement GetThumb command
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
DO NOT MERGE Fix media scanner uri handling.
DO NOT MERGE Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE"
DO NOT MERGE MTP and media provider support for multiple storage devices:
DO NOT MERGE MountService: Fix running media scanner at boot.
DO NOT MERGE Fix deadlock in MountService
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
DO NOT MERGE MountService: Add support for multiple volumes
|
| a060aa647ef0ebcc9d07c76af4b0a6c886a39d97 |
09-May-2011 |
The Android Automerger <android-build@android.com> |
Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTE
|
| 8f83a8f53ed652e9e910a60e46634a5f49cdc783 |
06-May-2011 |
Thomas Le Guevel <thomaslg@google.com> |
Merge "Fix for issue 4035003 Support for 64 bit datatype a. M4OSA_64BITS_SUPPORTED removed b. M4OSA_64BITS_NOT_SUPPORTED removed c. M4OSA_UInt64 removed d. M4OSA_Int64 removed e. M4OSA_INT32_FROM_INT32 removed f. M4OSA_TIME_FROM_INT32_UINT32 removed g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h"
|
| aa382f3637a68361989d5b70e3184bddcc472d3d |
23-Apr-2011 |
hongteng <hongteng@google.com> |
Fix for issue 4035003 Support for 64 bit datatype
a. M4OSA_64BITS_SUPPORTED removed
b. M4OSA_64BITS_NOT_SUPPORTED removed
c. M4OSA_UInt64 removed
d. M4OSA_Int64 removed
e. M4OSA_INT32_FROM_INT32 removed
f. M4OSA_TIME_FROM_INT32_UINT32 removed
g. clean-up all macro in M4OSA_Time.h, M4OSA_Types.h and osal/inc/M4OSA_FileCommon.h
Change-Id: I2b1751962945dcc668e995d05a57b66cd268642f
ibvideoeditor/osal/inc/M4OSA_FileCommon.h
ibvideoeditor/osal/inc/M4OSA_FileCommon_priv.h
ibvideoeditor/osal/inc/M4OSA_Time.h
ibvideoeditor/osal/inc/M4OSA_Types.h
ibvideoeditor/osal/src/M4OSA_CharStar.c
ibvideoeditor/osal/src/M4OSA_Clock.c
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/osal/src/M4OSA_FileReader.c
ibvideoeditor/osal/src/M4OSA_FileWriter.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
ibvideoeditor/vss/common/inc/M4DA_Types.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4AMRR_CoreReader.c
ibvideoeditor/vss/src/M4READER_Amr.c
ibvideoeditor/vss/src/M4READER_Pcm.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
|
| 5e97c8861ef81d07cf1e304c1c1bed09b84513d4 |
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
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| d7be5c5e812ad79d4838737a5e4dd81a8d776a0d |
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
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| 249c6a61f21bc90e25e4b77f18c98af1ac363e69 |
05-May-2011 |
Glenn Kasten <gkasten@google.com> |
HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead
Remove dead code from the days when Android ran in emulator.
Change-Id: Ibadbbde0538239ad9b2811a3a2e8f8a6d3b6389c
ervices/audioflinger/AudioFlinger.cpp
|
| 83e90762e0ce4470e5174ae3b38afdfca0b9e42f |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 593aebaedc4bfaa72c92a8ce470543b67838d86f |
04-May-2011 |
James Dong <jdong@google.com> |
Merge "Initial check-in for AACWriter"
|
| 760943b5e7a09b602aba04ec451e97662f48b0a4 |
21-Mar-2011 |
James Dong <jdong@google.com> |
Initial check-in for AACWriter
Change-Id: Ia21ca39a404484b2dda25c6101780d2ff11c4623
related-to-bug: 4211046
nclude/media/stagefright/AACWriter.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AACWriter.cpp
edia/libstagefright/Android.mk
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
|
| 4be6932bd94cd98ba2cfad863cef414727578435 |
04-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Signal an error if aac decoding fails early."
|
| 59633a1e0ae968a90367718fb21716c32d73af04 |
04-May-2011 |
Andreas Huber <andih@google.com> |
Signal an error if aac decoding fails early.
Change-Id: I8b886a7642aaf83fa008fefb38cb4f92267ca948
related-to-bug: 4272179
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| 37db3f9784eb05f21c1f230e540bebf46748139a |
04-May-2011 |
Mike Lockwood <lockwood@android.com> |
am 0faefb72: (-s ours) am 8b1c74f9: DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
* commit '0faefb72fb8917c9408f7b71c2bac5a9d5f264c2':
DO NOT MERGE MediaScanner: Fix bug in "no media" handling logic
|
| 60e3d60c5d80e77748f0e0ca8a32aa1a944f2a42 |
04-May-2011 |
Mike Lockwood <lockwood@android.com> |
am df889448: (-s ours) am a792c804: DO NOT MERGE MTP: Implement GetThumb command
* commit 'df8894486c246a8c4e47cc2b3547e9c173225f34':
DO NOT MERGE MTP: Implement GetThumb command
|
| a9f04dfadc63ac9777246eb09c4b8595a9b30492 |
04-May-2011 |
Mike Lockwood <lockwood@android.com> |
am af964a63: (-s ours) am af50821b: DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
* commit 'af964a632dafed7d56d1faf0427b9b9056346e20':
DO NOT MERGE MTP: Fix file descriptor leak in file editing extensions
|
| ef5fe9313511b963574a59b90fb5b5f82835b7fa |
04-May-2011 |
Mike Lockwood <lockwood@android.com> |
am eeaf48ca: (-s ours) am fdb50e6f: DO NOT MERGE MTP: Add extended operations to support in-place editing of files
* commit 'eeaf48ca8572b2fcb3fe05a22eb6759027924197':
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
|
| d65220ec1c44ffb8f5c98ef95620c916f9c873ee |
04-May-2011 |
Mike Lockwood <lockwood@android.com> |
am f6df5b41: (-s ours) am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
* commit 'f6df5b41e145ee996ca4f94bec014ab3e41f0b21':
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
|
| 07a8f7e262f4c2b9e3f04618f6e2576e0a1f5dda |
04-May-2011 |
Mike Lockwood <lockwood@android.com> |
am 21c0800f: (-s ours) am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:
* commit '21c0800f71c75d7bc38ca6dbc69fd8d10f175dcb':
DO NOT MERGE MTP and media provider support for multiple storage devices:
|
| 87ae62f327eb155a595ab6400e924667fd50a852 |
04-May-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix potential memory corruption in NuCachedSource2."
|
| 67802977b6f0aa8d6f14f85dadcf32a3cadb9c07 |
04-May-2011 |
Andreas Huber <andih@google.com> |
Fix potential memory corruption in NuCachedSource2.
Change-Id: Ia6bd2d4966287228a3ac1b067ee1f1ccad965dbb
related-to-bug: 4354845
edia/libstagefright/NuCachedSource2.cpp
|
| 82ac8bf2da940c4439786c346f739f4a496864ad |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 89dc0dffdcbf0999a854a9b1bbea8f56395cc209 |
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"
|
| 04c7502a33c1f4671dc7ee0ad53ef7951398a2ea |
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
|
| d2ca5614d246e0c345b76cafa04fc768cce77095 |
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
|
| 3e9987d831c579674060503bda735a9dc3dd35c1 |
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
|
| a4bad5dbff7c75a9d955c853b21677311c6f269d |
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
|
| 028eb85226e52ad642e05525755b2c8525fb900c |
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
|
| 0102f6915a235fc4c4840d424ca52ff62ed0fd4c |
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:
|
| 5781662e4b3aecac3701e948eaf315a6f05fed63 |
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>
edia/libmedia/MediaScanner.cpp
|
| 1daaaf28f75ebc7cf798a0c45392ab301a7527a7 |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 226914eaf531f4ec04d1283d4d054b7efbcd3a79 |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 6ff6131f4d020684aa5e75355ec70ccda5ef01c3 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpDebug.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/mtp.h
|
| d691679bdcd234bd908aea8c378e214e90d6eeb5 |
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>
nclude/media/mediascanner.h
edia/libmedia/MediaScanner.cpp
|
| be3814b79246b4fb410f710125735bdbf92b2f08 |
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>
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/mtp.h
|
| 3b9ba852fc80769afab1d9387a9642320a714063 |
04-May-2011 |
James Dong <jdong@google.com> |
Clean up background audio processing code
Change-Id: I6184e71cb0ccfdb1fc5f250bd7ecd4555efad482
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
|
| 1a65546a55d019335655464ad895361ba9f89252 |
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>
edia/libmedia/MediaScanner.cpp
|
| aeb65d45a93878bba361956b3f3280b36cc48e59 |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| c9ee8c2dd7d0860b41a3312bbf7ff390f5d0cf8e |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 4d9da14065fea7bca759f83c419ce10bd1195e83 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpDebug.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/mtp.h
|
| 462accab9dbcf8d1597de999328fa74337b3b88c |
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>
nclude/media/mediascanner.h
edia/libmedia/MediaScanner.cpp
|
| 0241cacb85dbac20b28036bbb8025dfd513e3753 |
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>
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/mtp.h
|
| 74d808e9a6ab4dee6f30790eda5bf67e493a8ea5 |
04-May-2011 |
Iliyan Malchev <malchev@google.com> |
Merge "android_native_buffer_t --> ANativeWindowBuffer"
|
| 7a1e3e81264189e23a1db2b174e1b5a5d4c7d1c3 |
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
nclude/media/mediametadataretriever.h
nclude/media/mediaplayer.h
nclude/media/stagefright/MediaDefs.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/TimedTextPlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/TimedTextPlayer.h
|
| 8ce2364512f7c32c824f5ec5719688830ba72427 |
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>
nclude/media/stagefright/HardwareAPI.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
ervices/camera/libcameraservice/CameraHardwareInterface.h
|
| 8951a97b1f8462c37e740ea5082eea0445d2c501 |
15-Apr-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/base: switch CameraService to a HAL module
This patch changes CameraService to load a camera HAL module, instead of
linking directly against a library that implements the CameraHardwareInterface
class.
CameraHardwareInterface no longer defines the API to the camera HAL. Instead,
this is now in HAL header hardware/camera.h. We keep CamerHardwareInterface as
a class local to CameraService, which wraps around the new HAL calls. In the
future, we may remove this class entirely and have CameraService call the HAL
methods directly.
Change-Id: I5c61ac40078fc0b50bbac5881a556fe6c8837641
Signed-off-by: Iliyan Malchev <malchev@google.com>
nclude/camera/CameraHardwareInterface.h
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 9e626526453f91999bdf3de4c2ec8e55c5d90511 |
15-Apr-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/base: include system/core header camera.h in Camera.h
We define struct CameraInfo in this camera/Camera.h, even though an identical
struct camera_info is defined in hardware/camera.h (but not in
hardware/camera_defs.h). We may not export struct definitions from the HAL
into headers which may find their way into the NDK.
This commit also renames FRAME_CALLBACK_FLAG_xxx to CAMERA_FRAME_CALLBACK_xxx.
Change-Id: I3e2ddd01d61bf5371ff2fc1a397995e0f1ee11f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
nclude/camera/Camera.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| b003895a249f1298c311f513bbb0bf96e3902ef4 |
01-May-2011 |
Iliyan Malchev <malchev@google.com> |
android_native_buffer_t --> ANativeWindowBuffer
Change-Id: Id43b27ed2d1b85488b731948d018da0c0fd0c50d
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.h
|
| 10d227074b5a67a2e738d72888ece4dd24537c66 |
03-May-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Add an auto-exposure lock feature to the Camera API."
|
| e6815bf8b4eaf9cc861e389cbebe3d7412698e9f |
03-May-2011 |
James Dong <jdong@google.com> |
Clean up VideoEditorSRC
o removed unused member variables
o removed pre-processor for FROYO, since we only made video editor available after HC.
o cleaned up the header includes
Change-Id: I101775cc384310d661a65485113ac1bc1f6cdf17
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
|
| 2dbef65fea1115c53edda5bd4b40c4f49c0d06dd |
03-May-2011 |
James Dong <jdong@google.com> |
Cleaned up dummy audio and video sources
o remove unused member variables
o replace a full loop with a memset
Change-Id: Ib482525a321c2a17dd188fba47b642c63ab811c3
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyAudioSource.h
ibvideoeditor/lvpp/DummyVideoSource.h
|
| e84b6c0d8b1c969975560726ca1cf87d5c676ad6 |
03-May-2011 |
James Dong <jdong@google.com> |
Fix a typo in filename "M4ChannelCoverter.c"
Change-Id: If7e3afa8ac10fc34e920a199fd31526ced0a2534
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/M4ChannelConverter.c
ibvideoeditor/vss/src/M4ChannelCoverter.c
|
| e0642859a0a12203807c7c2a996a3ea52a399cb3 |
03-May-2011 |
Mathias Agopian <mathias@google.com> |
Merge "remove last traces of copybit"
|
| 68178d6419df65d606d9105b3324260d38d7b02c |
03-May-2011 |
Mathias Agopian <mathias@google.com> |
remove last traces of copybit
Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
nclude/private/opengles/gl_context.h
|
| c777a8526a6517e5fbfa713651da280fd1bdd502 |
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>
edia/libmedia/MediaScanner.cpp
|
| 95fbf2cdccb127bae1f68827564b36290c8de2c3 |
15-Apr-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Add an auto-exposure lock feature to the Camera API.
Adds a new camera parameter for locking auto-exposure to its current
value. Also adds a function for checking if auto-exposure lock is
supported by the current platform.
Hidden for now.
Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| c9dedc4e1d0c8343ab1029cb601253826cd67c81 |
01-May-2011 |
James Dong <jdong@google.com> |
Separate preview player from AwesomePlayer and also video editor audio player from AudioPlayer
Change-Id: I436ac541df3e34ad16be95a50c96d7af67fa15e4
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/AudioPlayerBase.cpp
ibvideoeditor/lvpp/AudioPlayerBase.h
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewPlayerBase.cpp
ibvideoeditor/lvpp/PreviewPlayerBase.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.h
|
| d2b0088df550e3ddfa44dbdfd1cd9a79ff80a2de |
30-Apr-2011 |
Gloria Wang <gwang@google.com> |
Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947"
|
| a092c0a095ed3f49e367e2f132ddb27525fb0e57 |
30-Apr-2011 |
Gloria Wang <gwang@google.com> |
Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156."
|
| 7531d550878cc161a1de6da83ae5f28198892b18 |
30-Apr-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 42e87b4e5da8c71639d05d35832c9f5e9895a9ce |
30-Apr-2011 |
James Dong <jdong@google.com> |
am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit 'a1f6a09a86f4acd2147d4f1110eedc6643bbf80b':
Add avg bandwidth estimate every 2 seconds - do not merge.
|
| a1098d78a89ac4f2d57adb1d9dd9dad0f8424b3c |
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.
|
| 7ae9d02961c091dcd9765e094c1c4063cbdf34a4 |
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.
|
| 7340743ce30766af6334bbd9acf813eb66dd5a60 |
29-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156.
Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
nclude/drm/drm_framework_common.h
nclude/media/stagefright/MediaErrors.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
|
| 4f9e47f2c03ce36261c4717cd7e131d7940bb068 |
26-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add setParameter/getParameter to MediaPlayer API.
for bug 1982947
Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| acb62af8ccf493b38decd91d94eb18395b6f9461 |
26-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add setParameter/getParameter to MediaPlayer API
for bug 1982947
Change-Id: Ic32704367bdcf2ade3f035a164927e95c69af7fa
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
|
| d0675ede6de2249256d20271a19ccbf9f11745b8 |
29-Apr-2011 |
Mathias Agopian <mathias@google.com> |
get rid of dependency on copybit HAL module
Change-Id: Ia608099a2426c11a91d33063ba53c93e1eccb428
nclude/private/opengles/gl_context.h
|
| ae23aaee377578d9601db8d0acff66a4dd40920a |
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
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuHTTPDataSource.h
|
| 5d4478556299c656b5bb940e83277e01233ec015 |
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
|
| 5a61d2f277af3098fc10b2881babca16391362da |
20-Apr-2011 |
Dima Zavin <dima@android.com> |
audioflinger: don't do work in constructor, instead do it in onFirstRef
Change-Id: I22d9e01821816c3beb52b014330386c7fd2f0411
Signed-off-by: Dima Zavin <dima@android.com>
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 799a70e7028a4d714436c3a744a775acfbd31aae |
19-Apr-2011 |
Dima Zavin <dima@android.com> |
audioflinger: enumerate all the possible audio interfaces
Keep track of the primary interface that handles the master volume,
etc.
Change-Id: Ib0701fccff8d8783a99035a241ab7c8ec75c00ac
Signed-off-by: Dima Zavin <dima@android.com>
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 18a3dc66af68cbc0eba5c9e48e13b9e72e1af719 |
28-Apr-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix omx_tests to no longer refer to test files that are no longer available."
|
| a488c7daf91357611fcdbff7a32e5a73ec630070 |
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
edia/libstagefright/SampleTable.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| d7986dd2f979a6dce40af963816e58e8ec753de5 |
27-Apr-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| fce7a473248381cc83a01855f92581077d3c9ee2 |
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>
mds/stagefright/audioloop.cpp
nclude/media/AudioParameter.h
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/EffectApi.h
nclude/media/IAudioPolicyService.h
nclude/media/MediaPlayerInterface.h
nclude/media/MediaRecorderBase.h
nclude/media/mediarecorder.h
nclude/media/stagefright/AudioSource.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/Visualizer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AudioSource.cpp
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
ervices/camera/libcameraservice/CameraService.cpp
|
| 6a62b8747b0d0c05ed315d26612d61ca085f32b7 |
27-Apr-2011 |
Gloria Wang <gwang@google.com> |
am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
* commit 'd84df05490e8b102e81cca848f65c174398be1b6':
Add heartbeat error codes into MediaErrors.h
|
| 39898735d8eaf0b918f782c5f93aef2060e2e2d2 |
27-Apr-2011 |
Gloria Wang <gwang@google.com> |
am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
* commit '969749319ca17f6e0c6836303a78cc484df2539b':
Add heartbeat error codes into MediaErrors.h
|
| bbfa577c90d2c11b3b064fe51e9409a52a5cf418 |
27-Apr-2011 |
Gloria Wang <gwang@google.com> |
am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
Add heartbeat error codes into MediaErrors.h
|
| 6859837b0bdea82be855ab50bd69c5ac9b62acf2 |
06-Apr-2011 |
Dima Zavin <dima@android.com> |
libvideoeditor: convert to use new audio.h
Change-Id: I39726f6f6cd5aabbd91629f329876660b3d3cec2
Signed-off-by: Dima Zavin <dima@android.com>
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
|
| db5cb14318bb24cd6ea14ff7ceea0d5e1f83d903 |
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>
nclude/media/AudioParameter.h
nclude/media/AudioSystem.h
edia/libmedia/Android.mk
edia/libmedia/AudioParameter.cpp
edia/libmedia/AudioSystem.cpp
|
| 6b80e0be94d3f92ec4aa2b7cace816780d3f338d |
20-Apr-2011 |
Dima Zavin <dima@android.com> |
audioflinger: move legacy audio hw/policy out to libhardware_legacy
Change-Id: I4adcec73d3c08bcbe15bb19e1ba2ff18b195af45
Signed-off-by: Dima Zavin <dima@android.com>
ervices/audioflinger/A2dpAudioInterface.cpp
ervices/audioflinger/A2dpAudioInterface.h
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioDumpInterface.cpp
ervices/audioflinger/AudioDumpInterface.h
ervices/audioflinger/AudioHardwareGeneric.cpp
ervices/audioflinger/AudioHardwareGeneric.h
ervices/audioflinger/AudioHardwareInterface.cpp
ervices/audioflinger/AudioHardwareStub.cpp
ervices/audioflinger/AudioHardwareStub.h
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 84f64d2a48a267c6517df69dd757c1ead54db036 |
27-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add heartbeat error codes into MediaErrors.h
related-to-bug: 4322415
Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
nclude/media/stagefright/MediaErrors.h
|
| dab0bea38ab2c2d6b52907b7f5684834c4979251 |
26-Apr-2011 |
Eric Laurent <elaurent@google.com> |
am 48dca4de: am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
* commit '48dca4de70890d324b5830a58bb9fa273164151a':
Fix issue 4335692: HDMI media volume
|
| 5bfdfd1e7b4514c6f6143b6b97ef37013f6e53a9 |
26-Apr-2011 |
Eric Laurent <elaurent@google.com> |
am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume
* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
Fix issue 4335692: HDMI media volume
|
| d9046e0a29fb794a7f6fddaa248b814e7b253c42 |
26-Apr-2011 |
Eric Laurent <elaurent@google.com> |
am 223995dc: Fix issue 4335692: HDMI media volume
* commit '223995dcf28aca2399258951a59559a7ae318ceb':
Fix issue 4335692: HDMI media volume
|
| 2e40530f7cbb024b60c491f42dadb2597d4de07e |
26-Apr-2011 |
James Dong <jdong@google.com> |
Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
|
| 8a9ce255302b09c66cc2e60080ec57905ed0a2fe |
26-Apr-2011 |
James Dong <jdong@google.com> |
Merge "Fix memory leak from retrieval of getSupportedDrmInfo."
|
| 64000788211f4c7e78c80a4a155390d1316e1176 |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| c2015451476b6d7fff0f1ce70be3a5b76f5ea0eb |
26-Apr-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| c0502468a29aa2f2b3457e0e08c4a5650a70488d |
25-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Fix file descriptor leak in file editing extensions"
|
| c3f16e5620c090aeb75c0836572a8b913a4ef864 |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 023eeac54c428d78b755fa3c856f20d17abb8a40 |
25-Apr-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 4335692: HDMI media volume
Forced music stream volume to max when not muted and output device is HDMI.
Change-Id: Ibd287cea8ae1d3f36fea6651a113bd5cf2dbad13
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| f87d18a374f0275b1adb89a495931390f7407fd2 |
25-Apr-2011 |
James Dong <jdong@google.com> |
Merge "Return status code from invoke()"
|
| b5fe7f5346de1623331d784634cc10fa406771c4 |
25-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"
|
| 37c0cf28f7568e812743a97d502031e30545f565 |
25-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "Remove log spam"
|
| 7a7cd84151aa19d9e3ea8dfb068efe4ba5d9183f |
25-Apr-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Clarify the meaning of weight in the focus and metering area HAL."
|
| 44ada657945587d74e0404fd093da8027b9fdc55 |
21-Apr-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Clarify the meaning of weight in the focus and metering area HAL.
Weigh values must be less than 1000, but have no restriction on their
sum. Weights should be interpreted as per-pixel values, meaning larger
areas will have more influence over focus/metering than smaller areas
of the same weight.
Change-Id: I988b74f988ddba2ff0c49d078ff3174b47cbae18
nclude/camera/CameraParameters.h
|
| c5182e31b23dc381d21ef43b7f7d682ffc54bd79 |
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>
nclude/media/mediascanner.h
edia/libmedia/MediaScanner.cpp
|
| adfb5592622305090ad39dcc2b7df477736da2c6 |
24-Apr-2011 |
James Dong <jdong@google.com> |
Fix memory leak from retrieval of getSupportedDrmInfo.
Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
rm/drmserver/DrmManager.cpp
|
| 7c1bc4cb2260f666a2fba9e64bb9de95121f0b22 |
24-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
Remove log spam
Change-Id: I3182576158c7c0410c19036a580fd46c6ab079f9
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/libstagefright/XINGSeeker.cpp
|
| 99bc0510f9152fa88508a1ba1d2d158961fcefe0 |
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
edia/libstagefright/codecs/aacenc/src/bit_cnt.c
|
| f8c45a90a69cec5041f6fb11a7e31af646e43d25 |
23-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Add extended operations to support in-place editing of files"
|
| f3664ae9369a861ffbc2354e8e93e48983802062 |
05-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
stagefright aacenc/amrwbenc: Remove trailing whitespace
Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
edia/libstagefright/codecs/aacenc/SampleCode/Android.mk
edia/libstagefright/codecs/aacenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/aacenc/SampleCode/ms.mk
edia/libstagefright/codecs/aacenc/Tools/doit.mk
edia/libstagefright/codecs/aacenc/Tools/eclair.mk
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
edia/libstagefright/codecs/aacenc/basic_op/basicop2.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.h
edia/libstagefright/codecs/aacenc/basic_op/typedef.h
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
edia/libstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/aacenc/build/eclair/makefile
edia/libstagefright/codecs/aacenc/build/ms.mk
edia/libstagefright/codecs/aacenc/inc/aac_rom.h
edia/libstagefright/codecs/aacenc/inc/aacenc_core.h
edia/libstagefright/codecs/aacenc/inc/adj_thr.h
edia/libstagefright/codecs/aacenc/inc/adj_thr_data.h
edia/libstagefright/codecs/aacenc/inc/bitenc.h
edia/libstagefright/codecs/aacenc/inc/interface.h
edia/libstagefright/codecs/aacenc/inc/line_pe.h
edia/libstagefright/codecs/aacenc/inc/psy_const.h
edia/libstagefright/codecs/aacenc/inc/psy_main.h
edia/libstagefright/codecs/aacenc/inc/qc_main.h
edia/libstagefright/codecs/aacenc/inc/quantize.h
edia/libstagefright/codecs/aacenc/inc/sf_estim.h
edia/libstagefright/codecs/aacenc/inc/stat_bits.h
edia/libstagefright/codecs/aacenc/inc/tns_param.h
edia/libstagefright/codecs/aacenc/inc/transform.h
edia/libstagefright/codecs/aacenc/src/aac_rom.c
edia/libstagefright/codecs/aacenc/src/aacenc.c
edia/libstagefright/codecs/aacenc/src/aacenc_core.c
edia/libstagefright/codecs/aacenc/src/adj_thr.c
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
edia/libstagefright/codecs/aacenc/src/band_nrg.c
edia/libstagefright/codecs/aacenc/src/bit_cnt.c
edia/libstagefright/codecs/aacenc/src/bitbuffer.c
edia/libstagefright/codecs/aacenc/src/bitenc.c
edia/libstagefright/codecs/aacenc/src/block_switch.c
edia/libstagefright/codecs/aacenc/src/channel_map.c
edia/libstagefright/codecs/aacenc/src/dyn_bits.c
edia/libstagefright/codecs/aacenc/src/grp_data.c
edia/libstagefright/codecs/aacenc/src/interface.c
edia/libstagefright/codecs/aacenc/src/line_pe.c
edia/libstagefright/codecs/aacenc/src/memalign.c
edia/libstagefright/codecs/aacenc/src/ms_stereo.c
edia/libstagefright/codecs/aacenc/src/pre_echo_control.c
edia/libstagefright/codecs/aacenc/src/psy_configuration.c
edia/libstagefright/codecs/aacenc/src/psy_main.c
edia/libstagefright/codecs/aacenc/src/qc_main.c
edia/libstagefright/codecs/aacenc/src/quantize.c
edia/libstagefright/codecs/aacenc/src/sf_estim.c
edia/libstagefright/codecs/aacenc/src/stat_bits.c
edia/libstagefright/codecs/aacenc/src/tns.c
edia/libstagefright/codecs/aacenc/src/transform.c
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
edia/libstagefright/codecs/amrwbenc/SampleCode/Android.mk
edia/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/amrwbenc/SampleCode/ms.mk
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ms.mk
edia/libstagefright/codecs/amrwbenc/inc/basic_op.h
edia/libstagefright/codecs/amrwbenc/inc/homing.tab
edia/libstagefright/codecs/amrwbenc/inc/isp_isf.tab
edia/libstagefright/codecs/amrwbenc/inc/log2.h
edia/libstagefright/codecs/amrwbenc/inc/mime_io.tab
edia/libstagefright/codecs/amrwbenc/inc/stream.h
edia/libstagefright/codecs/amrwbenc/inc/typedef.h
edia/libstagefright/codecs/amrwbenc/inc/typedefs.h
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
edia/libstagefright/codecs/amrwbenc/src/autocorr.c
edia/libstagefright/codecs/amrwbenc/src/az_isp.c
edia/libstagefright/codecs/amrwbenc/src/bits.c
edia/libstagefright/codecs/amrwbenc/src/c2t64fx.c
edia/libstagefright/codecs/amrwbenc/src/c4t64fx.c
edia/libstagefright/codecs/amrwbenc/src/convolve.c
edia/libstagefright/codecs/amrwbenc/src/cor_h_x.c
edia/libstagefright/codecs/amrwbenc/src/decim54.c
edia/libstagefright/codecs/amrwbenc/src/deemph.c
edia/libstagefright/codecs/amrwbenc/src/dtx.c
edia/libstagefright/codecs/amrwbenc/src/g_pitch.c
edia/libstagefright/codecs/amrwbenc/src/gpclip.c
edia/libstagefright/codecs/amrwbenc/src/hp400.c
edia/libstagefright/codecs/amrwbenc/src/hp50.c
edia/libstagefright/codecs/amrwbenc/src/hp6k.c
edia/libstagefright/codecs/amrwbenc/src/hp_wsp.c
edia/libstagefright/codecs/amrwbenc/src/int_lpc.c
edia/libstagefright/codecs/amrwbenc/src/isp_az.c
edia/libstagefright/codecs/amrwbenc/src/isp_isf.c
edia/libstagefright/codecs/amrwbenc/src/levinson.c
edia/libstagefright/codecs/amrwbenc/src/log2.c
edia/libstagefright/codecs/amrwbenc/src/lp_dec2.c
edia/libstagefright/codecs/amrwbenc/src/math_op.c
edia/libstagefright/codecs/amrwbenc/src/mem_align.c
edia/libstagefright/codecs/amrwbenc/src/p_med_ol.c
edia/libstagefright/codecs/amrwbenc/src/pitch_f4.c
edia/libstagefright/codecs/amrwbenc/src/pred_lt4.c
edia/libstagefright/codecs/amrwbenc/src/preemph.c
edia/libstagefright/codecs/amrwbenc/src/q_gain2.c
edia/libstagefright/codecs/amrwbenc/src/q_pulse.c
edia/libstagefright/codecs/amrwbenc/src/qisf_ns.c
edia/libstagefright/codecs/amrwbenc/src/qpisf_2s.c
edia/libstagefright/codecs/amrwbenc/src/residu.c
edia/libstagefright/codecs/amrwbenc/src/scale.c
edia/libstagefright/codecs/amrwbenc/src/stream.c
edia/libstagefright/codecs/amrwbenc/src/syn_filt.c
edia/libstagefright/codecs/amrwbenc/src/updt_tar.c
edia/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
edia/libstagefright/codecs/amrwbenc/src/voicefac.c
edia/libstagefright/codecs/amrwbenc/src/wb_vad.c
edia/libstagefright/codecs/amrwbenc/src/weight_a.c
edia/libstagefright/codecs/common/Config.mk
edia/libstagefright/codecs/common/include/voAMRWB.h
edia/libstagefright/codecs/common/include/voAudio.h
edia/libstagefright/codecs/common/include/voIndex.h
|
| 41050cdb033641ddf26831d9272c0930f7b40a2d |
22-Apr-2011 |
Mans Rullgard <mans@mansr.com> |
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
edia/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
edia/libstagefright/codecs/aacenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/aacenc/SampleCode/ms.mk
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
edia/libstagefright/codecs/aacenc/basic_op/basicop2.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.h
edia/libstagefright/codecs/aacenc/basic_op/typedef.h
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
edia/libstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/aacenc/build/ms.mk
edia/libstagefright/codecs/aacenc/inc/aac_rom.h
edia/libstagefright/codecs/aacenc/inc/aacenc_core.h
edia/libstagefright/codecs/aacenc/inc/adj_thr.h
edia/libstagefright/codecs/aacenc/inc/adj_thr_data.h
edia/libstagefright/codecs/aacenc/inc/band_nrg.h
edia/libstagefright/codecs/aacenc/inc/bit_cnt.h
edia/libstagefright/codecs/aacenc/inc/bitbuffer.h
edia/libstagefright/codecs/aacenc/inc/bitenc.h
edia/libstagefright/codecs/aacenc/inc/block_switch.h
edia/libstagefright/codecs/aacenc/inc/channel_map.h
edia/libstagefright/codecs/aacenc/inc/config.h
edia/libstagefright/codecs/aacenc/inc/dyn_bits.h
edia/libstagefright/codecs/aacenc/inc/grp_data.h
edia/libstagefright/codecs/aacenc/inc/interface.h
edia/libstagefright/codecs/aacenc/inc/line_pe.h
edia/libstagefright/codecs/aacenc/inc/memalign.h
edia/libstagefright/codecs/aacenc/inc/ms_stereo.h
edia/libstagefright/codecs/aacenc/inc/pre_echo_control.h
edia/libstagefright/codecs/aacenc/inc/psy_configuration.h
edia/libstagefright/codecs/aacenc/inc/psy_const.h
edia/libstagefright/codecs/aacenc/inc/psy_data.h
edia/libstagefright/codecs/aacenc/inc/psy_main.h
edia/libstagefright/codecs/aacenc/inc/qc_data.h
edia/libstagefright/codecs/aacenc/inc/qc_main.h
edia/libstagefright/codecs/aacenc/inc/quantize.h
edia/libstagefright/codecs/aacenc/inc/sf_estim.h
edia/libstagefright/codecs/aacenc/inc/spreading.h
edia/libstagefright/codecs/aacenc/inc/stat_bits.h
edia/libstagefright/codecs/aacenc/inc/tns.h
edia/libstagefright/codecs/aacenc/inc/tns_func.h
edia/libstagefright/codecs/aacenc/inc/tns_param.h
edia/libstagefright/codecs/aacenc/inc/transform.h
edia/libstagefright/codecs/aacenc/src/aac_rom.c
edia/libstagefright/codecs/aacenc/src/aacenc.c
edia/libstagefright/codecs/aacenc/src/aacenc_core.c
edia/libstagefright/codecs/aacenc/src/adj_thr.c
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
edia/libstagefright/codecs/aacenc/src/band_nrg.c
edia/libstagefright/codecs/aacenc/src/bit_cnt.c
edia/libstagefright/codecs/aacenc/src/bitbuffer.c
edia/libstagefright/codecs/aacenc/src/bitenc.c
edia/libstagefright/codecs/aacenc/src/block_switch.c
edia/libstagefright/codecs/aacenc/src/channel_map.c
edia/libstagefright/codecs/aacenc/src/dyn_bits.c
edia/libstagefright/codecs/aacenc/src/grp_data.c
edia/libstagefright/codecs/aacenc/src/interface.c
edia/libstagefright/codecs/aacenc/src/line_pe.c
edia/libstagefright/codecs/aacenc/src/ms_stereo.c
edia/libstagefright/codecs/aacenc/src/pre_echo_control.c
edia/libstagefright/codecs/aacenc/src/psy_configuration.c
edia/libstagefright/codecs/aacenc/src/psy_main.c
edia/libstagefright/codecs/aacenc/src/qc_main.c
edia/libstagefright/codecs/aacenc/src/quantize.c
edia/libstagefright/codecs/aacenc/src/sf_estim.c
edia/libstagefright/codecs/aacenc/src/spreading.c
edia/libstagefright/codecs/aacenc/src/stat_bits.c
edia/libstagefright/codecs/aacenc/src/tns.c
edia/libstagefright/codecs/aacenc/src/transform.c
edia/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
edia/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/amrwbenc/SampleCode/ms.mk
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ms.mk
edia/libstagefright/codecs/amrwbenc/inc/acelp.h
edia/libstagefright/codecs/amrwbenc/inc/basic_op.h
edia/libstagefright/codecs/amrwbenc/inc/bits.h
edia/libstagefright/codecs/amrwbenc/inc/cnst.h
edia/libstagefright/codecs/amrwbenc/inc/cod_main.h
edia/libstagefright/codecs/amrwbenc/inc/dtx.h
edia/libstagefright/codecs/amrwbenc/inc/grid100.tab
edia/libstagefright/codecs/amrwbenc/inc/ham_wind.tab
edia/libstagefright/codecs/amrwbenc/inc/homing.tab
edia/libstagefright/codecs/amrwbenc/inc/isp_isf.tab
edia/libstagefright/codecs/amrwbenc/inc/lag_wind.tab
edia/libstagefright/codecs/amrwbenc/inc/log2.h
edia/libstagefright/codecs/amrwbenc/inc/log2_tab.h
edia/libstagefright/codecs/amrwbenc/inc/main.h
edia/libstagefright/codecs/amrwbenc/inc/math_op.h
edia/libstagefright/codecs/amrwbenc/inc/mem_align.h
edia/libstagefright/codecs/amrwbenc/inc/mime_io.tab
edia/libstagefright/codecs/amrwbenc/inc/oper_32b.h
edia/libstagefright/codecs/amrwbenc/inc/p_med_o.h
edia/libstagefright/codecs/amrwbenc/inc/p_med_ol.tab
edia/libstagefright/codecs/amrwbenc/inc/q_gain2.tab
edia/libstagefright/codecs/amrwbenc/inc/q_pulse.h
edia/libstagefright/codecs/amrwbenc/inc/qisf_ns.tab
edia/libstagefright/codecs/amrwbenc/inc/qpisf_2s.tab
edia/libstagefright/codecs/amrwbenc/inc/stream.h
edia/libstagefright/codecs/amrwbenc/inc/typedef.h
edia/libstagefright/codecs/amrwbenc/inc/typedefs.h
edia/libstagefright/codecs/amrwbenc/inc/wb_vad.h
edia/libstagefright/codecs/amrwbenc/inc/wb_vad_c.h
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
edia/libstagefright/codecs/amrwbenc/src/autocorr.c
edia/libstagefright/codecs/amrwbenc/src/az_isp.c
edia/libstagefright/codecs/amrwbenc/src/bits.c
edia/libstagefright/codecs/amrwbenc/src/c2t64fx.c
edia/libstagefright/codecs/amrwbenc/src/c4t64fx.c
edia/libstagefright/codecs/amrwbenc/src/cmnMemory.c
edia/libstagefright/codecs/amrwbenc/src/convolve.c
edia/libstagefright/codecs/amrwbenc/src/cor_h_x.c
edia/libstagefright/codecs/amrwbenc/src/decim54.c
edia/libstagefright/codecs/amrwbenc/src/deemph.c
edia/libstagefright/codecs/amrwbenc/src/dtx.c
edia/libstagefright/codecs/amrwbenc/src/g_pitch.c
edia/libstagefright/codecs/amrwbenc/src/gpclip.c
edia/libstagefright/codecs/amrwbenc/src/homing.c
edia/libstagefright/codecs/amrwbenc/src/hp400.c
edia/libstagefright/codecs/amrwbenc/src/hp50.c
edia/libstagefright/codecs/amrwbenc/src/hp6k.c
edia/libstagefright/codecs/amrwbenc/src/hp_wsp.c
edia/libstagefright/codecs/amrwbenc/src/int_lpc.c
edia/libstagefright/codecs/amrwbenc/src/isp_az.c
edia/libstagefright/codecs/amrwbenc/src/isp_isf.c
edia/libstagefright/codecs/amrwbenc/src/lag_wind.c
edia/libstagefright/codecs/amrwbenc/src/levinson.c
edia/libstagefright/codecs/amrwbenc/src/log2.c
edia/libstagefright/codecs/amrwbenc/src/lp_dec2.c
edia/libstagefright/codecs/amrwbenc/src/math_op.c
edia/libstagefright/codecs/amrwbenc/src/oper_32b.c
edia/libstagefright/codecs/amrwbenc/src/p_med_ol.c
edia/libstagefright/codecs/amrwbenc/src/pit_shrp.c
edia/libstagefright/codecs/amrwbenc/src/pitch_f4.c
edia/libstagefright/codecs/amrwbenc/src/pred_lt4.c
edia/libstagefright/codecs/amrwbenc/src/preemph.c
edia/libstagefright/codecs/amrwbenc/src/q_gain2.c
edia/libstagefright/codecs/amrwbenc/src/q_pulse.c
edia/libstagefright/codecs/amrwbenc/src/qisf_ns.c
edia/libstagefright/codecs/amrwbenc/src/qpisf_2s.c
edia/libstagefright/codecs/amrwbenc/src/random.c
edia/libstagefright/codecs/amrwbenc/src/residu.c
edia/libstagefright/codecs/amrwbenc/src/scale.c
edia/libstagefright/codecs/amrwbenc/src/stream.c
edia/libstagefright/codecs/amrwbenc/src/syn_filt.c
edia/libstagefright/codecs/amrwbenc/src/updt_tar.c
edia/libstagefright/codecs/amrwbenc/src/util.c
edia/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
edia/libstagefright/codecs/amrwbenc/src/voicefac.c
edia/libstagefright/codecs/amrwbenc/src/wb_vad.c
edia/libstagefright/codecs/amrwbenc/src/weight_a.c
edia/libstagefright/codecs/common/Config.mk
edia/libstagefright/codecs/common/cmnMemory.c
edia/libstagefright/codecs/common/include/cmnMemory.h
edia/libstagefright/codecs/common/include/voAAC.h
edia/libstagefright/codecs/common/include/voAMRWB.h
edia/libstagefright/codecs/common/include/voAudio.h
edia/libstagefright/codecs/common/include/voIndex.h
edia/libstagefright/codecs/common/include/voType.h
|
| 0a389ab70db304fb840e33f33781ecc0503eae3c |
22-Apr-2011 |
hongteng <hongteng@google.com> |
Fix for issue 3385135 "source code cleanup" engine part
- Removed below unused functions
a. M4PTO3GPP_RegisterExternalVideoEncoder
b. M4VSS3GPP_editRegisterExternalVideoDecoder
c. M4VSS3GPP_editRegisterExternalVideoEncoder
d. M4VSS3GPP_extractPictureRegisterExternalVideoDecoder
e. M4VSS3GPP_editRegisterExternalCodec
f. M4VSS3GPP_editSubscribeExternalCodecs
g. M4VSS3GPP_intSubscribeExternalCodecs
h. M4VSS3GPP_intClipRegisterExternalVideoDecoder
i. M4xVSS_RegisterExternalVideoDecoder
j. M4xVSS_RegisterExternalVideoEncoder
k. M4MCS_registerExternalVideoDecoder
l. M4MCS_registerExternalVideoEncoder
m. M4MCS_registerExternalAudioDecoder
n. M4MCS_registerExternalAudioEncoder
o. M4DECODER_EXTERNAL_getInterface
- Also remove small code associated with these functions and Remove below unsused src + header files
a. M4CLOCK.h
b. M4MDP_API.h
c. M4VD_EXTERNAL_Internal.h
d. M4VD_HW_API.h
e. M4VE_API.h
f. M4_Logo.h
g. M4VD_EXTERNAL_Interface.c
h. LV_Types.h
i. M4OSA_FileAccess.h
j. M4OSA_FileCache.h
k. M4OSA_FileExtra.h
l. M4OSA_FileReaderRam.h
m. M4OSA_FileWriterRam.h
n. M4OSA_String.h
o. M4OSA_String_priv.h
p. M4OSA_FileCache.c
q. M4OSA_FileExtra.c
r. M4OSA_FileReader_RAM.c
s. M4OSA_FileWriter_RAM.c
t. M4OSA_String.c
u. M4OSA_String_priv.c
Change-Id: I7271cbe92168e665a8e5b7afe7c7fe1c331eaa1e
ibvideoeditor/osal/inc/LV_Types.h
ibvideoeditor/osal/inc/M4OSA_FileAccess.h
ibvideoeditor/osal/inc/M4OSA_FileCache.h
ibvideoeditor/osal/inc/M4OSA_FileExtra.h
ibvideoeditor/osal/inc/M4OSA_FileReaderRam.h
ibvideoeditor/osal/inc/M4OSA_FileWriterRam.h
ibvideoeditor/osal/inc/M4OSA_String.h
ibvideoeditor/osal/inc/M4OSA_String_priv.h
ibvideoeditor/osal/src/M4OSA_FileCache.c
ibvideoeditor/osal/src/M4OSA_FileExtra.c
ibvideoeditor/osal/src/M4OSA_FileReader_RAM.c
ibvideoeditor/osal/src/M4OSA_FileWriter_RAM.c
ibvideoeditor/osal/src/M4OSA_String.c
ibvideoeditor/osal/src/M4OSA_String_priv.c
ibvideoeditor/vss/common/inc/M4CLOCK.h
ibvideoeditor/vss/common/inc/M4ENCODER_AudioCommon.h
ibvideoeditor/vss/common/inc/M4MDP_API.h
ibvideoeditor/vss/common/inc/M4VD_EXTERNAL_Interface.h
ibvideoeditor/vss/common/inc/M4VD_EXTERNAL_Internal.h
ibvideoeditor/vss/common/inc/M4VD_HW_API.h
ibvideoeditor/vss/common/inc/M4VE_API.h
ibvideoeditor/vss/common/inc/M4_Logo.h
ibvideoeditor/vss/inc/M4PTO3GPP_API.h
ibvideoeditor/vss/inc/M4PTO3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4VSS3GPP_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalFunctions.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4xVSS_API.h
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/mcs/inc/M4MCS_API.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/mcs/src/M4MCS_BitstreamParser.c
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/M4ChannelCoverter.c
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_Interface.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| 34fe252c89e33572d01fea981b58d7b115e76164 |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 3b25fdc4a33b53cfcf67315c2d42ad699b8cefe2 |
22-Apr-2011 |
hongteng <hongteng@google.com> |
Fix for issue 3385135 "source code cleanup" engine part
- remove commented code
- remove code under #if 0
- remove macro FILE_LOWER_CASE as it is not used
- remove macro #if 1
- remove TIMESCALE_BUG macro, and all code under this macro as it is not used
- remove following unused functions:
* M4MCS_getExifInfo
* M4MCS_registerAudioEncoderExtended
* M4MCS_registerVideoDecoderExtended
* M4MCS_registerAudioDecoderExtended
* M4MCS_registerVideoEncoderExtended
Change-Id: I8e2916d956af6d381ae1962fedc61a8b48f60ce2
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/osal/inc/M4OSA_Memory.h
ibvideoeditor/osal/src/LVOSA_FileReader_optim.c
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/osal/src/M4OSA_Thread.c
ibvideoeditor/osal/src/M4PSW_MemoryInterface.c
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/mcs/inc/M4MCS_API.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalFunctions.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4ChannelCoverter.c
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_Interface.c
ibvideoeditor/vss/src/M4VIFI_xVSS_RGB565toYUV420.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/M4VSS3GPP_Codecs.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
ibvideoeditor/vss/video_filters/src/M4VFL_transition.c
|
| 7d77dcfadd7fb637ed2c3aef5bb3990dd0a67dc0 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpDebug.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/mtp.h
|
| 88a90ab588f11d1ffaf08e178232359c6d8d03eb |
22-Apr-2011 |
Mathias Agopian <mathias@google.com> |
Merge "Get rid of the "pid" parameter from createSurface"
|
| 694816d7291f17364502ac5d3319684a0b180860 |
21-Apr-2011 |
Shyam Pallapothu <shyamp@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in engine part
Change-Id: I98f98691048a5afc6f691b0cc3cec92e458e8f44
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/osal/inc/LV_Macros.h
ibvideoeditor/osal/inc/LV_Types.h
ibvideoeditor/osal/inc/M4OSA_Memory.h
ibvideoeditor/osal/src/LVOSA_FileReader_optim.c
ibvideoeditor/osal/src/M4OSA_CharStar.c
ibvideoeditor/osal/src/M4OSA_FileCache.c
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/osal/src/M4OSA_FileExtra.c
ibvideoeditor/osal/src/M4OSA_FileReader_RAM.c
ibvideoeditor/osal/src/M4OSA_FileWriter_RAM.c
ibvideoeditor/osal/src/M4OSA_Mutex.c
ibvideoeditor/osal/src/M4OSA_Semaphore.c
ibvideoeditor/osal/src/M4OSA_String.c
ibvideoeditor/osal/src/M4OSA_String_priv.c
ibvideoeditor/osal/src/M4OSA_Thread.c
ibvideoeditor/osal/src/M4PSW_MemoryInterface.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Interface.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
ibvideoeditor/vss/common/inc/M4VD_Tools.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/mcs/src/M4MCS_Codecs.c
ibvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
ibvideoeditor/vss/src/M4AD_Null.c
ibvideoeditor/vss/src/M4AIR_API.c
ibvideoeditor/vss/src/M4AMRR_CoreReader.c
ibvideoeditor/vss/src/M4PCMR_CoreReader.c
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4READER_Amr.c
ibvideoeditor/vss/src/M4READER_Pcm.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_Interface.c
ibvideoeditor/vss/src/M4VD_Tools.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4VSS3GPP_Codecs.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/video_filters/src/M4VIFI_RGB565toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
|
| 32ed3f4dad00f8a65f7e6b38402c70d5341c57eb |
21-Apr-2011 |
Shyam Pallapothu <shyamp@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in engine part
Change-Id: I9e2e142bcdf3153c529b790e368caea4fdb65ac8
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/osal/inc/M4OSA_Memory.h
ibvideoeditor/osal/src/LVOSA_FileReader_optim.c
ibvideoeditor/osal/src/M4OSA_Thread.c
ibvideoeditor/osal/src/M4PSW_MemoryInterface.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/mcs/src/M4MCS_BitstreamParser.c
ibvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
ibvideoeditor/vss/src/M4AD_Null.c
ibvideoeditor/vss/src/M4AIR_API.c
ibvideoeditor/vss/src/M4PCMR_CoreReader.c
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
ibvideoeditor/vss/video_filters/src/M4VFL_transition.c
|
| 3f94f76134d1622936d662c81640724f095d5480 |
20-Apr-2011 |
Mathias Agopian <mathias@google.com> |
Get rid of the "pid" parameter from createSurface
Change-Id: I28635e3f803e6abe965d79998e305f54a202465d
mds/stagefright/sf2.cpp
mds/stagefright/stream.cpp
|
| ad0d9c9c39a24b7fbd94e935a5855c9025341929 |
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
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/LiveSession.h
|
| 7bf8413f91fc072452f315a91618aeef2574d420 |
19-Apr-2011 |
Andreas Huber <andih@google.com> |
Make sure a read restarts the prefetcher if necessary.
Change-Id: I87cac0e61e4dce7987ddf29c32f51e1672d1bbed
related-to-bug: 4286618
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| b158c54511bfb32999525bca9e19f1b438c0bef5 |
19-Apr-2011 |
Andreas Huber <andih@google.com> |
Merge "Remove streamability verification, it's taking too long. Also..."
|
| 6ed7e70da8272d5b53caa32a89fe2324eb94ac7c |
19-Apr-2011 |
Andreas Huber <andih@google.com> |
am 67dc13ed: (-s ours) am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '67dc13ed6764cd96194f57ee8221c88df551d040':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
|
| 7e0c6792de74ff647e3d3ec0eddab3bd57bb761c |
19-Apr-2011 |
Andreas Huber <andih@google.com> |
am 5ce9eb9a: (-s ours) am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit '5ce9eb9a34ffac3ff5aea0db81a902a380105d5b':
DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
|
| 859e0c839fc2bf1a1411d58c41f958474f87c836 |
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.
|
| 4678a6dc5f09008481524949a9667af5a6190374 |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/include/MPEG4Extractor.h
edia/libstagefright/include/SampleTable.h
|
| 972c502722d52cced15a0e4b5cb303ccf3f890ed |
15-Apr-2011 |
Anu Sundararajan <sanuradha@ti.com> |
Stagefright: Return error if codec takes too long to return a buffer.
There are many scenarios where the codec may not return a valid buffer.
In such a case, the OMXCodec::read() call hangs indefitely. Therefore,
wait() call is replaced with waitRelative() so that it timesout after a
few seconds and we exit gracefully.
Change-Id: Ie03c5d1e979b71f6253efcaa0665aa5e541cebe2
Signed-off-by: Anu Sundararajan <sanuradha@ti.com>
edia/libstagefright/OMXCodec.cpp
|
| 0a89d849bbf20ff1739f0799d54f1868f8abefbc |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| e2e3f479fe160e8ba00321ada2c61d4bcaf5be4d |
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."
|
| a72c75face5e57f6aebb43fa4d0ad731c44ed814 |
13-Apr-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 53e1c0497b720d0e4f00dd7ca61838b865d41add |
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
|
| 08c1e4a6c4de96ff4e164a0e09be241df130b7c0 |
13-Apr-2011 |
Glenn Kasten <gkasten@google.com> |
am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
Bug 4167061 remove debugging code
|
| 7613baa541233c0955d32c4f76731f6c1fb6f61f |
13-Apr-2011 |
Glenn Kasten <gkasten@google.com> |
am b0d6f10e: Bug 4167061 remove debugging code
* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
Bug 4167061 remove debugging code
|
| 6c00983982d167bdb348c437f0480a480f38696c |
13-Apr-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4167061 remove debugging code
Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
edia/libstagefright/AwesomePlayer.cpp
|
| b483c4724846c0b8d4e82afcbb7c17f671bae81c |
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
mds/stagefright/stream.cpp
nclude/media/IMediaPlayerClient.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| f796c349e095ca22d65dcc3cb146210417359b9d |
13-Apr-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add camera metering area API."
|
| 38ecadbeb09fc0504621f5aa513e51b7a204983f |
12-Apr-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add camera metering area API.
The API are still hidden.
bug:3475893
Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 947721ba962c19913b76658cdbb19ae8c77c9c50 |
12-Apr-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in engine part
Change-Id: I79efc956aa0d23fb333d12c8947b48455b7524d1
ibvideoeditor/osal/inc/M4OSA_CharStar.h
ibvideoeditor/osal/inc/M4OSA_Types.h
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/osal/src/M4OSA_CharStar.c
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/osal/src/M4OSA_Thread.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Interface.c
ibvideoeditor/vss/src/M4PCMR_CoreReader.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| c33b033d11b781719d7f8dd2a63a826f09bb3593 |
12-Apr-2011 |
Andreas Huber <andih@google.com> |
Merge "Experimental support for changing the video surface/texture on an active mediaplayer"
|
| 90fc6105cf504bf8e5eabc33a8d35b70a91795d2 |
12-Apr-2011 |
Andreas Huber <andih@google.com> |
Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
|
| 5820e52f9bf3c40839d33457975b6c9629ab1c79 |
12-Apr-2011 |
Brad Fitzpatrick <bradfitz@android.com> |
am 07c25b65: am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '07c25b651216daac884bd503c02b788418165b50':
audioflinger: Enable ARMv5TE optimized resampler
|
| 4d0243980123378e9dd69022bf4ddca729d84126 |
12-Apr-2011 |
Brad Fitzpatrick <bradfitz@android.com> |
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '4430670f48f75661293371dab8db55865f5f56e0':
audioflinger: Enable ARMv5TE optimized resampler
|
| b661326137b5329e714be57d4b9321c7410385c5 |
11-Apr-2011 |
James Dong <jdong@google.com> |
am 6f2b5d61: (-s ours) am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
* commit '6f2b5d614c13fb93f20697bce3bf73176828276d':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
|
| 17b32853e0bb44a7a34c436141ee26e1405243a9 |
11-Apr-2011 |
James Dong <jdong@google.com> |
am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
|
| fb50c0ba482dddfb030a2cff6874586949dc8ffe |
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)
|
| d33f435eeeef87f0544ff0e7711d32b876fd93d7 |
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)
|
| df485b44bc929c34cf2cc068efe74816540c64b7 |
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)
|
| 449d8ad81402c2758793db99850a4d390c191f4f |
11-Apr-2011 |
Glenn Kasten <gkasten@google.com> |
Enable HDCP debugging in Stagefright (1 of 2)
Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
edia/libstagefright/AwesomePlayer.cpp
|
| 21af757836167a328ddf1c0381909d53941528c4 |
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
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 79f84b521cc681dfd7ec7b1b0d5d832795085dc8 |
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."
|
| fa4e195a735ab99e02388ac5c5611e73a76c7c72 |
09-Apr-2011 |
Jamie Gennis <jgennis@google.com> |
am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
* commit '0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
Stagefright: authenticate ANativeWindow.
|
| d9d17fe260827f7a415f0de92f4aa4c271c34059 |
09-Apr-2011 |
Jamie Gennis <jgennis@google.com> |
am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
|
| f68c65b8d9864919950aa52774e8cf7b5d7563f4 |
09-Apr-2011 |
Jamie Gennis <jgennis@google.com> |
am 66380f76: Stagefright: authenticate ANativeWindow.
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
|
| d4d43b2ad0f715211feb48ce2f3e2158883583c0 |
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
edia/libstagefright/OMXCodec.cpp
|
| a1c3d37ef921bfc79a0f7d2ac7f897943134d48d |
02-Apr-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add camera focus area API.
The API are still hidden.
bug:3475893
Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 4cb2c4dc7af70684e81cfbce46cbcbb9e44f4dc4 |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| a9e05b911f978dc3f25d4b1e35e51383dc4f9fc7 |
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
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/include/MP3Extractor.h
|
| cc8ace7989f663fe6c6c1ed0febca0d9d1f19c7a |
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
edia/libmedia/AudioEffect.cpp
|
| 16bc76ae6b1ee053626695814742c807b42cbce6 |
07-Apr-2011 |
Brad Fitzpatrick <bradfitz@android.com> |
am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
audioflinger: Enable ARMv5TE optimized resampler
|
| 0c0a1c0c37dbd2646a732da706d6777283c83e44 |
06-Apr-2011 |
Jim Huang <jim.huang@linaro.org> |
audioflinger: Enable ARMv5TE optimized resampler
Previously, the optimized asm option is only enabled when
__ARM_ARCH_5E__ is defined, which is assigned in armv5te.mk
rather than armv7-a series targets. This patch checks the ARM CPU
feature about half-word multiply instructions to enable ARMv5TE
resampler optimization routines properly.
Change-Id: I4c5a5d8c932416f23bedb0b389db958349f21ea4
ervices/audioflinger/AudioResampler.cpp
|
| 040e4a14ef9cafd5d08d9a180e6237fb79687995 |
07-Apr-2011 |
James Dong <jdong@google.com> |
Return status code from invoke()
Change-Id: Ie64b418d2a1f44e07942399c285b460c68f8e14f
related-to-bug: 4199781
edia/libmedia/IMediaPlayer.cpp
|
| c30268b9d118309a0514bcf280a03ee69f81403f |
06-Apr-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Miscellaneous code cleanup in audio framework"
|
| 9d91771564c264903363d7879d052f2427b78aa0 |
06-Apr-2011 |
Mathias Agopian <mathias@google.com> |
Merge "remove more unused references to ISurface"
|
| ddc7e59ee4aa418b809e37d2bcbf169e205a6150 |
06-Apr-2011 |
Mathias Agopian <mathias@google.com> |
Merge "remove unused references to ISurface"
|
| 46bc5b885f9cb39502bc082c97e0c73b99083042 |
06-Apr-2011 |
Mathias Agopian <mathias@google.com> |
Merge "Remove unused references to ISurface"
|
| 4bcae82f9b07d1a39956c45a6f5bec0b696c4dd1 |
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
nclude/media/AudioSystem.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 8b1027d3f873fc15c70f8645f1856936b69241a4 |
06-Apr-2011 |
Mathias Agopian <mathias@google.com> |
remove more unused references to ISurface
Change-Id: I2201f1ca2bb8f203a081d94a0134f798778dfbef
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 6e2242974c109e85bac50550970fe84009c76f77 |
06-Apr-2011 |
Mathias Agopian <mathias@google.com> |
remove unused references to ISurface
Change-Id: Ia11c5f46f38c0b00ca63d19d3484bf4024cdb75d
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| 9d31d676f2c4b49735463ac0f4d6a67b7a4e9877 |
05-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP and media provider support for multiple storage devices:"
|
| 30adaaf9d6fd944c8f6a2c7a06774b019878c368 |
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
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/mtp.h
|
| 38ccae2c0324daa305f3fe77d25fdf5edec0b0e1 |
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
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| abf471f9d25f7a3104c5723657e3c6c329f3f08c |
05-Apr-2011 |
Mathias Agopian <mathias@google.com> |
Remove unused references to ISurface
Change-Id: I542806b5c91c525ed7cde821f6963f1e020ddf1a
nclude/media/IMediaPlayer.h
nclude/media/IOMX.h
nclude/media/MediaPlayerInterface.h
|
| 9a03bfb071e0969b14a1ead7c85a12bd3df564a1 |
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.
|
| 7fb4b427d5fca79c09d69b212ddca41539c215a2 |
04-Apr-2011 |
Andreas Huber <andih@google.com> |
Merge "This reverts an earlier change 4aeec2da39fce4de9b07b694d59fd308ffb3d491"
|
| 51c1e0e86a0ad95bf3d890a9a2f51e54b8ef9444 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AudioPlayer.cpp
|
| 838daafc9d267b3a72abe1eeb84971a41ebb2050 |
04-Apr-2011 |
Andreas Huber <andih@google.com> |
Bring videoeditor copies of internal code in sync with recent changes to the originals
Change-Id: Ie534360f9f1f7757c57cffabb0fa4b4903422ecb
related-to-bug: 4193552
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
|
| bd7b7177f88ae6e83bd7bb8bfd9b7018be923931 |
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
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
|
| 94baecca5e14b083c46615a1bcf18ea6cf7cad46 |
01-Apr-2011 |
Andreas Huber <andih@google.com> |
Merge "Remove legacy hack to only drop frames every other late frame"
|
| 2ba7ce928b0fa8917ee202836b0963ca58613453 |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 9f5d06840fe84103e6f3eaf8fa2c8cf5324ac532 |
01-Apr-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| dab59b5a4956b7e9b1ffc64a0676e7990579934e |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| b7006fcd08e263a8441f1030e5e39fd89dad0129 |
01-Apr-2011 |
Russell Brenner <russellbrenner@google.com> |
am 9e57a4df: am 7b445dd7: am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '9e57a4df48558f4d4c12a98b9720f7603803faca':
Added include/private/hwui/DrawGlInfo.h
|
| 758adad0c23b205f44680e4b3fe9b08b214a5c5b |
01-Apr-2011 |
Russell Brenner <russellbrenner@google.com> |
am 7b445dd7: am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '7b445dd7c0814a39eaf912fa1a871f00d5190550':
Added include/private/hwui/DrawGlInfo.h
|
| c0995cd91ef7392eea09729032bdb2e0e715b927 |
01-Apr-2011 |
Russell Brenner <russellbrenner@google.com> |
am 49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '49b49f8fb6d094768d4e093353b34271f2da1bfc':
Added include/private/hwui/DrawGlInfo.h
|
| f3e37706f07b410e83191dd19c04620f1d743bdf |
01-Apr-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| ba0de09f9a221f14e812e2b6498b48cf782c7396 |
31-Mar-2011 |
Russell Brenner <russellbrenner@google.com> |
Added include/private/hwui/DrawGlInfo.h
Change-Id: If50ccabb8761a994fa1f7aef4fbdb668c6160b0c
nclude/private/hwui/DrawGlInfo.h
|
| d5109dc76e943d4d2f90d1681dfd728011b2173f |
31-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am 69250839: am 4ed59de6: am ffa670b5: Bug 4167061
* commit '69250839bb0ae94305ee1ac9a452b98d67acc5cf':
Bug 4167061
|
| 650502b7f3a47fd85db72c1396d64ec9628821e1 |
31-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am ffa670b5: Bug 4167061
* commit 'ffa670b5b00b8b4c5a4296f9a1ac382c0e647894':
Bug 4167061
|
| 5b3635efd12466e957a59d93a9167c9a01e9c933 |
31-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4167061
Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
edia/libstagefright/AwesomePlayer.cpp
|
| db513feea83a4f76d8a6b492ff33d3d53247ac5e |
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
|
| 5c43188653b82a8b40bd25ded8b3b8c48d67e132 |
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.
|
| 90fd5e0eac8bde1a37023b9014c90062ea3cf360 |
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
edia/libstagefright/AudioSource.cpp
|
| ba7d7874192e9670e7a51e7e334732c96f27ab5d |
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
|
| cbd2ba4e5398e2c2ae71a1fce6bd6d6b1e395fd6 |
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
|
| 9dc0193472834c49e6bdc864fbeb145828f1d8aa |
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
edia/libstagefright/NuHTTPDataSource.cpp
|
| f8374dec590223ebdd6959b26d9ba90749dd8328 |
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
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/AVIExtractor.cpp
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/include/AVIExtractor.h
|
| 72bbbff2dfb120ed1ebc9a50e8509364508bfa70 |
30-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Stagefright DataSources now expose the underlying content mime type."
|
| 6511c9755c3a3360ba869772600c7aae048a7ffc |
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
nclude/media/stagefright/DataSource.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/chromium_http/support.cpp
edia/libstagefright/include/ChromiumHTTPDataSource.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| 70d3e260edcd42972864bf501337f0b1a187657d |
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
edia/libstagefright/WAVExtractor.cpp
|
| 62302d34b084c43b231f936be3c08f202d5c7c1a |
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.
|
| ff6bf33354f28a2bce073645bd102414c81d7580 |
29-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Add a user-agent header to our RTSP requests."
|
| e681b91c27439907f216cb6c88426929bc5194bf |
29-Mar-2011 |
Andreas Huber <andih@google.com> |
Add a user-agent header to our RTSP requests.
Change-Id: I02f8ff6a4a37fa59cc8c5fcfd3afb64ee11ba576
related-to-bug: 4173725
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
|
| a65818133df0a04a867423c50e7778bb225bfb52 |
29-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Adding support for the '.mxmf' MIDI file extension."
|
| 8d30cc86d36c5e2d7d8defab8f58faed4139ed7f |
29-Mar-2011 |
Andreas Huber <andih@google.com> |
Adding support for the '.mxmf' MIDI file extension.
Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
edia/libstagefright/StagefrightMediaScanner.cpp
|
| f8be8c0c8055ead961d23b969bf46315eb93e887 |
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
edia/libstagefright/foundation/ALooper.cpp
|
| 89c120e7adbe09c6283591789594c5e591aa5032 |
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| 51538b30da3208ecf498ce327ac3104b455f163d |
29-Mar-2011 |
Iliyan Malchev <malchev@google.com> |
Merge "frameworks/base: some camera-interface cleanup"
|
| 108dddf924d714c811dd565b8f4c7a0178cca2f2 |
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>
amera/Camera.cpp
amera/ICamera.cpp
nclude/camera/Camera.h
nclude/camera/CameraHardwareInterface.h
nclude/camera/ICamera.h
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 0c03d5c7c2fa4d17f7f5159e3fddd2adf6bfc923 |
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
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 7cfc79950ad230dba2a99b7935ae41945d458da6 |
28-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| b1d3d37c7990d22d0659e4c8c9aac56d4c09b6ea |
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.
|
| 3979f08f59ab2905510a439bae32b92ae21cfddf |
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.
|
| 98442ddd86ea33453c2db10cfbfc310ae49dce8f |
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
|
| d6861a682696f6f0db20db7ecb9b1b0482428df2 |
26-Mar-2011 |
The Android Automerger <android-build@android.com> |
keep previous history
|
| 000cca99e085be1aa46df44109b37a84af58e7c8 |
26-Mar-2011 |
Mathias Agopian <mathias@google.com> |
Merge "merge libsurfaceflinger_client into libgui"
|
| d9789f20d5a5c4117f79c8fd46fc57ca5c125775 |
26-Mar-2011 |
Mathias Agopian <mathias@google.com> |
replace libsurfaceflinger_client by libgui
Change-Id: I50b43cd8a75b8a013ad5f778708dfbc09c1d76d6
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| 5f7fcf29a7475a20cf38bf72da67746135d504c3 |
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
amera/Android.mk
mds/stagefright/Android.mk
edia/libmedia/Android.mk
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
ervices/camera/libcameraservice/Android.mk
ervices/camera/tests/CameraServiceTest/Android.mk
|
| fe9b71919cdddf898a516169db840751878098ca |
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
edia/libstagefright/AudioPlayer.cpp
|
| 06570ecee7cab4d89030ad89307882ac1f6570d1 |
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.
|
| 3a4d645d3bf0bcd3e75968a9d88245fa9a9e0a42 |
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.
|
| 5dac87b088556b8ed7f2a4f5546d31be0bb68680 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| f490e1765c44f63bde8e8acd905f36f92a840ddf |
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
|
| df4a70cf8858185323e5176bd3bed51f1b5cbc35 |
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
|
| 75ae0de858be5cddf60b70d3056e393aa12b224e |
25-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Switch to use SF cached source" into honeycomb-mr1
|
| 277360f06bdfefe821d4ddde8876f8e2507887c3 |
25-Mar-2011 |
Gloria Wang <gwang@google.com> |
am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
|
| 504c5e3fa3d4378773bd76b045d7a2e1e834fe59 |
25-Mar-2011 |
Gloria Wang <gwang@google.com> |
am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
|
| be682d9d9f570cc648952e99a7028add1db7e927 |
25-Mar-2011 |
The Android Automerger <android-build@android.com> |
keep previous history
|
| 3318523222e31fb4a7fcc345ddb4ec845d30ef96 |
25-Mar-2011 |
James Dong <jdong@google.com> |
Switch to use SF cached source
bug - 3500025
Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
edia/libstagefright/AwesomePlayer.cpp
|
| 25cd5788a70f45c807ad22aa0ecdc7e1d4d5fd67 |
24-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4126624.
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
rm/libdrmframework/DrmManagerClient.cpp
nclude/drm/DrmManagerClient.h
|
| 199b6924d11a48ca8383392e18ac0f2e58523f01 |
24-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 3c1c3d89: (-s ours) am 480edfb9: am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
* commit '3c1c3d898ca1ade5f8ef0f71ddb928af3a780276':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
|
| e3f51330a41df2382cf9dfe7fd31598a1aed9a5e |
24-Mar-2011 |
Gloria Wang <gwang@google.com> |
am e2cd3353: Merge "Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge." into honeycomb-mr1
* commit 'e2cd33531182b31e0ace2c3acb0e960fbf1ba273':
Fix for bug 4165823. Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge.
|
| 07d0220bcc9036bcbe36819912559267d9c1c538 |
24-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4165823.
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.
Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManagerClientImpl.h
|
| 745909e11d90a24d80b7e88d8ea17231db0260b6 |
24-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| a61e0f254f586d59c575e3087992889c0cf026cb |
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
|
| ee9f5eefb02bdef3120cd4c1053c505065fe9094 |
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
|
| eabd34665adc284525fe7337ad5c56a8b92964ef |
23-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4159373 Use HDCP debug settings
Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
edia/libstagefright/AwesomePlayer.cpp
|
| 63b14382480ca324015f076160869843a35b75c5 |
23-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 4fed58a760e4b3e7c3ba703d9e34406ad09dd469 |
23-Mar-2011 |
Carl Shapiro <cshapiro@google.com> |
Merge "Include strings.h for the strcasecmp prototype."
|
| d7c1648e99ca1ca9c4b941aeefccd2feb55a649f |
22-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Delay signaling the end of audio playback until all frames have actually played."
|
| 84b343f29063fbfa2ee61b2e3d37ba059ca507d4 |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 98d147d15f704b021e130c197258d0520d9ca7ae |
22-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Fix AAC encoder test util and remove files that are not needed"
|
| 27dcaafef982f4bf461ad013a3dae4c474908380 |
22-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Fix AMRWB test util and remove useless files"
|
| 21e7c33eaf8772819bf57fe9557885e4ebc43e1b |
22-Mar-2011 |
Carl Shapiro <cshapiro@google.com> |
Include strings.h for the strcasecmp prototype.
Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
rm/common/DrmSupportInfo.cpp
|
| d2abe6d4b4b5eee7aef725e4fa3a39807ba6dd57 |
22-Mar-2011 |
Raghavender Palla <rpalla@google.com> |
am 2d449791: Fix for the issue: TestPreviewWithTransition fails (4133108)
* commit '2d44979102ca85d5c4ee68d0388ee2fe37c4ec1a':
Fix for the issue: TestPreviewWithTransition fails (4133108)
|
| 0b500c2e81288190a6ce8b20c842a83a19e038b5 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
Add one more field in DecryptHandle to support bug 4126624
|
| 245af5e9ecb1881aa0b05f73bdbd249ec49a2af1 |
22-Mar-2011 |
Andreas Huber <andih@google.com> |
am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '71ba7d34bc1c900a872d5353e3f04c3751fa95f8':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
|
| 69bb5a1af521434dfec4c64057a430ffa57b9a11 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 97cd837e: (-s ours) am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '97cd837ec1e0eb87fb2a8a80a9789868fb5fecc7':
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
|
| 9d00f0375f8b1af9fe06637e4fa575c7c062df39 |
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.
|
| 52bee301b7ef870ec0acd86fda72352508369ce6 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
Add one more field in DecryptHandle to support bug 4126624
|
| 975040cdfc9ffcae822e554faa8fc8e472b4c407 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
|
| 0e680d80363358f1759a376d9a968732ac41bbe8 |
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.
|
| 19da284286c8ed5be00840432a215763f95fda91 |
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
|
| cfb132daeca61bb0e6e6fa6000a7637590139a0f |
22-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 90d97c996a15f9ebc90fbd260f47f95ffbe68006 |
22-Mar-2011 |
James Dong <jdong@google.com> |
Fix AMRWB test util and remove useless files
Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e
edia/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
edia/libstagefright/codecs/amrwbenc/SampleCode/Android.mk
edia/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/amrwbenc/SampleCode/ms.mk
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ms.mk
|
| fa31daff175709d2c58d61d1354daa9495696631 |
19-Mar-2011 |
Raghavender Palla <rpalla@google.com> |
Fix for the issue: TestPreviewWithTransition fails (4133108)
Change-Id: I53eb798f4f86e83f8a4668c7256241367c1ccbe4
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 61589965cc98a92f7755dd929511bec4b2414daa |
22-Mar-2011 |
James Dong <jdong@google.com> |
Fix AAC encoder test util and remove files that are not needed
Change-Id: Ib6cbe78de9f85e4df357d53365a35d1f9f0bb1d3
edia/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
edia/libstagefright/codecs/aacenc/SampleCode/Android.mk
edia/libstagefright/codecs/aacenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/aacenc/SampleCode/ms.mk
edia/libstagefright/codecs/aacenc/Tools/doit.mk
edia/libstagefright/codecs/aacenc/Tools/eclair.mk
edia/libstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/aacenc/build/eclair/makefile
edia/libstagefright/codecs/aacenc/build/ms.mk
|
| 6b2a35bbec228ce012065260ba153ee894f17a4e |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
Add one more field in DecryptHandle to support bug 4126624
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
rm/common/IDrmManagerService.cpp
nclude/drm/drm_framework_common.h
|
| 796260593d071cd1b48b0816dff25dcea9d21ae7 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1
* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
|
| 4dabc20fa21f78a0bc2f91f772ad449ac8b17028 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
rm/common/IDrmManagerService.cpp
nclude/drm/drm_framework_common.h
|
| bb3ae0dc89b06ddf81c34fc1ba7f972712ab8a92 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/httplive/M3UParser.cpp
|
| 0a73d81f213fb2d6f2fdd59c4dda047bf453bb1c |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/httplive/M3UParser.cpp
|
| b6a7147ce79b4fd44313f23d76e25c8d1919d490 |
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.
|
| 7b55c7ce1d8f187430d0b6bda68378f549930289 |
21-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Add read and write option in opening file for output in the writers"
|
| 0ca007df43c267459977ed2b7318d88ef3ed0ce9 |
21-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Fix for 4084554. DRM framework support for enabling/disabling copy control settings from a DRM plugin"
|
| 03f6f4e7e2ce09357cbc05bb546cd8a6e54b5bae |
21-Mar-2011 |
James Dong <jdong@google.com> |
Add read and write option in opening file for output in the writers
Change-Id: Ibfba0aacd3c8587c04a2e903b636de337cc30104
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| 310962976d575c0a97ec7a768e9cca0b2361daea |
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
edia/libstagefright/NuCachedSource2.cpp
|
| 0511969950188634f4212fcf63680c43207baedd |
21-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3483718: audio streaming and A2DP."
|
| 1da9aa606096e14985924e8433a087d04f68ea22 |
20-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for 4084554.
DRM framework support for enabling/disabling copy control settings from a DRM plugin
Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
rm/common/IDrmManagerService.cpp
nclude/drm/drm_framework_common.h
|
| 9b7d950f1f3b0c526712b713dbceb0e22762c015 |
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
edia/libmedia/AudioTrack.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
|
| c8a8472a0205dd698c8d81bf7e09026ca1013d1e |
21-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"
|
| af8791e112c8072452bd14ef3c43a47511d19542 |
21-Mar-2011 |
Andreas Huber <andih@google.com> |
Support passing headers to MediaMetadataRetriever's setDataSource API
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
nclude/media/IMediaMetadataRetriever.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/mediametadataretriever.h
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.h
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/include/StagefrightMetadataRetriever.h
|
| e841c77e1cfb42cffdad5633aab828b51a472579 |
21-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 1d54b3e0ec3d1ef17e75fec6f97be59f29721fff |
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
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| ebd5d2541d4e5351fd1f1a23fc9ef047cfa67575 |
19-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| 5aafd79f08836399e7d552eb3b7c5637125b857f |
18-Mar-2011 |
Russell Brenner <russellbrenner@google.com> |
am 2a102cce: (-s ours) am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491" into honeycomb-mr1
* commit '2a102ccecdf2580d01847f09e6b431ce7e3bc8bc':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
|
| 9c79141ee9bde51f6cad04568f21b530d28c11e9 |
18-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Better organize media recorder error and information event and types"
|
| 49bbee02a79d867c40b07812044c945bc1589c33 |
18-Mar-2011 |
Russell Brenner <russellbrenner@google.com> |
am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491" into honeycomb-mr1
* commit 'a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
|
| d42573cace9db2b5948e540c32beaef80f04153c |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/MatroskaExtractor.h
|
| 1caf58cd652edab4e05bfef8ccaa1497c450f5e9 |
18-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 4111672: AudioTrack control block flags"
|
| 39068e0fa09e1e342d8cb2280edc5d1941e93bd5 |
17-Mar-2011 |
Romain Guy <romainguy@google.com> |
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer.
Bug #3275491
These can be used by WebView to correctly apply alpha and geometric
transforms.
Change-Id: I61057997f5fda1e803d247fc77500a038d5f3aab
nclude/private/hwui/DrawGlInfo.h
|
| bc2661e26894905b1c3f5c59963708700bbcecaa |
18-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"
|
| 9cbb1a6f99003a9cd8765e11b9d7380e67839f82 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| bc07bcc65e91c7aea9713631ae67760dcf1b0286 |
18-Mar-2011 |
James Dong <jdong@google.com> |
Better organize media recorder error and information event and types
Change-Id: I45f1f953596985494725525c1fabf57eccc19175
nclude/media/mediarecorder.h
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| d13ff411aeaac2730e012ba2dcce03c671d2eb97 |
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
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
|
| 33797ea64d067dfeaacbfd7ebe7f3383b73961b5 |
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
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 08fb9eea0ca642142348e9c5dbc46c7d294d38a1 |
18-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| cfee2a39edf05ab0f97595d0ec5bda6a19f03659 |
18-Mar-2011 |
James Dong <jdong@google.com> |
am 14438b81: am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
* commit '14438b81a1fe4d7ebdf8977f3d80a1dd1867c5ad':
Fix missing AOSP copyright headers for more files
|
| 2a0fa5adaf7d43dbc0044c958f79d1da8a533db9 |
18-Mar-2011 |
James Dong <jdong@google.com> |
am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
Fix missing AOSP copyright headers for more files
|
| 79cbc13ede26d08ab6633a042843a9d154c3c166 |
17-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4126103.
mMessage in DrmInfoEvent is a reference to the message string, so the
temporary message created in the plugin was going out of scope and
being destructed while the message was being sent. Changed DrmInfoEvent's
mMessage to be const String8 instead of const String8&
Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
rm/common/DrmInfoEvent.cpp
nclude/drm/DrmInfoEvent.h
|
| 8eb69d60c09c1c4683066a94c889df28d0e9d233 |
17-Mar-2011 |
James Dong <jdong@google.com> |
Fix missing AOSP copyright headers for more files
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
because these two files were moved from other places to the current location,
and were actually created in 2010.
bug - 4119349
Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
mds/stagefright/sf2.cpp
mds/stagefright/stream.cpp
ervices/camera/libcameraservice/CannedJpeg.h
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| c901f74404435cc1cf2717016e2b0092b6dcea24 |
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
|
| 0ab985cf1ec0110022be22ff03aa300bb59b9c96 |
17-Mar-2011 |
Romain Guy <romainguy@google.com> |
Send WebView the current transform and whether we're drawing a layer.
Bug #3275491
These can be used by WebView to correctly apply alpha and geometric
transforms.
Change-Id: I2ecd4376d68df886dead3c9240317de33f56828f
nclude/private/hwui/DrawGlInfo.h
|
| f432a761e73bef8be43f83377ecea8abef72ce86 |
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
|
| 27c174483a8ae9688d5d4897c19074f62c7f1701 |
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
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/MediaDebug.h
nclude/media/stagefright/foundation/AHandlerReflector.h
nclude/media/stagefright/foundation/AHierarchicalStateMachine.h
edia/libmedia/IOMX.cpp
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/codecs/avc/common/include/avc_types.h
edia/libstagefright/foundation/AHierarchicalStateMachine.cpp
edia/libstagefright/include/MPEG2TSExtractor.h
|
| 9106463854cb8c332976079c715144d2f67b113f |
17-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 00d48b9495265457dfb265e766296212b5447b0e |
17-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Don't send the seek-complete notification twice."
|
| c21359d332ea2ac5258f86e1cf46db9e0faf3e4b |
16-Mar-2011 |
James Dong <jdong@google.com> |
resolved conflicts for merge of 1cbf8493 to master
Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
|
| 512895089f2035bc86d3f502255199809aca721b |
16-Mar-2011 |
Andreas Huber <andih@google.com> |
Don't send the seek-complete notification twice.
Change-Id: Ie994de2d57e20dde12b8d59af4968d03569c7efa
related-to-bug: 3489432
edia/libstagefright/AwesomePlayer.cpp
|
| eabc1ebd1b4a08b74ba51108c2b900b448cb802f |
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.
|
| 8031ec79eb657a0ae84325410578ea87f50eeb54 |
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
edia/libmedia/MediaProfiles.cpp
|
| d2251deb8f0ecf974bc88901ba469be66402ccd5 |
16-Mar-2011 |
Andreas Huber <andih@google.com> |
am 1a47fc35: (-s ours) am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1
* commit '1a47fc353157bf9798c8a7425f106681e14bf4a5':
DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
|
| 8190975e03954b2efe30bd2cd146d869ad676580 |
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.
|
| ae03031ab6af9505335e888b709ee661fe04ed83 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 8e5bd224981b65c186263499638d15890944cf6c |
16-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Fix a race condition when playing an audio-only stream and seeking before starting."
|
| b874cd085bba63528c570f74c493bfea835190d9 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 9b9ae81a7b10d65b03d3e9cefd811c54f076ecc9 |
16-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| ec1e17b1a1953809176d28594c84cfdf8f44b30b |
16-Mar-2011 |
Eric Laurent <elaurent@google.com> |
am 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
* commit '9bb250bfe735deb16e15dfdd6a35693558a2171e':
Improvement for issue 3489986: BT SCO volume
|
| 61a422a5278107d2ca0027c371aac6110e1e0e65 |
16-Mar-2011 |
Raghavender Palla <rpalla@google.com> |
am fb4d3b2d: Fix for the issue: 4099068 For long duration files, after end of the preview the progress bar is moved to the middle
* commit 'fb4d3b2d94f3f72b7ba13b6dfc17ba215dda2c03':
Fix for the issue: 4099068 For long duration files, after end of the preview the progress bar is moved to the middle
|
| 8c87dc71127ccc7b3ad616bc4862676fa09b7ce4 |
16-Mar-2011 |
Eric Laurent <elaurent@google.com> |
am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
* commit '3913c131c61288c5b4eedb063d9eb6b6204d2a1f':
Improvement for issue 3489986: BT SCO volume
|
| 427f147cce909f1af7dc47ab2e5353d79bf6cd5f |
16-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1
|
| ce80563f6fb49b0c40281f9a527e288799b4a577 |
15-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Improvement for issue 3489986: BT SCO volume
This change makes sure that the VOICE_CALL stream volume tracks
the BLUETOOTH_SCO stream volume when SCO audio is enabled.
The down link audio volume now reflects what is being displayed
when pressing volume hard keys on the device while in a video chat
with a BT SCO headset.
Volume settings on the headset and the device are still independent as
we do not support handsfree profile yet.
Change-Id: Ie0d2714730ea359b9318b9cbe6f0b2557ef0f976
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 1006c80903c4e6b0554a3bc2e3585639c395927d |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Bug fixes of DRM framework."
|
| 99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 |
15-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
Bug 4016329 do full string comparisons
|
| e24faedc6bc34d2ef7bc7bae64b6b20ccaf8b97d |
15-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '4528a7db389b4da73207d00ca15b306a111650cc':
Bug 4016329 do full string comparisons
|
| e1b7678650b78cbd2837ef60c4e7ad2f23745f60 |
15-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
|
| 8d2577b9ac2f95f218db59a78447efd3c6a742dd |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Bug fixes of DRM framework.
- Add death listener to clean-up drmserver appropriately
when drmserver died.
- Remove "static" declaration of mUniqueIdVector because it was not
needed to be static variable.
- Remove "class DrmContentIds;" because the class does not exist.
- contentPath in saveRights() could be empty because
it is not required by some DRM schemes.
- Fix naming convention to use sXXX for static variables.
- Fix typo
Change-Id: I7d440488fc074c200f1009d1bafafeffebd690b2
rm/drmserver/DrmManager.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
|
| f1e10e8ed74cac805d601139882378a1f450fe94 |
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
edia/libstagefright/WAVExtractor.cpp
|
| a6bb386b34a561c01ac08b35a9f31b0efb5c9449 |
15-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| ebf40154a222c864a0aaf807702fc4eb6b9cf40f |
15-Mar-2011 |
Raghavender Palla <rpalla@google.com> |
Fix for the issue: 4099068 For long duration files, after end of the preview the progress bar is moved to the middle
Change-Id: I3463581138e20e1a00f51183d3be013d6b2cd43f
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 8635b7b095fbf7ffc63d3ce791891a9116ace1f6 |
15-Mar-2011 |
James Dong <jdong@google.com> |
Add memory leak tracking/debugging code to drm server
bug - 4099038
Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
rm/drmserver/Android.mk
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/include/DrmManagerService.h
nclude/media/MemoryLeakTrackUtil.h
edia/libmedia/Android.mk
edia/libmedia/MemoryLeakTrackUtil.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 41b3d3be18b54e72a44813cbdd180aae7e77b444 |
14-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4016329 do full string comparisons
Use full string comparisons instead of partial for
file extension and MIME type.
Do case-insensitive comparison of MIME type and file extensions.
Fix error in comment for String8::getPathExtension.
Remove dead code -- StringTokenizer is unused.
Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
rm/common/DrmSupportInfo.cpp
rm/drmserver/Android.mk
rm/drmserver/StringTokenizer.cpp
rm/libdrmframework/include/PlugInManager.h
rm/libdrmframework/include/StringTokenizer.h
|
| 1b99cc90afffbda6013ebbb45d64f17b1d90b9f5 |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
For issue 4082089 Add more info and error events into the DRM framework
|
| 1444c94bfa6abc6516691580c360565ce18696d4 |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
* commit '132bb659b643348f29292810e42800441df41ceb':
For issue 4082089 Add more info and error events into the DRM framework
|
| 3e67eeb5c710bcf00d4cd4d6105a0b5f7ee3007e |
15-Mar-2011 |
Iliyan Malchev <malchev@google.com> |
Merge "frameworks/base: remove LOCAL_PRELINK_MODULE"
|
| 505bd99ec8bed47c438ac3bb4641ce5f7ba972e7 |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
For issue 4082089
Add more info and error events into the DRM framework
Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
nclude/drm/DrmInfoEvent.h
|
| de6ee790f0e0b758894f72daf3ec742fdabf3d22 |
14-Mar-2011 |
James Dong <jdong@google.com> |
Merge "libstagefright: Add error handling in AMRNB deooder"
|
| 9691a73139bb36c5bf294ed13eedcb04d7f05320 |
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>
rm/libdrmframework/Android.mk
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
rm/libdrmframework/plugins/passthru/Android.mk
edia/libeffects/lvm/lib/Android.mk
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/visualizer/Android.mk
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/common/Android.mk
edia/libstagefright/foundation/Android.mk
edia/libstagefright/yuv/Android.mk
|
| 68e98a29992bd61d03db0a2b95b87bb2ccfdf824 |
14-Mar-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/media/libvideoeditor: remove LOCAL_PRELINK_MODULE
Change-Id: Ib3ecb46e1ecc192edae2d5634798efffccbb6c94
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/3gpwriter/src/Android.mk
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
|
| 1549dbbfb0d18201cc568b4fa2bd6b0e7f582e9d |
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
edia/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
|
| 35812d2cc295e95e9383b64c07f5f8919d7a6885 |
14-Mar-2011 |
James Dong <jdong@google.com> |
am ad707d8f: (-s ours) am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit 'ad707d8f9aaff9cd1a121cb769772c921d870117':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
|
| b6b87f50e929c1c821f2f0ea5a31951e6cd76919 |
14-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am a60cb935: Fix for 4084134 End transition applied on image does not show up in previewer when playback
* commit 'a60cb935edd049ecf4c7ee985d562fff6c703372':
Fix for 4084134 End transition applied on image does not show up in previewer when playback
|
| 57069260754665c72ba9b5c6789c3c504b887d8b |
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()
|
| 8eac87886e72bf64e61ad41c02e91b02d0f55dd0 |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "resolved conflicts for merge of c761a80d to master"
|
| 1825ce2475d4cbed336ddb779ab5acb09d9a155c |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of c761a80d to master
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
|
| 51db2c7bc702bd819830d73293630576fabb62db |
14-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Fix PV AAC decoder crash due to out-of-boundary array access."
|
| 150694cda0842d38a9358fe8d1fcb4fb4a76599e |
14-Mar-2011 |
Andreas Huber <andih@google.com> |
Experimental support for changing the video surface/texture on an active mediaplayer
Change-Id: Ia7a5126e9311dc1c721ab2aef54bd698151c88cd
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 5cb5326a47409bc48e07da1a909f3b16d583f07a |
14-Mar-2011 |
James Dong <jdong@google.com> |
am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread
* commit '7d93b7574f741a9cd8872771faefa3c92bed6576':
MP3Extractor and MP3 decoder fixes - DO NOT MERGE
|
| 6df0dc04a43e5272f1c57e772b0c0842c03a01bc |
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
edia/libstagefright/codecs/aacdec/sbr_dec.cpp
|
| 41be68d9953c8d87c7d4889e551a32a1028c90ec |
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()
|
| 8980847d149cfca1d0564d9454c262764b6ee164 |
14-Mar-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1
|
| 6cfa41f06fc6a85ebaf5b94c4602128359587473 |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin
* commit '7ea3c7f5a31dcc40d3b5042e3eb724916b66384e':
- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock.
|
| 56d083457b55dc20e2b0f1aef89fc9e05d4ea3c8 |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1
|
| 3d74457b66533b170606347e60628e55a2af255e |
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>
edia/mtp/MtpDevice.cpp
|
| 8fd49135f16193143fdb0af5a8c0a2a8d231380f |
14-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 8b9a9067511efca72ca872d689e30315c1450f94 |
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
|
| 23771ca8d528e1887a263365e01ac9f681248f22 |
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
|
| 1e397deffe67f2c9373fd22e489a49caf6f11873 |
12-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 33bde8d8c4fc71fb3cdd8356fd0df70ffb44fcd7 |
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>
edia/mtp/MtpDataPacket.cpp
|
| 9a8c9a848da5a4a06c5402d6716efa66b8818d37 |
11-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 4084134 End transition applied on image does not show up in previewer when playback
Change-Id: I72ee9fe95f038c07b6ccfe3305aa6436e882eedf
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 6d8ed9598d526dfe9be983543f125e3178d7c9b1 |
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
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| 2cdb2152dce736f79e5f514dd53d5a5e99a6f8e2 |
12-Mar-2011 |
Ying Wang <wangying@google.com> |
Remove unused LOCAL_LDFLAGS
LOCAL_LDFLAGS is never used when building static library.
Change-Id: I55c093b1ab1c58081bcbc4d9d91f45025115536c
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| 0e0a5f9e0b7a7ca618e8a1f7ccecc57a17e0d1e2 |
11-Mar-2011 |
Gloria Wang <gwang@google.com> |
- Some change on the DrmManager in order to support feature request 4082089.
In DrmManager, we currently lock both processDrmInfo() and onInfo() which is
ok for now since processDrmInfo() is async call, and it will return without
waiting for onInfo() call. However, if we send an event in processDrmInfo(),
we will got deadlock here because we need to invoke onInf() which will wait
for processDrmInfo() to release the lock. Use different lock for onInfo().
- Remove some redundent mutex lock.
Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
rm/drmserver/DrmManager.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/include/DrmManager.h
nclude/drm/DrmManagerClient.h
|
| 04b1447ce161ab99cde5d071014367e5b21571ca |
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
|
| 9dec4911624b449afcf42a8d99ac78ca73952331 |
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
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
|
| 74861d4375ec48955d1418e27cebf0e118c29b10 |
11-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 34fba6695fe1b55710baef561785caa0486654fb |
11-Mar-2011 |
Andreas Huber <andih@google.com> |
Only use ChromiumHTTPDataSource if webkit was built with chromium support.
Change-Id: I9ce16f4aae35c61c9fb92fefc2a7c72537631cba
edia/libstagefright/Android.mk
edia/libstagefright/HTTPBase.cpp
|
| 884d064fbf7f45f8089abd7d87bdca5d325cc2ab |
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
|
| 203616faff0be6c2306f02d82f3ce305746beb49 |
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
|
| 2eb62955eb84b97695e8a7e56e14310cbb86412b |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| b5ce361d19e69fe156f7188c9ee0f4734b259874 |
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
rm/common/IDrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManagerClientImpl.h
nclude/drm/DrmManagerClient.h
nclude/drm/drm_framework_common.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/FileSource.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/ChromiumHTTPDataSource.h
edia/libstagefright/include/DRMExtractor.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| 6448c4055fa3ba660d60355b4f126efb0b48c85b |
10-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 609ce04d29780c430ff7e17511fc073a664c02d5 |
10-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 256290b1: am 54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1
* commit '256290b1efac8b0798964585c3c3d4600d9587ef':
- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039
|
| 0592e3cc541aa0c6477e00ddb052558a5a3e17c1 |
10-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1
* commit '54fe58562bb8df5155d4cdf3eb22d950be9dd273':
- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039
|
| 8862028032790fe2ec3f6114de6b2e98a296e6df |
10-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1
|
| 6b610a3d31a225adfc5867223df25dba16637bd9 |
04-Mar-2011 |
Gloria Wang <gwang@google.com> |
- Change level of some LOGs from LOGE to LOGV because those logs
are not error logs from non-DRMed content's point of view.
- Add more mutex lock to avoid crash by multi-thread calls.
- Fix for bug 4050039
Change-Id: I52fed22069f0cda6c4ac6a5363469168c797a33b
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
|
| c4122f56d6c3425666b67a81ed2d7224c8a4cda3 |
10-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Support http authentication ala http://foo:bar@host.org in stagefright."
|
| 3b93951624b5490a2d40abc5385dc71b15526757 |
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.
|
| e146aa536ae4c990e70dd03e85f5bac9fbe956a0 |
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.
|
| 4ec5179bf8cdebe37538fd22a690f20783a2b010 |
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.
|
| 83bfaf0acb485327bbc49356ea76025645f9ec0d |
10-Mar-2011 |
Lorenzo Colitti <lorenzo@google.com> |
am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming.
* commit 'e4a02b61290fa61955c979cfd1afc17a92bba481':
Support IPv6 in HTTP streaming.
|
| d563b839989fbacfe958db4e6b9876796841aa21 |
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.
|
| f64b241764f52ebd595fc4535d4f54dc07f501fc |
10-Mar-2011 |
Lorenzo Colitti <lorenzo@google.com> |
am b9da16a1: Support IPv6 in HTTP streaming.
* commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254':
Support IPv6 in HTTP streaming.
|
| 70fcf534d3fb6faa3aaa8061fc87f720c396e7ae |
09-Mar-2011 |
Andreas Huber <andih@google.com> |
Support http authentication ala http://foo:bar@host.org in stagefright.
Change-Id: I0b20077ad540ec8aa11adf0ca9f4142ea8b8ae98
edia/libstagefright/chromium_http/support.cpp
|
| 72fee698602ede6f6b64b77c0f1f28d96ff673d3 |
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
edia/libstagefright/chromium_http/support.cpp
|
| 2aac40fe9d42a15dab0af6a0efea7a2468cd9e4f |
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
|
| bd75c0d65c003ae18baebab7357c1d621096282b |
09-Mar-2011 |
Eric Laurent <elaurent@google.com> |
am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1
* commit 'cc34967fdcbf64826a068901d6fb1bd8bb1fa99f':
Fix issue 3439872: video chat and bluetooth SCO
|
| 1156dc913a5ba7b2bc86489468d4914430f03d14 |
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
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPBase.cpp
edia/libstagefright/chromium_http/Android.mk
edia/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp
edia/libstagefright/chromium_http/support.cpp
edia/libstagefright/chromium_http/support.h
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/ChromiumHTTPDataSource.h
edia/libstagefright/include/HTTPBase.h
edia/libstagefright/include/LiveSession.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| 1703cdfee717b1b312bf8979816a9e2f16a82e5d |
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
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| 0ef631528fa7a2f061aea2bdd68ef734ed626b87 |
04-Feb-2011 |
Lorenzo Colitti <lorenzo@google.com> |
Support IPv6->IPv4 fallback in HTTP streaming.
Bug: 4068057
Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
edia/libstagefright/HTTPStream.cpp
|
| 7528e58daa21c43dd937d06b130a033f31c99604 |
04-Jan-2011 |
Lorenzo Colitti <lorenzo@google.com> |
Support IPv6 in HTTP streaming.
Bug: 4068057
Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
edia/libstagefright/HTTPStream.cpp
|
| 271151e65fdc289514317b6e4e1b8805e6c647e1 |
08-Mar-2011 |
James Dong <jdong@google.com> |
am 73179134: (-s ours) am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
* commit '73179134d59944a4b190c991b92b73c91fd4e0ed':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
|
| 335874e2708fb456efe40c6bfb675590590caba9 |
08-Mar-2011 |
James Dong <jdong@google.com> |
am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
* commit 'b1be086e1d2f15c858b4aa7f40d49667b3e26d3a':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
|
| 2d54b745b40b5b72c4f688a16611bd9b16fe42f5 |
08-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 1dd524b567ef1bb0591eb8adce10d43841376f5d |
04-Mar-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3453519: do not allow editing of DRM protected contents
Change-Id: I19f56cbdaab0ddb3d1ab0aec8dcf625a3ff3ead2
ibvideoeditor/vss/mcs/inc/M4MCS_ErrorCodes.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
|
| a5967faabad08cb5cd0c7098289fb62216dffbc6 |
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."
|
| d3ee677783864d933cd8bc82c14666bd135d43bd |
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
edia/libmedia/MediaProfiles.cpp
|
| 6bfa73657a0ab4e9ea3c74fbab038f7ea3df173f |
08-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| af50f1169ec7489f981158ba6d1afacdeeeda9c3 |
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...
|
| 2f79a1507183bbbf7bd571ad590baf1c242e5bc4 |
07-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Change trace labels" into honeycomb-mr1
|
| 64bfdc7d8d8e0404f7193f776fd226d1cd870f93 |
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
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuHTTPDataSource.h
|
| 38978f57fec45748fd1eb7f96d25bc4e8415aabb |
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
|
| fbb1909036ba7de3d9fb8738daba60b357881153 |
05-Mar-2011 |
James Dong <jdong@google.com> |
Add missing copyright headers to a couple of files
bug - 4025673
Change-Id: Ie1c4cf18c06032f9b89cc08e5be25d38c0f76aa1
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuHTTPDataSource.h
|
| e6482914b71449319abd691f304b6ae9223f97a1 |
07-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Added more metadata published by the MediaMetaDataRetriever"
|
| c40db8255e1b9957d66cadd522cb0a6d978897ed |
07-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-mr1-release history after reset to honeycomb-mr1
|
| 6ab1d170a6707e4b92bc1ee353dcd2bf7b897bac |
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
|
| 73870c96dc3d652b64b74b023f3df67edf7d08c0 |
05-Mar-2011 |
James Dong <jdong@google.com> |
Fix a leak from AACEncoder.cpp
bug - 3470617
Change-Id: I328e92bc1b2aca72e5856703dae00f957f40bc27
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
|
| 100d01836041713337dd9532e417fb010bfb381c |
04-Mar-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
Fix for issue 3371667: fix source code compilation warnings(Moved from master)
Change-Id: Ife1fc3f89beae498a49970ab5d2a080a112ce7c2
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/vss/common/inc/VideoEditorResampler.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_Interface.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| f24e48bbbc93da7655aabe04adf42eff2efcf69e |
04-Mar-2011 |
James Dong <jdong@google.com> |
Change trace labels
bug - 3385135
Change-Id: Iad66e122a9e2ce7cce26779f679cbf04dd1a5434
ibvideoeditor/osal/src/M4PSW_Trace.c
|
| 052a7c451053d79ac864326104deec58b7400dce |
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
edia/libstagefright/MP3Extractor.cpp
|
| 918581cd1d50f0d34a94ae820d82dc7ab50aaa99 |
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
|
| 2eb6a47b58c5b36f887a372e89f3d70f5d40812c |
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
edia/libstagefright/MP3Extractor.cpp
|
| 2256d515e6fa1dd95b8fd0de05b56d8c83af8327 |
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
nclude/media/mediametadataretriever.h
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| bdba1f2a3813e4c8e690d71cfc2b82d5dee85c73 |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| 11402f5603093f7cbb1bc17ae58b5522bad3e46c |
03-Mar-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 4f46fed004b76d462ef859aa94a3c056b0e79b60 |
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()"
|
| 9ee159b79022b2e1a050acb3890ce948e99e9ccb |
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
nclude/media/IMediaPlayerService.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
ervices/audioflinger/AudioFlinger.cpp
|
| 9a5f9b7dbe9ecdebfbd9e8f96452c42213b08a31 |
03-Mar-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "Stagefright: Use the ANW min undequeued bufs query."
|
| 8b17ba3296340dd556d5c00b322be42b9490b4e0 |
03-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "To support DRM files without file extension"
|
| c3369fd756f015b06fe5824766e618160fe079f5 |
03-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Resize internal PES buffers dynamically instead of relying on a fixed maximum size."
|
| 3e57322b332214e3cb1874e67a5704c9b2b5f6ec |
03-Mar-2011 |
Andreas Huber <andih@google.com> |
Resize internal PES buffers dynamically instead of relying on a fixed maximum size.
Change-Id: Ibe720e6148799e32d039ccdb4b269659bc779952
edia/libstagefright/mpeg2ts/ATSParser.cpp
|
| 43a7e77206090d5a301dea224347a01a59fb2dfc |
03-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity."
|
| 32f3cefa373cd55e63deda36ca9d07c7fe22eaaf |
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
nclude/media/IStreamSource.h
edia/libmedia/IStreamSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerStreamListener.h
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
|
| 1c4967155109ab083a4149347596f7ebd3662a67 |
03-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3388775."
|
| 0a8f12903f52c4f2b718123bf7e1232acfa19c20 |
02-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for issue 3427268 Crash when stopping playback"
|
| 1e2469c689feeb2e90a38900151e2ef1e6117d07 |
02-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for issue 3427268 Crash when stopping playback
Change-Id: I4cd615ffa8c5db39ec34dc14f6b09fad55cae263
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| f96ebc66c0feb441733da6d08bca6d8de96cd9f0 |
02-Mar-2011 |
James Dong <jdong@google.com> |
Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits"
|
| 5787a5e59ca06eaecbe57b015846f3d01337c5eb |
02-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am 2a373979: (-s ours) Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
* commit '2a373979d85649bcb2c67f3751836a2ced6bf1ec':
Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
|
| 7f89d09c0f4a47119834ba15789260b933123ea5 |
02-Mar-2011 |
Gloria Wang <gwang@google.com> |
To support DRM files without file extension
Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
rm/common/DrmSupportInfo.cpp
rm/drmserver/DrmManager.cpp
|
| ebdc652a891659d83386c3f92715ad6c70c8ba2d |
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
edia/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
|
| 3fd91baee812919f53a85c5c05f32606313f8334 |
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
edia/libstagefright/OggExtractor.cpp
|
| fe288aa71450ebe04eb74d06a3ea887c6009aacb |
02-Mar-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3495914: (In Preview) Video clip switches between start and end
Change-Id: Ib11c069127b3e81cfc741fab5a4f05a21d382c6b
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 5f5354e35ab3b2a0cb4cabb6d0aa5a160225ccc8 |
02-Mar-2011 |
Mathias Agopian <mathias@google.com> |
Merge "Add support for up to 32 buffers per Surface"
|
| 446a20d257c09bbf9127483ea28a465905536a4e |
28-Feb-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
Bug - 3497783
Change-Id: I26eee1538d1f2f86476b115c9e7df85fadd796dd
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
|
| 2a21ff5f51f74d98fcdee96dff1da658da8da84b |
02-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Get rid of redundant media profiles"
|
| 2a7e0a1eb29306982fd77bdc64d324464a48a2b9 |
01-Mar-2011 |
James Dong <jdong@google.com> |
Get rid of redundant media profiles
bug - 3330679
Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| 196855ed4eb4681c4d3504438706caf6b505c9d6 |
01-Mar-2011 |
Mathias Agopian <mathias@google.com> |
Add support for up to 32 buffers per Surface
Bug: 3488016
Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
nclude/private/surfaceflinger/SharedBufferStack.h
|
| d71a0e1ac517cf312b9a96fe5ba9de04f2b9ffd4 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| c0bff9b96152179650dc9508799a38e35ef2a321 |
01-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3479042."
|
| 532492cd60a3ee2613cd3d664c9f4581d9929bc5 |
01-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 3388775.
Do not select A2DP output for media strategy when it is suspended because
BT SCO is active. Media audio will be routed to speakers or SCO HS
(depending on phone state and activity on stream VOICE_CALL) which is less
confusing than not hearing anything while music progress bar is moving.
Change-Id: Iff8cc1ea9bf9bde0b33035c4d91398db0934b836
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 59e7879a8482284a434268d51b4b438f0625d1be |
01-Mar-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "Stagefright: Query buffer usage from the component."
|
| e13e24b6e8a7c2d0244ba575e309fb1254119a82 |
01-Mar-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "Add an OMX IL API for querying buffer usage flags."
|
| d2d38d5c937c552555aec8aa2eb9822a19b2476b |
01-Mar-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "Fix error recovery in Stagefright init."
|
| bdc9420c228e0c5d4da51eaca3cdbd8db5a5c413 |
28-Feb-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE
Bug - 3497783
Change-Id: I26eee1538d1f2f86476b115c9e7df85fadd796dd
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
|
| 243f5f91755c01614a8cafe90b0806396e22d553 |
01-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 3479042.
The problem is that when an AudioRecord using the resampler is restarted,
the resampler state is not reset (as there is no reset function in the resampler).
The consequence is that the first time the record thread loop runs, it calls the resampler
which consumes the remaining data in the input buffer and when this buffer is released
the input index is incremented over the limit.
The fix consists in implementing a reset function in the resampler.
A similar problem was also present for playback but unoticed because the track buffer is always
drained by the mixer when a track stops. The only problem for playback was that the initial
phase fraction was wrong when restarting a track after stop (it was correct after a pause).
Change-Id: Ifc2585d685f4402d29f4afc63f6efd1d69265de3
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
|
| 3deeeeeb6c1dd050d1c35064d7f08bfd8b537cbd |
25-Feb-2011 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
Change-Id: Iae0c63e936b2042473def8839f663605e68b6066
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| c4fe7ff55c1b58bc76cbdc40c80937314a1c400c |
18-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
BUG: 3402847
Change-Id: I46e90f546a8d72c273cd7f2de2d086bb6dbdc1b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/mtp.h
|
| 8af74a5336605cd1fc2782a5c74571aa6c90dd27 |
25-Feb-2011 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
Squashed commit of the following:
commit b1732e9b8bfea4c99bd07907c9aac9fcf1e8b264
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 24 12:05:40 2011 -0800
DO NOT MERGE: 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: I4f6eb4e577147bc12ed2e998bea299f4bcfaf936
related-to-bug: 3375737
commit 5e7282cf0b5c7a613da5e65fd6c8cb33a1058f8e
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 11 13:09:36 2011 -0800
DO NOT MERGE: 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: If17c4243546b1c27c8e5ee43941654d0e36f5ee5
related-to-bug: 3431702
Change-Id: Ic3a6be467ff7ad09da04b1d2bb1a692ee38002b4
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 258d4e3aef7984574b0972a66871afc8a13d8e4e |
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| 408e25b2508d97f7ae0b39acf46ab42b7c223c44 |
28-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
FIX for Issue Fix for issue 3371667: fix source code compilation warnings(3)
Change-Id: I15e8572cbce7443fba9afcd494a92038a5a0bd43
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 52dcba93c4cde086113f7e57a6c81d3314e69121 |
28-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
Merge "Fix for issue 3371667: fix source code compilation warnings"
|
| 74006804065941841883c4b46ee785070164023f |
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| 3c14b9745c4afc88cec247d9dd0b003e087cbb52 |
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
edia/libstagefright/ACodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| e2ce6458659c6e1bad420357b61dc10cd8bbe2ab |
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
nclude/media/IOMX.h
nclude/media/stagefright/HardwareAPI.h
edia/libmedia/IOMX.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 6fa83fbad4bf779c6677d525d434f0738726465e |
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."
|
| 3911a720270fc0326accfa4a3df427a649a45487 |
28-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Add the option '-S' to use surface allocated buffers in the stagefright cmdline tool."
|
| 4855ea69d520613cba4ca67d622020c264845b83 |
28-Feb-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Fix bug 3376700 Volume too loud at lowest setting"
|
| c83d4f56f9dd45f71c0f4673737f0ad1cce60abb |
28-Feb-2011 |
Andreas Huber <andih@google.com> |
Add the option '-S' to use surface allocated buffers in the stagefright cmdline tool.
Change-Id: Ic84eeed1679d6bf68c92de0e20d30e7a3c4d410f
mds/stagefright/Android.mk
mds/stagefright/stagefright.cpp
|
| 4a0c72fc4d823826d71282f5c75261ad0d50f0e4 |
28-Feb-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for memory leak with single audio player instance"
|
| 8ddeebb93cb41e7a8e9fe763afb6c6016b21fa61 |
21-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3447027 Limit previews for DRM video
Change-Id: I5b15cf6a15623cf73f007c59143ab5e3fa5a07e8
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| b6e2b5cc5b71986b06cbd9c471b63eb5878a7aea |
26-Feb-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for memory leak with single audio player instance
Change-Id: Idb0d24ac1a4fbe21c5f63871a4c7da2beb90e516
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
|
| 14c690d6a5696d681b35f2d0e5f75a11fdae4c2a |
26-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
Fix for issue 3371667: fix source code compilation warnings
Change-Id: I6cb6950af55effe0da6d421eaa5feb179be68158
ibvideoeditor/lvpp/VideoEditorTools.cpp
|
| 043b22dbe3b98a8fdd6b0ea77df4089ff44b6539 |
28-Feb-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix bug 3376700 Volume too loud at lowest setting
Change volume attenuation curve to provide more attenuation at
low volume settings, and finer steps at high volume.
See bug entry for link to doc with curve values.
Change-Id: I750548b2161a4c550ef982ba793156e4518119e8
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 60181854194007eef9471c2774a9912ce8c42cfa |
26-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
am fbd67fec: (-s ours) am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit 'fbd67fec87e425cfbbd80926cec8cd345d134b4c':
DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
|
| 5f19885a4e25270d842423483e41c19656decccc |
26-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
* commit '0600fff9149df3af01e90d4996b70dbc1ee7c135':
DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
|
| 512493119d8fcebe33bf8cf0becde6b398307d10 |
18-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units
BUG: 3402847
Change-Id: I46e90f546a8d72c273cd7f2de2d086bb6dbdc1b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/mtp.h
|
| c3def8f37854be6af6e3936a210399a59267a49e |
26-Feb-2011 |
Andreas Huber <andih@google.com> |
am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit 'cd6828e84220c6bdf92bbca12fcd88a8da76387c':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
|
| 4938a42280d1aab3f00179a0de9778a61fca0123 |
26-Feb-2011 |
Andreas Huber <andih@google.com> |
am aabc3e13: (-s ours) DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
* commit 'aabc3e13ddf230dd0c9ad5edc0c3eb2687d671cb':
DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
|
| 02b959962097577bcebfb31206fba1fe84fe2ed2 |
26-Feb-2011 |
Andreas Huber <andih@google.com> |
am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb
* commit '2332cd8c675628f3bdd6e46a8dd6da639bd7f76e':
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
|
| c3fa37a806d9687b7e3b6a1afd18a6503c43c912 |
25-Feb-2011 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Hack this copy of our internal sources to match changes to support A/V sync.
Change-Id: Iae0c63e936b2042473def8839f663605e68b6066
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 633b4c8cc1f41370576aa43e6c5a70e4865a36df |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 34d1115f15d2ca6a39a7e2d39988c6353d3d6438 |
25-Feb-2011 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues.
Squashed commit of the following:
commit b1732e9b8bfea4c99bd07907c9aac9fcf1e8b264
Author: Andreas Huber <andih@google.com>
Date: Thu Feb 24 12:05:40 2011 -0800
DO NOT MERGE: 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: I4f6eb4e577147bc12ed2e998bea299f4bcfaf936
related-to-bug: 3375737
commit 5e7282cf0b5c7a613da5e65fd6c8cb33a1058f8e
Author: Andreas Huber <andih@google.com>
Date: Fri Feb 11 13:09:36 2011 -0800
DO NOT MERGE: 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: If17c4243546b1c27c8e5ee43941654d0e36f5ee5
related-to-bug: 3431702
Change-Id: Ic3a6be467ff7ad09da04b1d2bb1a692ee38002b4
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 18eb42eca6949158e630eae38a70db8f837c17c8 |
25-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Alternate patch for late video issue: seek only the video ahead to the next"
|
| a5872f770c50da1db555d53e062a9896ea4321d5 |
25-Feb-2011 |
Andreas Huber <andih@google.com> |
And again keep this copy of our internal sources in sync, so much fun...
Change-Id: I4b588f14ba2d06d3163615557fd97fc2a5f6ca47
related-to-bug: 3375737
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 827b55c5f3409b68ef57816208220d8804693e44 |
24-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Suppress the logging of URLs when in incognito mode."
|
| 7314fa17093d514199fedcb55ac41136a1b31cb3 |
24-Feb-2011 |
Andreas Huber <andih@google.com> |
Suppress the logging of URLs when in incognito mode.
Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a
related-to-bug: 3336575
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/LiveSession.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| 64bb6983690bf994d904591145a3cdd6373bdbe6 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 4aeec63e25e1d1f55d55245d1c0ffd554f2a2f49 |
14-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3438258 surface textures
This is sufficient to build, but is not a full implementation.
See bug 3467199 for the real implementation.
Change-Id: Ifc3325fa9b019669bffddfd7bfd10bce57d0a136
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
|
| 72feaa5df1f7b15b18e30592653dc511dc0b8c51 |
24-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"
|
| e23da615c0b1721fe7d9d2e06e82e43b9bd89df3 |
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
edia/libstagefright/MP3Extractor.cpp
|
| 9287abf2657bee9464965c37bdaa866d023c9d89 |
24-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Don't crash when parsing DRM MIME types"
|
| 6f7a293c1bbf993ff712927e3e14af0d195cf1c1 |
24-Feb-2011 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add YV12 preview format to camera parameter constants."
|
| d42c6e8904f1648a7dedcd1dc27b926951f8ff28 |
22-Feb-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add YV12 preview format to camera parameter constants.
bug:3463624
Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| d67e9da63323d965760337913f86de28024531a4 |
24-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
VideoEditor: Issue ID: 3371667: Fix Set1
Change-Id: I728bc27b86e0c8720a2d05e6cff8a76f820bf016
ibvideoeditor/osal/src/LVOSA_FileReader_optim.c
ibvideoeditor/osal/src/M4OSA_FileCache.c
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| 17e89b555a41aa591f1a01ecd51a7cb5a7bcfc0e |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 676ae7591c5260869f89efe2380afaacb79bacc9 |
24-Feb-2011 |
Mathias Agopian <mathias@google.com> |
Merge "Remove RefBase.h dependency on TextOutput.h"
|
| 1173118eace0e9e347cb007f0da817cee87579ed |
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
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
nclude/media/stagefright/NativeWindowWrapper.h
edia/libmedia/Android.mk
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/SoftwareRenderer.h
|
| 7e20422fb3b0c11b18ae142f3be08f9bf65bfd4b |
23-Feb-2011 |
Gloria Wang <gwang@google.com> |
Merge "To collect the total usage time of encoders in the media recorder"
|
| 75b0b5473c7b43f8c5972db7e6e8930988ead751 |
23-Feb-2011 |
Gloria Wang <gwang@google.com> |
To collect the total usage time of encoders in the media recorder
Change-Id: I94c9c94dec6bd714a3ebf96b4465b94f069e55b8
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| f7f3e824a8cb2b38355db8e4f99e43b90ee71ce4 |
23-Feb-2011 |
James Dong <jdong@google.com> |
Merge "Application-managed callback buffer support for raw image"
|
| 51b9a8b53eaa1a0188be95d4d6a749424787e0d6 |
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"
|
| 7cf180c9bff69e5cc4a2f4e53b432db45ebbebab |
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
nclude/media/IMediaPlayerService.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/AwesomePlayer.cpp
|
| e468ac57f6e8afc6078c76d4eb1ac327112a3de0 |
18-Feb-2011 |
James Dong <jdong@google.com> |
Application-managed callback buffer support for raw image
bug - 3292153
Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
amera/Camera.cpp
amera/ICamera.cpp
nclude/camera/Camera.h
nclude/camera/ICamera.h
edia/libstagefright/CameraSourceTimeLapse.cpp
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 95d7e994c73c17b27c7134ba3cc3acbb5889aa87 |
17-Feb-2011 |
Mathias Agopian <mathias@google.com> |
Remove RefBase.h dependency on TextOutput.h
Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
edia/libstagefright/include/AMRExtractor.h
edia/libstagefright/include/MP3Extractor.h
edia/libstagefright/include/OggExtractor.h
edia/libstagefright/include/WAVExtractor.h
edia/libstagefright/include/avc_utils.h
edia/libstagefright/mpeg2ts/ESQueue.h
|
| 8e0e1979f0f41487b0f18aa5b9c8c52a39ca27f4 |
23-Feb-2011 |
James Dong <jdong@google.com> |
Merge "Remove mkvparser code from /frameworks/base"
|
| 3b84c8f8ab84915c93e2f6d0b32f2139afd95ed6 |
23-Feb-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for 3369917 Audio skips at clip edit points"
|
| c498a2747314b1e863eab6a22aaf7323642ba62a |
23-Feb-2011 |
James Dong <jdong@google.com> |
Remove mkvparser code from /frameworks/base
bug - 3322129
Change-Id: I94dca6234ce57c9a32290aa7ac4885b0a2f566a9
edia/libstagefright/matroska/Android.mk
edia/libstagefright/matroska/mkvparser.cpp
edia/libstagefright/matroska/mkvparser.hpp
|
| fcea8f7a7d178e5426aa06586cff54726e18d1f6 |
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
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARawAudioAssembler.cpp
edia/libstagefright/rtsp/ARawAudioAssembler.h
edia/libstagefright/rtsp/Android.mk
|
| a849440ca96e93f700d62c6e41d48905b4d405b6 |
18-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for dynamically adding and removing storage units
BUG: 3402847
Change-Id: I7da266061d949abcb6bb11c6faaa47b5e4a2a977
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/mtp.h
|
| 39a5f1bbf88c124dc24b34d718a2d95f577b5bf1 |
22-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Support more MPEG4-LATM audio functionality."
|
| 1c97d9ab52a288d24ea54499de435277cc1a3d68 |
22-Feb-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 3369917 Audio skips at clip edit points
Change-Id: Iba66585cc2e679475d8db529d6113586b58e626e
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyAudioSource.h
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.h
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| 55e26193c885b7d5acdae9978848e6587987790f |
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...
nclude/media/stagefright/foundation/ABitReader.h
edia/libstagefright/foundation/ABitReader.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.h
|
| f1d985081cff2a6aa2397c5341da8432db753211 |
22-Feb-2011 |
James Dong <jdong@google.com> |
Check file descriptor before passing it through binder calls
bug - 3476613
Change-Id: I858933fd2fe4c095c0bd58bf50344c47fc104be9
edia/libmedia/mediarecorder.cpp
|
| 226c1e7cd1a0312d84bfc3fb066f264aa6d8e026 |
22-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Merge "Fix for issue 3456689 : Export failed with Runtime error"
|
| 9971f10e1f962201da9fa2b180e7332bc3c55c4a |
22-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3456689 : Export failed with Runtime error
Change-Id: I402601590a39d71cf8bd25379f3fdd7915078c9d
ibvideoeditor/osal/inc/M4OSA_Time.h
|
| 63754a7bdb7b8ed1071a7c67766ab1f5e381728d |
22-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
VideoEditor:Issue:3431967: Memory leak in Export case
Code cleanup
Change-Id: I81be8ef4f3abead6a85db8b0a4b2a9c594b1bcac
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| 1de41a66e3e7b548ee44e6654580e5f6f7265b11 |
19-Feb-2011 |
Gloria Wang <gwang@google.com> |
Move all Widevine code which have dependency on vendor modules to vendor/widevine
Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
rm/libdrmframework/plugins/widevine/Android.mk
rm/libdrmframework/plugins/widevine/include/WVMDrmPlugin.h
rm/libdrmframework/plugins/widevine/include/WVMLogging.h
rm/libdrmframework/plugins/widevine/src/WVMDrmPlugin.cpp
rm/libdrmframework/plugins/widevine/src/WVMLogging.cpp
rm/libdrmframework/plugins/widevine/test/Android.mk
rm/libdrmframework/plugins/widevine/test/TestPlugin.cpp
rm/libdrmframework/plugins/widevine/test/kill.sh
|
| d4366e89e46317673a97516ee2d25768038dc444 |
15-Feb-2011 |
Gloria Wang <gwang@google.com> |
- Update from Widevine
- Bug fixes
Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
rm/libdrmframework/plugins/widevine/Android.mk
rm/libdrmframework/plugins/widevine/include/WVMDrmPlugin.h
rm/libdrmframework/plugins/widevine/include/WVMLogging.h
rm/libdrmframework/plugins/widevine/src/WVMDrmPlugin.cpp
rm/libdrmframework/plugins/widevine/src/WVMLogging.cpp
rm/libdrmframework/plugins/widevine/test/Android.mk
rm/libdrmframework/plugins/widevine/test/TestPlugin.cpp
rm/libdrmframework/plugins/widevine/test/kill.sh
|
| 8c8f24dce1dfc2d1eed8f7856ffceaa349afa2a6 |
19-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Don't crash when parsing DRM MIME types
Change-Id: I414897c911a6588061ddbb5f05c574e78162dca9
edia/libstagefright/MediaExtractor.cpp
|
| 7e006bd24cccffb9c9fd48fd3b2709b6639bc5f1 |
18-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Merge "Fix for issue 3439595 : Movie studio playback previous frames"
|
| b2d6e0f74a12e5cce5b429e646172c63346346c3 |
17-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3439595 : Movie studio playback previous frames
Change-Id: I0f1a6cdfa40f6c8eebe989116e01ba8c212d5872
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| f84f29a3b43d903989f10288bfd3934d446228b3 |
18-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
Merge "VideoEditor: Issue ID:3431967 : MemLeak with Invalid input"
|
| 0e10ea4e9773fc9c6c391b5b391a95e29edf29e4 |
17-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Experimental support for https transfers in stagefright."
|
| a472613aec322e25891abf5c77bf3f7e3c244920 |
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
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| 8cb0c4168bf4b678e4a6edfcf409247016be20d5 |
17-Feb-2011 |
Andreas Huber <andih@google.com> |
Experimental support for https transfers in stagefright.
Change-Id: If1bd0f265dda136c7c34b53317f64383023b53a3
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| ac9dde5945fd00a6fb882bd171ee8a42a091fb86 |
17-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed issue 3421896 Slide transition causes images to jump in exported movie playback
Change-Id: I78cbe7e3509f65ce651de926267fad4f65c3c263
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| b6c571382ade0561e95e63fef484f53971dc8c60 |
17-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
VideoEditor: Issue ID:3431967 : MemLeak with Invalid input
Modified the fix after review
Change-Id: Ic4dd92d76870256453a93b3a7d80e0d147884425
ibvideoeditor/vss/mcs/src/M4MCS_API.c
|
| 8b95de2c4d57a0a07d7f4c59f2ddd52a140a361e |
17-Feb-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for issue 3456480 A/V not in sync when a picture is added followed by a video clip trimmed from start
Change-Id: I7a46f7fc20de9a6c0ebbc2ad03dca898306bad6b
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| f71eb135c28dd7b305b7030776ef0d44fac732c4 |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
am 09b18c2f: (-s ours) am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '09b18c2f1d5ca6cf25352ae633f2121556a516ab':
DO NOT MERGE: Respond to RTSP server->client requests.
|
| d3ce2e8677a6fcf1ea0dae3efb5d74b8718b2819 |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.
* commit '79a97489494deb8bdae85696f612ec7acda54240':
DO NOT MERGE: Respond to RTSP server->client requests.
|
| b8dc45f224232e6ff64c1528b9e549b5a348fcd3 |
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.
|
| 917429960b0e0d0c363e849f482f6aeb11c9b7d7 |
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
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
|
| 4fd9736c7719ea121f9717b331b771bef798ee64 |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Respond to RTSP server->client requests."
|
| 5ef152132b477a07fa31b2ddd39f4cf7a29f68b4 |
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
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
|
| d9839024c67add85cf8300713ad1c6367e1a214c |
16-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fix issue 3457629 FIle loads but does not play"
|
| f21b91e7e6ba0de65a64b556224e7985113eeb67 |
16-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fix issue 3457629 FIle loads but does not play
Change-Id: Id4f77d3883b0f6ad6ffd75ddac49efd5cf2ca1c7
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
|
| c3e1e1e4207a655bf5a3ecf9b9e41700e54a3c86 |
16-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fixed issue 3443078 overlay flicker on transition in exported video"
|
| 6b61f4355db1974cd0f0dfaa4effdd7117b9f09b |
15-Feb-2011 |
James Dong <jdong@google.com> |
Decouple AudioRecord read and audio encoding
bug - 3313754
Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AudioSource.cpp
|
| f58e4c332ecf8c0cd6037b010256d0b4c56e6a17 |
16-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed issue 3443078 overlay flicker on transition in exported video
Change-Id: I4c625a1f7c9897ee0d9aee3f521974456c97ad8c
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| b5377f908fc3649b490406e3db34601dca2f7ac3 |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Remove legacy, AwesomePlayer-based http live implementation."
|
| 81dbe9e509a494437bc18ad54d95c8383fcc0e4c |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
am 0bbf9667: (-s ours) am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '0bbf96675783758b6ffdff8996d7166ae1dec15b':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
|
| ed8d14f6a934072cd012992c4ef16990a54baa9a |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
Remove legacy, AwesomePlayer-based http live implementation.
Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| b03353f45ff2aa588370b773332a4dd70e910517 |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
* commit '16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5':
DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
|
| a5a42c5ceb98942909d84b20d44a920eed85a8cf |
16-Feb-2011 |
Andreas Huber <andih@google.com> |
Update this copy of our internal sources to reflect changes to the original...
Change-Id: I6f66c1f4e73f0a83faf0fbcdea5073e6b9fef1de
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
|
| 6d91a2069f58ed054889371cbce3a294f3207338 |
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
|
| c083500e41973256e0c3d4faf5948916b64e918e |
16-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fixed issue 3443078 overlay flicker on transition in exported video"
|
| d48a6044fddc910f17e67650f280e91e7aaf5e65 |
16-Feb-2011 |
Gloria Wang <gwang@google.com> |
Merge "Add AAC extractor"
|
| 50c44c79d2d7dd6cd1485d9d939f67f80b8da1ca |
02-Feb-2011 |
Gloria Wang <gwang@google.com> |
Add AAC extractor
Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/AACExtractor.cpp
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/include/AACExtractor.h
edia/libstagefright/include/avc_utils.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
|
| 43270a821f418f57140220b4c78c559d880850ef |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| dc613448c264b09837ebd5c2d8b7ffcaaba4bcbc |
15-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Derive the Transport "source" attribute from the RTSP endpoint address if necessary"
|
| b81c1b65e58186b5e7abf8f894c9b0f2f317ec09 |
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
edia/libstagefright/rtsp/MyHandler.h
|
| de9a20c274983d4f7a688acb68d5dfc6a432eb10 |
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
edia/libstagefright/rtsp/MyHandler.h
|
| 8a0358e7adf4895cb6f3b0ce104fba379edb52bf |
15-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Work around several issues with non-compliant RTSP servers."
|
| 125a205a3ca5a229d120043afb80e820f585560c |
15-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP host: disable some test code"
|
| dc468c5f9d72ce54de0070493e9a23efb8907e06 |
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
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| d4fb52e3031578119ecd53087b1bcb4828c333c5 |
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>
edia/mtp/MtpDevice.cpp
|
| d6962876702ac78989f4ee9b5050078a09648fa7 |
15-Feb-2011 |
Andreas Huber <andih@google.com> |
am ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
* commit 'ad1831a56fd60779464326468ee1d471a10f71a0':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
|
| 9b8bc08b1a991b88d29fb94cf67706e0e331bec5 |
15-Feb-2011 |
Andreas Huber <andih@google.com> |
am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
* commit 'e0c9f2757b0ebd291fec89ebb520878aacd3f7dc':
DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
|
| 69686c47220cf6c85b91d741fc3a08eb46887ad1 |
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.
|
| 3d7b550b1a9bae0ec692bf7b786385914f99ea3d |
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
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| f1958f9442bc937e1f8c8d9175901500b944b021 |
14-Feb-2011 |
Andreas Huber <andih@google.com> |
Enable cancelling the rtsp connection process early.
Change-Id: Ie2059c54541ad8c675944d71b39c772b0f6f04c8
related-to-bug: 3452699
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/ARTSPController.cpp
|
| a5589b915ccc72a57ce7be8831fc99ec80be424f |
14-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Merge "Fix for issue 3431967 : Memory leak from video editor engine"
|
| 4ca3e5df4b809210b240cd7d0489922017d87a6d |
12-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967 : Memory leak from video editor engine
Cleanup
Change-Id: Ie5432de17c30dbb02c70a759502b7f2e2dbba447
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 10622437ecb8270ecaae43005ec9f141efd5c7ef |
14-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fix for 3431967 Memory leak in SF shells"
|
| 2fffed1d281c5d9df2d5b830dca92034271362a2 |
14-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fix for 3431967 Memory leak in SF shells
Change-Id: Iaecf24e7cc095c5295a1568b4185e977f19f15aa
ibvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| 0e248c82803c7880a15ce29c2d4be5c2189e414c |
14-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed issue 3443078 overlay flicker on transition in exported video
Change-Id: I0376b09acd91be8ba792478323d9f48a71818c2b
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
|
| a14f40684961771d656ff88cce7c2b758511e92f |
14-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fixed issue 3385135: change min audio buffer count to match awesome player"
|
| 126ea73dd1919c8a176019c50b1ca96035aef45b |
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>
edia/mtp/MtpPacket.cpp
|
| 5bc7fb407ce1bab13d4a4a67d34a1a3192ee3186 |
14-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue : 3450195 Adapt to the recent changes of awesome player in video editor preview player
Change-Id: Ibd15264837dab32464fb90e75cf6d3d323cbbae3
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
|
| d196f1c368746d13c3a7dc470ebe3a4c33d2c74d |
12-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed issue 3385135: change min audio buffer count to match awesome player
Change-Id: I4408b5c42edd0a65016ed621b31ecda513d17d60
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
|
| 1845894d33736c8e17df6b88874bbd4e5a73977a |
12-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fix for 3448630 H.263 files returning unsupported profile and level."
|
| b864ee128119ad995862355776599e553691e722 |
12-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fix for 3448630 H.263 files returning unsupported profile and level.
Change-Id: I9b65cd902fc575db2bc529d4349198d83d421854
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 6f01a99c470d4dcdc046b9ba802b787b95e38dbb |
12-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
VideoEditor: Fix for Issue 3419090
Change-Id: Id0dd34bbe9bb530e44bcdba6933bd6b2d9a7795c
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
|
| 31af37320d29c8bc725d8b4fe97e2f0288818333 |
12-Feb-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3400751."
|
| 244ba87d20aeb29c9cad727820fa1e803ec3643c |
12-Feb-2011 |
James Dong <jdong@google.com> |
Make available h263 DSI information from MPEG4Extractor
bug - 3446863
Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Extractor.cpp
|
| 586b21780680c4d19723b5a9484e55ec47464c5f |
11-Feb-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 3400751.
Add a delay before restoring output path when a notification ends so that
short sounds can be heard on proper device before the path is actualy switched.
Change-Id: I1d2dd8e7e28e15fbcab344256f88499b26297372
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 727a6f859841a1d421b680f56d4d4ca5ff8c6e4b |
11-Feb-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3425342."
|
| 12932bfdc7163e654d5ef25f1cb1802ded2704f1 |
11-Feb-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 3425342.
Change the device selection order as follows to enable easier use of
A2DP while the device is docked:
1 - wired Headset
2 - A2DP Headset
3 - SPDIF/HDMI
4 - Dock
Also do not limit notifications volume when on dock.
Change-Id: I55ea6bea9f2d9ff284b54023e541b2788d0f1eb8
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| f03034408506051f2f836e59305fcd5f662bf19a |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| ff98976e40459e910cfd1a7693bb08cff4dabd42 |
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
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| ea3f01bbee32d522fcd843b7f0bd7c680cbd3ad6 |
11-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Merge "Fix for issue 3431967 : Memory leak from video editor engine"
|
| c32d4c16e4d356d50f72cf687f097ed042bbfb1e |
11-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "Fix for issue : 3439708 Last frame is missing effect"
|
| 5df818550a13d5bd21798badcb413e7a945e15e8 |
11-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967 : Memory leak from video editor engine
Change-Id: I4cc445ce7d41a4842dcf0b5ad1c729c0ae5553cd
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
|
| 5d5aed9d4e28fc2166617e54a219506fe0892e8b |
11-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3444969 : Crash while generating transition
Change-Id: I63286dc66bfcd496aee45d26c8934f519ce63429
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| 4f4efef8357f4d8b23ccfb1b29db34175bf72627 |
11-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue : 3439708 Last frame is missing effect
Change-Id: I533695f4154d4ebce4e8f1ff39a622ca4fd62430
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| d52e5c3edcb1aedce8b5bea705422fd47b06622e |
11-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3352047 Wrong message when adjusting volume"
|
| 6b2718c67aa7b1a8e3b0f25a73a0d5f72c59ffc3 |
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
nclude/media/AudioSystem.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioPolicyManagerBase.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 864d06670089f79bc177a51fd53de9db0e21fc99 |
10-Feb-2011 |
Andreas Huber <andih@google.com> |
Fix the build.
Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
edia/libstagefright/rtsp/Android.mk
|
| 100a4408968b90e314526185d572c72ea4cc784a |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/ARTPAssembler.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPConnection.h
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTPSource.h
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/rtsp/MyHandler.h
|
| b4ce81da6664b5029406a78be71c39af055a4d29 |
10-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967 : Memory leak from video editor engine
Change-Id: I36e1cae53c91217804bc8243d9eb47820fb2114e
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| 9785cdf83214ce4d998e65ac0fce92cea3137f0b |
09-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967 : Movie Studio crashed after pressing the back button
Change-Id: I4b8cb2a54c2a1b7117feae9d8c6ca14e81b1f83d
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/lvpp/VideoEditorTools.cpp
|
| fcac8fa9421f442f024018628a6042d7a14fbfb0 |
09-Feb-2011 |
James Dong <jdong@google.com> |
Reduce blocking time in file write
bug - 3418787
Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 1ea8583c990170b94cdca0f9a248d61961c3520f |
09-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue: 3437071 Crash during rendering mode change for specific video size
Change-Id: I358c7cc24a7f8c71b953cf5179902fa20fbd727c
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c
|
| 722555f01ace262c2aba9e1ca5d9794ce30c564f |
09-Feb-2011 |
James Dong <jdong@google.com> |
Catch read error from AudioRecord and do not assert
bug - 3439313
Change-Id: Ie29d6e4945978ef27fc3e5849e467d895c7736d3
edia/libstagefright/AudioSource.cpp
|
| 37865df43b68ae34ddb6f6450dbef301f92f3618 |
09-Feb-2011 |
James Dong <jdong@google.com> |
Merge "Should reset errno to 0 before calling strtoll()."
|
| 27944ef5cd8d0fb476c8c8958986e827c5f8ab83 |
09-Feb-2011 |
James Dong <jdong@google.com> |
Should reset errno to 0 before calling strtoll().
bug - 3431238
Change-Id: I855847209d2e022242b8eb62985759922ab94779
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 6b8ef4762a26cb828e0a597719764d3d0404e2b1 |
08-Feb-2011 |
Gloria Wang <gwang@google.com> |
Merge "Add more check before using the DRM manager client."
|
| 8f64134f749e4f7861a08a3063450fc714c4651d |
08-Feb-2011 |
Gloria Wang <gwang@google.com> |
Add more check before using the DRM manager client.
Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/NuHTTPDataSource.cpp
|
| 9f3d387e580359562972479bb8788eef27cd0a55 |
08-Feb-2011 |
Kenny Root <kroot@google.com> |
Merge "X86 target fixes"
|
| eeffad65d2db4879593c1d4806824ef5b4dcb3e1 |
08-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Handle some edge cases when seeking while starting up OMXCodec"
|
| 9e4c36a044e264c644d7fa9f9894659a6fc47a6f |
08-Feb-2011 |
Andreas Huber <andih@google.com> |
This copy of our internal code does not handle seek-preview while paused well.
disabling that functionality.
Change-Id: Ie1d2bda6866e3754fb6237ab827c3c93a38104d8
related-to-bug: 3427268
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 9c0096378820e5a61db26e52a7e6df50ba9c872d |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| eb5b265274bb26732ac9f4ac2d42d0b7e4148d52 |
08-Feb-2011 |
Kenny Root <kroot@google.com> |
X86 target fixes
GCC 4.2.1 complains about using void* in arithmetic. Cast it to unsigned
int before using it.
Also there was a missing stdint.h include.
Change-Id: If78bb6a771b72eb08bd2dc401371e8da14fd9ecc
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
|
| cd334d7a8e9df05f6b94eefbad2bddda0850f2cf |
08-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Remove one log message from the VPXDecoder"
|
| b93d55d9f6e154629d47270970e0a0ace5a1b0a0 |
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"
|
| 576c3f65d7ad166c21ef09342a2a321e57666af4 |
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
edia/libstagefright/codecs/on2/dec/VPXDecoder.cpp
|
| 889b340ec736a9d3e3e690256d305cc8740f0c4b |
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
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/FileSource.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/DRMExtractor.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| 9f57f820affa668c3c710920049c18ce406e2a12 |
07-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
am ca3e96f4: Fixed Issue 3423072: Imported 1080x720 video clips present distorted view in preview
* commit 'ca3e96f4583eb7f1f20213bf3322e4dcb2691ecc':
Fixed Issue 3423072: Imported 1080x720 video clips present distorted view in preview
|
| 90ac2aad4e7a97a96fe9e512a7f09ebf0aae20c1 |
07-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
am 19ffad8d: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb
* commit '19ffad8d71c30741abe8a644cd55574434332d56':
Fixed 3419090 Throwing exception for unsupported video codec profiles and level
|
| 8473bb556421ac08f4e03abd5d149852114c9238 |
07-Feb-2011 |
Brad Fitzpatrick <bradfitz@android.com> |
am be806fe8: am cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."
* commit 'be806fe8c1c7bb3ae70ae27dce41d672410af26a':
Initialize resampling buffer per track.
|
| 3d0a45cacf8e4ab842ec872cb5b1165b643a99d6 |
07-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
am ca87261a: Fixed 3423072 Imported 1080x720 video clips present distorted view
* commit 'ca87261a03e1683dfd9b6e93a187c70a52eeead4':
Fixed 3423072 Imported 1080x720 video clips present distorted view
|
| 651affdc5ec248f9b6877bd1c0ede6ca72326cdc |
07-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 1da97b07: Merge "Modification for using Software decoder for thumbnail generation" into honeycomb
* commit '1da97b07e2e0832a1914bf25efc2d77f86b339db':
Modification for using Software decoder for thumbnail generation
|
| 2b1222f8938356669672f35e0e53e176c78c40ef |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 5b695fb0e65212802c89d77e5bb3bcaad0ebe95d |
07-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
am b7070855: Fix for 3409334 Movie Studio "Force Close" after importing a 3gp video
* commit 'b70708552e0d20b007b815c60968e6e2f5d21ce5':
Fix for 3409334 Movie Studio "Force Close" after importing a 3gp video
|
| 4f728ffde220524b28e2076c3c09fcbd33e0fcaf |
07-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
am bcd9628e: Fix for issue 3422485: Kenburn not showing continuous progress bar
* commit 'bcd9628e69003e8d38d80addef0fa47222c14101':
Fix for issue 3422485: Kenburn not showing continuous progress bar
|
| aa05e8c760d5c2b228cbc1a0aeacbf058ae40978 |
05-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed Issue 3423072: Imported 1080x720 video clips present distorted view in preview
Change-Id: I38f2a042d66f7b639510d503321296e915689f7a
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/vss/mcs/inc/M4MCS_ErrorCodes.h
|
| 802da7bc462f6f9df6e681cc75c51dc0a056a4a1 |
04-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3366668 Use BinderService template"
|
| 4e28768b7a8d6a376c95d35e9060603431636bda |
04-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb
|
| e08d819989d394ed171ba6f1e6d0fa14c29fc42d |
04-Feb-2011 |
Brad Fitzpatrick <bradfitz@android.com> |
am cc8f87e9: am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track."
* commit 'cc8f87e9410dd4de9a2fda4738429e6c6087c789':
Initialize resampling buffer per track.
|
| e26308ad434c575b2985ac442d2990bb1bc19f5d |
04-Feb-2011 |
Brad Fitzpatrick <bradfitz@android.com> |
am b083d3b8: Merge "Initialize resampling buffer per track."
* commit 'b083d3b816378ef3b9dceb33b2c2e20510b2632b':
Initialize resampling buffer per track.
|
| ca0dd6114d7f5195373b40ff477b17a1b778c13d |
04-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Ignore format change message in sf2 instead of asserting"
|
| 777833cde11bfe8bae9c99aba8eeec33755ab264 |
04-Feb-2011 |
Andreas Huber <andih@google.com> |
Ignore format change message in sf2 instead of asserting
Change-Id: I2d7cdf371c07109398c53c7ffc37d7b10b6b6312
mds/stagefright/sf2.cpp
|
| 349d3fcb4afacf754f7b5b5186d2f258f5bf35e7 |
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
nclude/media/stagefright/ACodec.h
edia/libstagefright/ACodec.cpp
|
| 2151d7b8c2dd77c9887691db30396937be778141 |
04-Feb-2011 |
Yuuhi Yamaguchi <yuuhi.x.yamaguchi@sonyericsson.com> |
Initialize resampling buffer per track.
When resampling too short sound, AudioMixer uses previous
tracks buffer. So we re-initialize the temporary buffer per
loop to avoid it.
Change-Id: I55a59a3b14faa8445e09c450478fe79cef704760
ervices/audioflinger/AudioMixer.cpp
|
| 67fda6a6a718fa46aa803afa2c48be007b193587 |
04-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed 3419090 Throwing exception for unsupported video codec profiles and level
Change-Id: Icc6fa16e1aed5eef4eb7908a8657b940290668e4
ibvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
ibvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
|
| 5eae88ab5c94efee602a5b68ceacd74f5285c6c4 |
04-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed 3423072 Imported 1080x720 video clips present distorted view
Change-Id: I4e6fb6e803dcb29afeb7cd82967c63479c40b329
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| 7e08031d59c6be5338d34f9fc55bfba1548525f4 |
04-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "Modification for using Software decoder for thumbnail generation" into honeycomb
|
| b828db5197c34be4ae00a7d37f5c21caa51b8cbe |
04-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Modification for using Software decoder for thumbnail generation
Change-Id: I6f910292796917ad5aca5054a3522fb197df7826
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| bfece17c8f63de4d4b686da50f8ecac2f6f8ec53 |
04-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for 3409334 Movie Studio "Force Close" after importing a 3gp video
Change-Id: I37949140a6c37a0c2d04221e220e7e267b6c7a02
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 117cd9286424888c1c5bf202ebf1e08ae1e6affe |
04-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3366885 Remove LVMX switch"
|
| 8782cb4dc783cdcac8498148ab1894b4780c18df |
04-Feb-2011 |
Eric Laurent <elaurent@google.com> |
am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
Fix issue 3371080
|
| db130fbd3ccd37e247e49494a84f8a9841ecd593 |
04-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3366885 Remove LVMX switch
Change-Id: I0bf98c6f85f00b3296874571e1c049dcc4e2fcca
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| d2dcb08808aed82218b258726fa66f8e095a3f9c |
04-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3366668 Use BinderService template
Change-Id: I93d7f3fc9dc9b6a365723d8a51a73a5aabdb4f93
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| a205abd16ba836b27cfb8ba6b03611e8e8120978 |
04-Feb-2011 |
Andreas Huber <andih@google.com> |
Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
|
| 553ab646159d94747dab5c3893ea51c8ec2463d9 |
04-Feb-2011 |
Andreas Huber <andih@google.com> |
Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)
Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 4931bb5259d10c1fa01e7405fb7aaef58a8ffb22 |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/include/SampleTable.h
|
| 12db816fa13a3963183e45e397954a32418c3ee3 |
04-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fix for issue 3422485: Kenburn not showing continuous progress bar
Change-Id: I19688a89fec1edeae2af1c9a8185b96a5fde2974
ibvideoeditor/vss/src/M4xVSS_API.c
|
| 856990b491d84b7ed4fefe337485c8997ba9dd02 |
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
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/FLACExtractor.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/include/FLACExtractor.h
edia/libstagefright/include/OggExtractor.h
|
| 2df83f312ec716696037b2c01030a3647af0fe7a |
03-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 1bca832a1e023988a0103e3d87a47c96bfa0045a |
03-Feb-2011 |
Eric Laurent <elaurent@google.com> |
am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
Fix issue 3371080
|
| eda6c364c253ba97ee45a3adeb8c2b45db1f81db |
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
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioPolicyService.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyManagerBase.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| 31c52e7c8c01e1db6ff9bcf66135c72544b1235a |
02-Feb-2011 |
Kenny Root <kroot@google.com> |
Fix some memory leaks found in static analysis
Change-Id: Icd630009793c51acfaed45763ef50489ead40024
edia/mtp/MtpDevice.cpp
|
| 80e94ce8b68aa4d7c66234d464b844192ad463a3 |
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am d49eeb9e: Fix Issue Crash during Export Issue 3414805 , and Preview smoothning for 720p Clips
* commit 'd49eeb9e9e3df850be6e190d9f837191e45c032b':
Fix Issue Crash during Export Issue 3414805 , and Preview smoothning for 720p Clips
|
| 4f155f0cffa2414545854e899dff4861187e1f68 |
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix Issue Crash during Export Issue 3414805 , and Preview smoothning for 720p Clips
Change-Id: I5a90fc350a33c1eca9b4ec682b68b80913578341
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| 0d263964ca45e8c77ba051db8baee4ccdd602567 |
02-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am ff9e07e2: Fix for issue: 3404624 The overlay in the exported video is blurry
* commit 'ff9e07e20e2573eba5b32bad2a8453f397f1f0f7':
Fix for issue: 3404624 The overlay in the exported video is blurry
|
| aae29543bd55d383285a103e37e86afd18068fcd |
02-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue: 3404624 The overlay in the exported video is blurry
Change-Id: Ia24eeec5d22b1f9bc911260292e8e481830f2493
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| 92ba5b790a3d6861945d6ac2f5dbceeabc9827b2 |
01-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am b771ec36: Merge "Fix for issue 3410180: Small green lines at end of surface after removing last media item" into honeycomb
* commit 'b771ec36157c33759c094475d56dac07903af998':
Fix for issue 3410180: Small green lines at end of surface after removing last media item
|
| c36c7addb22cecfbe467b58ce219cd1f6db21a44 |
01-Feb-2011 |
Gloria Wang <gwang@google.com> |
Merge "- Support comfort noise in AMRExtractor - Support duration and seeking in AMRExtractor for different bit rates"
|
| 80f68ce02c91f188bb0cb0019fd25df2b8115f18 |
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
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/include/AMRExtractor.h
|
| c5bee355f86d921009ef7743bb9c5f43cf855053 |
01-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "Fix for issue 3410180: Small green lines at end of surface after removing last media item" into honeycomb
|
| 72a807dc64c5a967f43116dd84893e2213c5b6e3 |
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.
|
| 4e5391cf782ddff9a1c0d9b8211f1252521ca598 |
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.
|
| f892b561f5e6e54ceb2ddce3915b8bccfca24056 |
01-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 3410180: Small green lines at end of surface after removing last media item
Change-Id: I49695d5d77709da66ffa44d648b35e194f069a7f
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 672664d7e78a60281e7db90dfb9d4bf7e0205f58 |
01-Feb-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| ab8a0badb8fb1e294dacf2eb6a891439f348aff9 |
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
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/LiveSession.h
|
| 382f6a663daddca67769e51c8e2741a63eef7629 |
01-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
am ec6d65f6: Fix for issue 3404624 - The overlay in exported video is blurry
* commit 'ec6d65f6c23188ee0b3187a4ba664c51987816dd':
Fix for issue 3404624 - The overlay in exported video is blurry
|
| 8d08c5aeee05425357b6603a22fa73fd6e095a47 |
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>
edia/mtp/MtpServer.cpp
|
| bb337b471658b7c2264c6ff1bb613739db851baa |
31-Jan-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3404624 - The overlay in exported video is blurry
Change-Id: I52bd474c85589bd75e58c675045a7c7fe058a228
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4xVSS_API.c
|
| 64dc9b1d16324c27ecfded273c71873cea2d821a |
31-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am af8f5db6: Incorporated review comments and merged on TOT
* commit 'af8f5db6872f96a3bd84bea10bde5d97e7c3d60d':
Incorporated review comments and merged on TOT
|
| 5d33cc161e7d13459b4833dbc8b769093c3f80b0 |
30-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Incorporated review comments and merged on TOT
Change-Id: Ia147aeb73a6d8cf9c48e02ccaa428aa7adc04d3a
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| c2d030ba90f767f9ad23f475c649d390d8f9a610 |
31-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am ac40bcce: Merge the same files on top of tree.
* commit 'ac40bcce930b45627720cad89d5b224cae78d0bc':
Merge the same files on top of tree.
|
| e1f105895f913b19ad848cc90a3cd57dad657abf |
30-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge the same files on top of tree.
Add support for .m4v Issue 3395600
Change-Id: Ica9efce7ee3b550b2c49251c97a0663d490ffd73
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
ibvideoeditor/vss/mcs/src/M4MCS_Codecs.c
ibvideoeditor/vss/src/M4VSS3GPP_Codecs.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| cbe9bf2516041fa1d9c651ebb53d6e95534a9110 |
31-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am cd47b059: Merge "Fix issue 3369917 :Audio skips at clip edit points" into honeycomb
* commit 'cd47b059ae6726f7693c96c6e4a04c13a008a407':
Fix issue 3369917 :Audio skips at clip edit points
|
| 29bf069483c8e2114bb925f95528a0e8ad11f432 |
31-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "Fix issue 3369917 :Audio skips at clip edit points" into honeycomb
|
| a344bff7d163bd46ae1365db5c6c0d908053d386 |
31-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 44e3e34d: Fix for issue 3400229 Pan and Zoom effect is not accurate in core
* commit '44e3e34df68737ab33a3c35608d69b6d8c24834d':
Fix for issue 3400229 Pan and Zoom effect is not accurate in core
|
| f189883ea2c0973041b06ba428b645f0deb610f3 |
30-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 1331f07d4400a25b9c8d2d4a1a913150ae05c5f7 |
30-Jan-2011 |
The Android Open Source Project <initial-contribution@android.com> |
am 5f773b9f: Reconcile gingerbread-plus-aosp and honeycomb
* commit '5f773b9f72367ed8046df257d20881fd96f86929':
resolved conflicts for merge of a314f32b to honeycomb-merge
|
| 2e7f31d481497ce59508b00e76cc79aebd107076 |
30-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 3400229 Pan and Zoom effect is not accurate in core
Change-Id: I14e79bc5b75772df5095dc96bef2fabfa6763af1
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
|
| ed5ba112bc2229c68916ada8eb0d783ba66df9e1 |
30-Jan-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
|
| 1f6c6b785f90f6c074c7d401f9fa537a4fb9f110 |
30-Jan-2011 |
The Android Open Source Project <initial-contribution@android.com> |
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
|
| 53c567c3355255ed12dd9f5d5a1c58f821770329 |
30-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix issue 3369917 :Audio skips at clip edit points
Change-Id: Ibfdcf7511efe054cd41bc36690696c6eddd2e500
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 1fd34e7a8643851e3f02870c0e0be410604bfc78 |
29-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 2d8bedf2: Merge "Fix issue 3404563. Overlay is not seen when the clip is trimmed in the beginning." into honeycomb
* commit '2d8bedf2ea94d32236f972cbd6f0ad1ae58abb7d':
Fix issue 3404563. Overlay is not seen when the clip is trimmed in the beginning.
|
| 8a838ad9f3b1568fce1606fd4b33a7b705064839 |
29-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "Fix issue 3404563. Overlay is not seen when the clip is trimmed in the beginning." into honeycomb
|
| e091b1cabc49d46d3afbba4f015f2bffa2934053 |
29-Jan-2011 |
Andreas Huber <andih@google.com> |
am b6c2e2b4: (-s ours) 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.
|
| 2a30be33a39b07bf4f945d9506ffda0fd076e6c2 |
29-Jan-2011 |
Jean-Baptiste Queru <jbq@google.com> |
Merge 0ef57993 from gingerbread
Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
|
| 6386eb945fddbd82e421013f76bbd537b92d6669 |
29-Jan-2011 |
Andreas Huber <andih@google.com> |
am 2dce338e: (-s ours) 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.
|
| 41cce7b013ec77852b43c8ae3a4b61ff10f75ad9 |
29-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
|
| 91e7b0562dfb9def27be42761057614d41234206 |
29-Jan-2011 |
Mathias Agopian <mathias@google.com> |
am 239fd805: (-s ours) Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
|
| cce3a1107ef5bf9c8c8dbbaf922a2b33f24abfe6 |
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.
|
| 6ce1c4e6f6c96cee1d799d774e803d048d808834 |
29-Jan-2011 |
Andreas Huber <andih@google.com> |
am c2bee3ae: (-s ours) am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit 'c2bee3ae2d6cebdaf588a102ff64499717e43cc7':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
|
| 144f78906f1eefaf8cbde9298a1422fcea094447 |
29-Jan-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am 4eeb1047: Merge 13212f83 from gingerbread-plus-aosp
* commit '4eeb10470ffafe8c508027f363ac66b58da5bf00':
Fix issue 2988031.
|
| ece0d5639c085b8b237bd0d39b2ac9fc3b205177 |
29-Jan-2011 |
Andreas Huber <andih@google.com> |
am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
* commit '70888c00a0371692a07132f0dd94208456dd44c1':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
|
| 2ef89309d41daac3d69fa78b31cd09cb2c262ca1 |
29-Jan-2011 |
Jean-Baptiste Queru <jbq@google.com> |
Merge 13212f83 from gingerbread-plus-aosp
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
|
| 6dfc223e20e65b9938c2903fe47a51cc9a02a71e |
29-Jan-2011 |
Andreas Huber <andih@google.com> |
am efebdf4b: (-s ours) 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
|
| 741341925372f8a92178138951a16ebf9f88fd4a |
29-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 1e20cf9c: Crash in prepare player. Issue No 3403342
* commit '1e20cf9c9188c7380d2be58e714f18f69f8b7a0c':
Crash in prepare player. Issue No 3403342
|
| 254c8dfe514fd45eef251763639f63615379570f |
29-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix issue 3404563. Overlay is not seen when the clip is trimmed in the beginning.
Change-Id: Iec0fcea164f6909283c8686605378c3e1db127f0
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| 7f0ce8d629b731705341942f1308b91cba9ea29c |
29-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Crash in prepare player. Issue No 3403342
Avoid race in preparing the same player twice.
Change-Id: I5a735e54b94cd0dd435a066a92b1353e761eafc6
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 771470123a6fde6f78b0b41178a5b05a60b8001d |
29-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| ea8b6daa30ac3d4fd1969d006d3e95495a025d6f |
28-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 02235c39040120295314a402841b17f68752ec99 |
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)"
|
| 60e91863e185f84ec36fa3293e57ac9aa8500749 |
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)"
|
| b2a6582c006d6472777ab526428a93e0884bde8f |
28-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am c46e0e43: Merging on top of new sync
* commit 'c46e0e43762debf25e2c10953a0f420850891531':
Merging on top of new sync
|
| 5c009b036e01d2a351b02c47b8f20f384aa663fd |
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.
|
| db207461a16ebcab38b52906ef88228393efca41 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 4635eba3507750ed57817f244e84084d06df5b2c |
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
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/ASessionDescription.h
edia/libstagefright/rtsp/MyHandler.h
|
| eab39fb973444f2c03b0e92d4df263b83c31f71b |
28-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merging on top of new sync
VideoEditor:Fix for issue 3378727
Change-Id: Iff7d13689b436cda2b2073625a786322945b3edc
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
|
| 54f533e7a1c0753d52595eb4d42295d654fd1a97 |
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.
|
| 391bf6f06111983d9618764068ecc189dc7abd79 |
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.
|
| 783e5cd85d4bd40b1a04dfdfed256c5dcb2525cc |
28-Jan-2011 |
Andreas Huber <andih@google.com> |
More robust parsing of NPT time ranges in RTSP.
Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3
related-to-bug: 3217210
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/ASessionDescription.h
edia/libstagefright/rtsp/MyHandler.h
|
| 4a70d449ae8a7945ffcf26d1e8e4d70a5c6a8c4e |
28-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am c5694ebd: (-s ours) Merge "do not merge - Fix issue 3371096." into gingerbread
* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
do not merge - Fix issue 3371096.
|
| b40fce634c87bdc46b7ff825a7b036aa5673a1c4 |
28-Jan-2011 |
Dave Sparks <davidsparks@android.com> |
am 65d39eeb: (-s ours) 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.
|
| ce149967a2a95add663705195a6f72da008f6222 |
28-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 68e468d7: Merge "Fix Issue no 3374842. Preview Optimization while switching between two clips." into honeycomb
* commit '68e468d7e89fdbd4f5000156063e3da51c29533c':
Fix Issue no 3374842. Preview Optimization while switching between two clips.
|
| 78554cc3ef73938202f79a9fd3c86b109d2d73f1 |
28-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "Fix Issue no 3374842. Preview Optimization while switching between two clips." into honeycomb
|
| 312d2931f2a9e8fa40de3d34a5e4f54297aeab8d |
28-Jan-2011 |
Santosh Madhava <smadhava@google.com> |
am defe5c95: Fix for issue 3370007 Overlay transparency is missing
* commit 'defe5c951fa2f69bbd7d85899b94f000636a61ff':
Fix for issue 3370007 Overlay transparency is missing
|
| 0078736220b9372f2c82eb258ceca3dbd6c358ef |
27-Jan-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3370007 Overlay transparency is missing
Change-Id: I1b513b607f669d141bcd28bd918b8c1319bef7fa
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/video_filters/src/Android.mk
ibvideoeditor/vss/video_filters/src/M4VIFI_RGB565toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB565toRGB565.c
|
| 3c48e4126582f6d9d4c74868d81d868f47bac3eb |
28-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix Issue no 3374842. Preview Optimization while switching between two clips.
Change-Id: Iefb55107965b3978f83794fe727405206afdde72
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| c812fd3e5a35f09b0d5d6e4cafb40d21b75053ac |
28-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am 0ef57993: Merge "Fix issue 2988031." into gingerbread
* commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b':
Fix issue 2988031.
|
| 00332ee3b3e2c779d17fe034d25a076b921f7f6c |
28-Jan-2011 |
Andreas Huber <andih@google.com> |
am e9a00235: (-s ours) 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"
|
| af4ac7874771f7e9c66e9f91a81d8fa239a0026a |
28-Jan-2011 |
Santosh Madhava <smadhava@google.com> |
am eca65102: Fix for issue 3399126 Overlay displayed over next clip
* commit 'eca65102e363b1ca210d8ab4ab982a9aff999054':
Fix for issue 3399126 Overlay displayed over next clip
|
| 342f932f6312be84a48512216b561ead42b53199 |
28-Jan-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3399126 Overlay displayed over next clip
Change-Id: If2baf25bfe10cd4034db827c0333b3020bbd3087
ibvideoeditor/lvpp/PreviewPlayer.cpp
|
| f41ef0ee0da4c497352df42d09c3d89940c25e14 |
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>
edia/mtp/MtpDevice.cpp
|
| b38234c59b9a4e8c991e7e7fd6934175a7701861 |
28-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 1a47acf3: Merge "VideoEditor:Fix for 3384150 and 3369908" into honeycomb
* commit '1a47acf3862db758cd6a37d41004fb1c316d836f':
VideoEditor:Fix for 3384150 and 3369908
|
| ef9515f74cc562ffd049fd7ee085d44285c03ca6 |
28-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am f269fd3f: Fixed the SRC interface
* commit 'f269fd3fe76d1cfc9e736ea7c49e785c6c6b6ae7':
Fixed the SRC interface
|
| ab639fac88f5513587be5bbaab3dd7d3b68e7e53 |
27-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "VideoEditor:Fix for 3384150 and 3369908" into honeycomb
|
| ec380153defefa617d1f83e2910fd9e58a641c12 |
27-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideoEditor:Fix for 3384150 and 3369908
Change-Id: I3ea2983d8df263dcbd0b4c55a81f06cdea4ff568
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
|
| 52897c2fda8d1d97796af1477c2748e3a2f25436 |
27-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fixed the SRC interface
bug - 3369860
Change-Id: I6b866d334af9c9aea1db0295bf19edbc4123293d
ibvideoeditor/vss/common/inc/VideoEditorResampler.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/VideoEditorResampler.cpp
|
| 5092d8c066a1a98343bbc16e33a6753e577b5e7f |
27-Jan-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 2988031.
Limit SYSTEM stream volume when a headset is connected and music is playing.
Change-Id: Ieb44ae5bb53ffa9cd5fe8e317798eed279b78df8
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| c63e5259dcb77fc720c23bc2d0c4feeb3d677f71 |
27-Jan-2011 |
James Dong <jdong@google.com> |
am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread
* commit '83fdc69ea0beb715dd45f0a4285cb5d780f8018a':
Squash commits of the following patches, cherry-picked from other branch - do not merge.
|
| 31f07ea9995b63b7122919e623f1eafc251bb578 |
27-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 807ca2bcded56e8d832bdb0c6c62feeaa54c4ddf |
27-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 4c9874dc: Fix Issues 3395836
* commit '4c9874dc75d596e095109df21718325a5603d225':
Fix Issues 3395836
|
| d01ef568f96253fe5859526bb67b13fc5e17b544 |
27-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix Issues 3395836
Change-Id: I4cf83c99d09b27c92a7789a4c16b2e237011a7fd
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
|
| 6cfacdf97708bc3a0e3d1ed3e07e71caae9a194e |
27-Jan-2011 |
Andreas Huber <andih@google.com> |
am c296b573: (-s ours) am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit 'c296b5738947003c96dfc5b93c86f27b955429ff':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
|
| 94172b1f44c1b12f6ee814d9def6a5550663b716 |
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.
|
| 28ec4daee2711ec247ef7e874730231873129af6 |
27-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| d0c95bd79476e06110c47caea854199a736047a7 |
27-Jan-2011 |
Andreas Huber <andih@google.com> |
am 586096a9: (-s ours) am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '586096a9575a52ea7fa318f6f8540b47ba2ed2e8':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
|
| 05b8794654688079247c5d1d5b59dd0d288fd436 |
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.
|
| 97a38b4f1be201bbbfa23d298bb779fffd624a3d |
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
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
|
| 0152b3345900679b79dff77e88b856016c10cb5b |
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.
|
| 8ce64ddc2828f74704a6473c4b934de16c0e3bd1 |
27-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
|
| 9202cca86e9017cc5ce30970c92a91ab32a0835e |
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
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
|
| d7376cae7aba269dca143b94c3d6736d0ed02213 |
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
|
| 84d3a304c835017cdc530eb9d8e92198021d3e4c |
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
|
| f26fec6212dcada2a1ffb642afe25429d1005aa4 |
27-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Fix month off by one error in date parsing and formatting code" into honeycomb
|
| f67b79baa651874c1f382cb30572e404c776205f |
27-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| ea1db0a716cc937af5371153b959610baa2c6d52 |
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>
edia/mtp/MtpUtils.cpp
|
| 76fd218ca290ffbb33790ae525c494d339da9d28 |
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.
|
| 94eda03f76175dee88cf7941fcbdb6aec43a0d5d |
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.
|
| 70333cca56fd766555e46395e6d9a64c8d82ff49 |
26-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
* commit 'b8efdf7f80d9aa2cbeff881f22d283cf5045c379':
do not merge bug 3370834 Cherrypick from master
|
| ac571749a577c3575793f870e95012ce6637f977 |
26-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master
* commit '1155efdc715413cd7a881e5226b5f5f0b2db8f71':
do not merge bug 3370834 Cherrypick from master
|
| c39aa13da5600571affee13ea8ef3936cc39cbb5 |
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
|
| 548975ddf9e0ea363f4de84a9c7f993d6c6c2666 |
26-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 246108db: Fix for ISSUE 3370836 - Overlay optmization.
* commit '246108db97a5ebfbc7e555fc5c81f10476cd9fbb':
Fix for ISSUE 3370836 - Overlay optmization.
|
| 78f80beb6bc975fa012a0b190c8bd0130bd44db0 |
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.
|
| e89f5d9ef38caec9240a74a9da7974ac5253f623 |
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.
|
| 7757f5010a771fb8824b6fdf9788f588a1577e3f |
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
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
edia/libstagefright/OMXCodec.cpp
|
| 4fd8374fd8ece64599089895d554be73743e7193 |
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.
|
| d0fc955c08ed14ba8e4f0967b4fcef3c10bdcc62 |
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.
|
| 2494373e91399a97ad405f4e42dff6543cc296c7 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb
|
| fccf727542ac3efa1d75234260db73edb53c76a1 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Ignore errors returned from native_window_set_crop." into honeycomb
|
| 43e5eca7048a3b7b3ee0223b7f3cbd837ed10ae5 |
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
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 6592195d76b12a9823f82d3352245d0a6d459647 |
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
edia/libstagefright/OMXCodec.cpp
|
| 87175263c86341c56e4971d3180777800026db66 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
am e328d1c0: am a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb
* commit 'e328d1c0bea62f4dc28210dbcab0da40f4449bf2':
Protect notification callback parameters with a mutex.
|
| 270ea87277c1c601ea26db2af469a930cc4272ad |
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.
|
| b9b84ec91ba7b300bc5ab9378448387733b5048e |
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.
|
| 86ba757ddf906a7b59f0dbba9a2197d823650050 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
am a9f27fa6: Merge "Protect notification callback parameters with a mutex." into honeycomb
* commit 'a9f27fa631ab21d52c75842ccaacc1cbcd75fca0':
Protect notification callback parameters with a mutex.
|
| b7b1486bd55f9fe27f15724452f748045d204fb1 |
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.
|
| aeb38af82d525015ec4d3f2d51671093cd80a0dc |
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.
|
| d3455c0d28c7b663ada8db188aa8dc0a3979e496 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Protect notification callback parameters with a mutex." into honeycomb
|
| 78fc8fab70411c6863d5f71383061f51290294df |
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
|
| 01f394247f3d5851f5bb12c2786b5fee265b6357 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
Protect notification callback parameters with a mutex.
This avoids the race condition where notifications are dispatched to a NULL receiver
after notifications have been disabled.
Change-Id: I6d351ffbee97616e2c35559c132a6c5e6a66948a
related-to-bug: 3394139
nclude/media/MediaPlayerInterface.h
|
| bfa2f13fd3f463dbceea4d3a18c3124e70df0a05 |
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
nclude/media/AudioSystem.h
nclude/media/EffectApi.h
nclude/media/mediarecorder.h
edia/libmedia/AudioSystem.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioHardwareInterface.cpp
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 7bec0b245a514eaccd5df181bb1e10e3d4710876 |
26-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.
|
| 56882aecd7b2fc19804ff95bf6f871289c294c78 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
am 7e2f9cc8: (-s ours) DO NOT MERGE: Fix Matroska issues
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
|
| 222de308544d645a6f32399469f98e9ae0a91721 |
26-Jan-2011 |
Andreas Huber <andih@google.com> |
am e7fbfb6b: (-s ours) Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
* commit 'e7fbfb6b745f56eeb394785932451aa0f2aa07d9':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
|
| 6e1cc6e6e5477693a279185c372b90863778a10b |
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
edia/libstagefright/AudioPlayer.cpp
|
| 0b967b923f7f608b2faa1820167a4f262a2f0720 |
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
edia/libstagefright/HTTPStream.cpp
|
| f8be225b9f6da5d607abfd9525139a241004c858 |
26-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| e6c0750cd2927967f93a8811954f889d23fadb6e |
22-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix for ISSUE 3370836 - Overlay optmization.
Change-Id: I9c6657f6fdab0fa815201d8b26b8c90700663c12
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| ec788f40d6d58ca14a68a3468bf86b300ed70394 |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 5d7d609f: Merge "VideEditor:Fix for 3369908 Removed redundant code." into honeycomb
* commit '5d7d609f47c008599e00e823b20fb3b6961fae95':
VideEditor:Fix for 3369908 Removed redundant code.
|
| 2177d443f2d57b9d3045d535d8f2b186e5b76f25 |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "VideEditor:Fix for 3369908 Removed redundant code." into honeycomb
|
| f5f03976d515d769a0fa973f38a2976ed669a7a7 |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 3c0525f3: Merge "VideoEditor:Issue 3385135, AU_B_Frame changed to AU_P_Frame" into honeycomb
* commit '3c0525f3aad027109d0132b589cb4b434c251a41':
VideoEditor:Issue 3385135, AU_B_Frame changed to AU_P_Frame
|
| 5e5d9d786459948812f8fb903a20b4cd5ec3cbda |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 7e768504: VideoEditor: Fix for issue 3387848 and 3375632
* commit '7e768504a0222d68ab2f9e80fbd670df033aafdb':
VideoEditor: Fix for issue 3387848 and 3375632
|
| 9ce06f4caa9e106b868ef9030e758c3e2a546e6c |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "VideoEditor:Issue 3385135, AU_B_Frame changed to AU_P_Frame" into honeycomb
|
| 5e61cfe5bb05d061ee4ef951b43156e68ff710af |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideoEditor:Issue 3385135, AU_B_Frame changed to AU_P_Frame
Change-Id: I18f82dcf819ba5df67f65d1705cda57b4a73c71d
ibvideoeditor/vss/common/inc/M4SYS_AccessUnit.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
|
| 733100524deb5d2da77ac52a2ff89b2cde242934 |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideoEditor: Fix for issue 3387848 and 3375632
Change-Id: I146deb70e6c494f60bea3e3380c6a80320b5ccf0
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 80458176c35e87358bd8de677e7b32e0af4f8d13 |
26-Jan-2011 |
Mathias Agopian <mathias@google.com> |
am 9392c41b: (-s ours) am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '9392c41b99cb136d6c2a058f6bc3ffb83daf5a46':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
|
| aa2343eb886835e6cbb80b6f042f1f8a8a6eb5ca |
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
|
| e0c2d1574276e7d863d2f600e15f5e837828fd4d |
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
|
| 27c1ad15ba787d58ea7b70e4bd3b4e34ec0d646d |
26-Jan-2011 |
James Dong <jdong@google.com> |
am 13d1cb56: (-s ours) 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
|
| a0c51bbd0ea4c0266b12c9ffa450ccc297160b19 |
26-Jan-2011 |
Mathias Agopian <mathias@google.com> |
am df836892: (-s ours) am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit 'df8368925acd4593a309e06548d7f900bf8d94df':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
|
| 287c34497550ff3f27a5fa3aa15c0049081056d3 |
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
|
| b656f3592332cebfad8944e8692003cf3688d586 |
26-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "StagefrightMediaScanner: Close metadata retriever after we are done scanning" into honeycomb
|
| 5895b78183840f3d56a6e50af26a4b9f778a5b14 |
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
|
| eaae38445a340c4857c1c5569475879a728e63b7 |
25-Jan-2011 |
James Dong <jdong@google.com> |
Report errors to applications if AudioRecord->start() fails
bug - 3385198
Change-Id: I86ac8071eb28a538b333e102192193d1b9eda5eb
edia/libstagefright/AudioSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
|
| 0a095d09464ba18e288a3f529410af0f1257ac2a |
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>
nclude/media/stagefright/StagefrightMediaScanner.h
edia/libstagefright/StagefrightMediaScanner.cpp
|
| f2c71496494409aba6e770a17c0488e25380428e |
26-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3117154"
|
| 1a082f3061c2a444ac6602f321aa334589167f07 |
25-Jan-2011 |
Mathias Agopian <mathias@google.com> |
am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)" into gingerbread
* commit '239fd805ef7c0e4116b0a89e20caaf287e91f017':
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
|
| b1d099197a9385f3afc9411da32a341546991d85 |
19-Jan-2011 |
Mathias Agopian <mathias@google.com> |
fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
nclude/private/surfaceflinger/SharedBufferStack.h
|
| a99efc49f3b115b9f58b809b372c50df82a30599 |
25-Jan-2011 |
Marco Nelissen <marcone@google.com> |
am ba77a3f9: (-s ours) 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
|
| b29a24c534ca753ae9923bf56943e3a75e82391e |
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.
|
| 47fac46eeb5f522fc964bcaadf27512e29d691fb |
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.
|
| 75c4128e01376b271ff35362c34e06c20abc29aa |
25-Jan-2011 |
Andreas Huber <andih@google.com> |
am a79ec961: (-s ours) am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'a79ec961af59ad754cc338a1d3579f9940246b6f':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
|
| df489b929115ea93a0cf689830fe44400ce3c00f |
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
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
|
| 9099343896ff1a1f2444cba372aaab4a0dbb4818 |
25-Jan-2011 |
Andreas Huber <andih@google.com> |
am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'ca1cf59f495dacb132f2a83cefad41d51141a699':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
|
| 958c063ed2b9e255e4b4ffc5c7d5f9939da95c36 |
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.
|
| 4e38fa31abc95e606865e693b1be6180616a4be8 |
25-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Bug 3376700 Add support in APM for stream-specific volume curves"
|
| 47f44fb9b85ac555e5b84b2f5ca8536a85659c3e |
25-Jan-2011 |
Marco Nelissen <marcone@google.com> |
Merge "Increase the number of useful bits in the spectrum." into gingerbread
|
| 61dca6702ce50d937fc764c55bb0842b40dcd0e4 |
25-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3376700 Add support in APM for stream-specific volume curves
The stream volume was handled the same way for all different stream,
the only potential difference between each of them being the number
of steps available to the user to change the volume. This was
mapped to 99 steps of 0.5dB amplitude, offering a maximum attenuation
of -49.5dB.
This change consists in defining for each stream a curve with two
knees (3 segments) for conversion from volume index to attenuation.
This curve is defined in the AudioPolicyManager in
initializeVolumeCurves(), and can therefore be overridden by the
platform.
Note that this change doesn't modify the volume curves: this CL
enables the curves to be changed by overriding this default
behavior.
Change-Id: I575b66799c52df2906db248943b15120b8a79ea2
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 24e15245e0b114ff358bf3aafa2edc99c8087d06 |
25-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 1d2b8e1552306661d0b0f17f3d63381ef03d8876 |
25-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 7ef2fa57: VideoEditor:Fix for Clear Surface API Bug of not able to create empty project
* commit '7ef2fa5706b1193b66b1ad4e0646afd4edd6f233':
VideoEditor:Fix for Clear Surface API Bug of not able to create empty project
|
| 9ec356a232336f80a048c71554ce79474ae1a784 |
25-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideoEditor:Fix for Clear Surface API Bug of not able to create empty project
bug - 3370622
Change-Id: Icb18b3d8afbdb077a93dc5e599ccc20da64703f2
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
|
| 1526a3385d36d6e1953c932410548bf9631a0eb3 |
23-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideEditor:Fix for 3369908 Removed redundant code.
Change-Id: Ia0789f5c6205ad2fc793921bb967bd9ec76e2b9a
ibvideoeditor/vss/common/inc/VideoEditorResampler.h
ibvideoeditor/vss/common/inc/gLVAudioResampler.h
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/VideoEditorResampler.cpp
ibvideoeditor/vss/src/glvaudioresampler.c
|
| 05adea42e17b0af3b90e51945f800aa26a2d0240 |
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
|
| 05b22175a0d186d964694a5162892b6b3476c562 |
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
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
edia/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
|
| 59556c4909a2b681791f2305bf48b5160edd0ba2 |
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
|
| eaf6ab4dcee0c65d06d58e0a3e6f095477a5885c |
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
|
| 4feffd1a8d95cf3843c06a37160580d30d421d8e |
24-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb
|
| 124bd286a895d0fcd3c6586f27a6c0a454236f3f |
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.
|
| b9ff4b4f631239a6a37fe6588e025cb387150c0e |
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
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
edia/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
|
| 25c5e4efeadcc6189df881cf7c5922df775f2e9a |
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.
|
| b64747693f80ce8d88d4d0e0cc040b4623c4d871 |
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)
|
| 7e9d76e8fbadf3acb73bc61452e6f7092bf54736 |
24-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am f6a61c0a: (-s ours) am 39999e3a: (-s ours) am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread
* commit 'f6a61c0abcf5834979245bb596f99f6257f43e5a':
do not merge - Fix issue 3371096.
|
| 30ae68bccd8de6f0ab2acd22a6d661ace514343e |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 339b2ac29492def972b9829efa0d5e1f4b1363ee |
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)
|
| e20e15bcfd0317f63ecf76e6b8e9fbd9196fde0b |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 209821c7b7ead3ac58743d0a6d21dd05a2e77708 |
19-Jan-2011 |
Marco Nelissen <marcone@google.com> |
Increase the number of useful bits in the spectrum.
Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
edia/libmedia/Visualizer.cpp
|
| 59b9326d8e2abdd4b67b4c0a64a4b6af01d304ec |
24-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am 39999e3a: (-s ours) am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread
* commit '39999e3af59599051c6ae0fc8d90cd4bda67ead3':
do not merge - Fix issue 3371096.
|
| d8720a9e32922c2e0c24a95b59737baee6f90435 |
23-Jan-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
am dab58393: VideoEditor: Modified to fill FPS information
* commit 'dab5839386270b4ec08db02ce9f8fa87bc96ca03':
VideoEditor: Modified to fill FPS information
|
| d6dbc5850ca49d7c8b3bc8a6802fa7c85c5b1613 |
23-Jan-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
VideoEditor: Modified to fill FPS information
Change-Id: Ief53ecdfdd9e32e980592f0513ba92993d655d0b
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| b25f87df87f06692da2463285c8a1e65b0934576 |
23-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 7aa9f73b06525781245b8c2970f09f48050a276d |
23-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "New APIs for MTP and PTP host support"
|
| 23f1b33c5f88f07510ca5dc01b3afd7af6843d6c |
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>
edia/mtp/Android.mk
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| 4448e05139b90fd04008a0a53d92fff53ee8a827 |
22-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
am f1762fd2: am 2d044d1f: Merge "Remove MTP related log spam" into honeycomb
* commit 'f1762fd25f326dde776a248c193b8eccc2dfddff':
Remove MTP related log spam
|
| 939bd35c377862ed76bd1b5c634efd1e3f2e9a98 |
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
|
| 5aae7c2895dcf1716ea66c440b7e569e84dcd5b5 |
22-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "Remove MTP related log spam" into honeycomb
|
| 5f0e70378a7c4bf7ebbd57a3911e3c8c64214005 |
22-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 59d6ae5e339547fea8a350c1d855b52d5ac4f62c |
22-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Remove MTP related log spam
Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorage.cpp
|
| f0cf63fff696b30a0b5760bb637efb1aa9bf1f55 |
22-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3361124 Remove drmioserver, continued"
|
| 49e9a5c2c2037f570d036e270dfef4b8f28e7d3f |
22-Jan-2011 |
Dave Sparks <davidsparks@android.com> |
am 817ddaf9: (-s ours) am b6e89aff: (-s ours) am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit '817ddaf979d66858e02444ae3ff3dfe02dea288e':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
|
| e717633851ea07c2c7581dfba4915bbe27d9640a |
22-Jan-2011 |
Dave Sparks <davidsparks@android.com> |
am b6e89aff: (-s ours) am 65d39eeb: Merge "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor." into gingerbread
* commit 'b6e89affd5d119f40e5c8a40f2d4f29ca5e534ca':
DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.
|
| 3950125472675b07f220d7f91df5a2d7b1489836 |
22-Jan-2011 |
Andreas Huber <andih@google.com> |
am d34b7aab: (-s ours) am 66e35c24: (-s ours) am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
* commit 'd34b7aab38503a743e06f7e4e2c974e4d9716984':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
|
| 3862c5a4ac16121538f66e2cf46ffc2b9b7ac50d |
22-Jan-2011 |
Andreas Huber <andih@google.com> |
am 66e35c24: (-s ours) am e9a00235: Merge "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"" into gingerbread
* commit '66e35c240e6105934e76cabfafed385f95f013ba':
DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking "connect"
|
| 93057e20f3bdcfa368b662049bdd13c9d47cc4b4 |
22-Jan-2011 |
Carl Shapiro <cshapiro@google.com> |
am 48e8ec61: am 366d15d5: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs."" into honeycomb
* commit '48e8ec611a6ce4d5fa23830b1ebd24cfbc1c84f2':
Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."
|
| 4c81192920777cd6884c6e4eeb4dea5f00451d88 |
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."
|
| 8aded52c4d6962da5357d4bfc0bca4be3aa331ef |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 21ae1d9cdf7ed1e0cc211431ced2ce4d9cf7d02f |
21-Jan-2011 |
Andreas Huber <andih@google.com> |
am 3564d9ea: am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb
* commit '3564d9eada7ae3f40bc4c80272fbbb867f04e018':
Properly rotate video that's marked as such and decoded to a surface.
|
| e8600e37d70d5570d73353e892edb00dd872d1c5 |
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.
|
| 7fac331b39ca49ce49a67e425dcc031a3cb9e97f |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 5688459765a29875a7bd11d05b8965fb91525614 |
21-Jan-2011 |
Andreas Huber <andih@google.com> |
am 9a62d902: am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
* commit '9a62d902ead8f94fa0ce071300e3767bfb976d8b':
Some tweaks to HTTP live / nuplayer behaviour
|
| 42ab78068f67d5b22fbfbcf40448bae505d543ca |
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
|
| a9a5ea4d45c6a6e81039bbd5db9f2fc846861aa3 |
21-Jan-2011 |
Santosh Madhava <smadhava@google.com> |
am 25d6699c: Fix for issue 3372755 : File descriptor leak
* commit '25d6699c194a9719997c79dfb95bd66673825b7b':
Fix for issue 3372755 : File descriptor leak
|
| 39fd6ce3c83daaccae47e9b3b68cdc6a89256424 |
21-Jan-2011 |
Andreas Huber <andih@google.com> |
am ec0c94b7: am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
* commit 'ec0c94b7d70c1e4160e1ec57070b94d052de7eb5':
Implement missing pause/resume support for NuPlayer.
|
| bc7f5b2e56107cfeaeeab13cf8979379e3c2f139 |
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
nclude/media/stagefright/foundation/ADebug.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
|
| 44482001e106cfb7389110f869ddae381f8a2da7 |
21-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3361124 Remove drmioserver, continued
Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
rm/common/Android.mk
rm/common/IDrmIOService.cpp
rm/libdrmframework/include/DrmIOService.h
rm/libdrmframework/include/IDrmIOService.h
|
| 8a499cda5d5ae125638dc2da61a57d385c1f5a0d |
21-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 3ad01762633531957174c5b27e71ca4aac45e554 |
21-Jan-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3372755 : File descriptor leak
Change-Id: Ib1471078dbbcb595422fd481e5a3368e79e39e19
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 2b61341c6308b99254b504a7fa9d890200796369 |
21-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread
* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
do not merge - Fix issue 3371096.
|
| b23ef145ac2a62068a6a8848f1f5d8a74f9c2b34 |
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.
|
| 2324edf081300b0a588d498667806452e13f21ea |
21-Jan-2011 |
Mathias Agopian <mathias@google.com> |
am 612d7f3c: am a423d868: Merge "clean-up unneeded code" into honeycomb
* commit '612d7f3c092ec2c4a2ae44cb09d6dfb4e525a659':
clean-up unneeded code
|
| 4806f06c2e380c176eee4f599a0d7a93949fc4e4 |
21-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| ffaee8a4c3d99342445c92254c42160512583180 |
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.
|
| 1c3913cf94572c4bfa2c6f7a98925787c5499b69 |
21-Jan-2011 |
Mathias Agopian <mathias@google.com> |
am a423d868: Merge "clean-up unneeded code" into honeycomb
* commit 'a423d868009b9961597365ce7f190aef23f4b1cc':
clean-up unneeded code
|
| b408222bd9479c291874b607acae1425d6154fe7 |
21-Jan-2011 |
Andreas Huber <andih@google.com> |
Implement missing pause/resume support for NuPlayer.
Change-Id: Ia3f1ce521dd4b70e134ef03aa7c9db8e8d39a134
related-to-bug: 2368598
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
|
| adde7faabd165ebf69eaf64f62eb6792032a350a |
20-Jan-2011 |
Mathias Agopian <mathias@google.com> |
Merge "clean-up unneeded code" into honeycomb
|
| 9383d1a2197479e4d2ac4571c7fbe424f93e3b93 |
20-Jan-2011 |
Mathias Agopian <mathias@google.com> |
clean-up unneeded code
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
nclude/private/surfaceflinger/SharedBufferStack.h
|
| b517e006b51c95db9c44bf5f104f562d431ae597 |
20-Jan-2011 |
Eric Laurent <elaurent@google.com> |
do not merge - Fix issue 3371096.
EffectModule::process() was copying effect chain input buffer to
output buffer if no effect was active instead of accumulating it.
Change-Id: If4ca75601ea69a088d0f71d88aec53e90a1dec89
ervices/audioflinger/AudioFlinger.cpp
|
| 9751ad130d2e8ac7fd6b890760adbcf9a28385b9 |
20-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am 4dcaeb6d: am 404946fc: Merge "Fix issue 3371096." into honeycomb
* commit '4dcaeb6d776bc87469a97001a223099c8e805579':
Fix issue 3371096.
|
| 87b0438aed11ed7f5e7cc442a5300eb5f20ebdc5 |
20-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am 404946fc: Merge "Fix issue 3371096." into honeycomb
* commit '404946fc260e5dff23c8a0db12e33ff842ab4b47':
Fix issue 3371096.
|
| da00f9c4b83fbb0076d5cadbfca76097cb22086c |
20-Jan-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3371096." into honeycomb
|
| 2d9e5440ef937c860b4771aaa3b6f406615eb8d2 |
20-Jan-2011 |
James Dong <jdong@google.com> |
am 3230f1a9: am 637739d4: Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
* commit '3230f1a97db64e2d4ac3a0c691955f1a259d425a':
Eliminate recording sound by starting the video track before audio track.
|
| 48086f7b1d7c48bc849118b0203f4fb983334ce3 |
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.
|
| 737be0d7937e5ab61f0ddb8db1f3835f171300f1 |
20-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
|
| e53477331052710347e9a43a3225e59328c3ed33 |
20-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 64e314c4: Merge "Fix 3367037 Transition are of low Quality" into honeycomb
* commit '64e314c4719f0e06e2f1032b262b49c3fcb6a576':
Fix 3367037 Transition are of low Quality
|
| a1e6f4953fa3212a232b85b8df083c522c1a7ec3 |
20-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 8842cc1c: Merge "Change preview player code also." into honeycomb
* commit '8842cc1cf2a5c7bdf9fdc33ba3b72f4ab231d41d':
Change preview player code also.
|
| ed95045a6936b92f46166d85baa1b00c41a9af94 |
20-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "Fix 3367037 Transition are of low Quality" into honeycomb
|
| 2909d435a1b3c68f65b1deca628c1a6b58d7ffdb |
20-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "Change preview player code also." into honeycomb
|
| b4ce0b8e095749a715175066350906a0579dcc3a |
20-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 7bd460110b27a979384dda351788eac95d8467f5 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| c6a88ac5d620a5cd47b2741a915d661aab8fe0b4 |
20-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix 3367037 Transition are of low Quality
Change-Id: I511546aef895edbfed16fc855bada93486dd886a
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
|
| 35cb2de64cb6482a08f446e80733e7d344a0dcac |
20-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Change preview player code also.
Adapt to 32 bit aligned decoder buffers
Change-Id: I631f7e60b8e424af496f45d0e5e292bf9e8a9dde
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/lvpp/VideoEditorTools.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
|
| 73337489229cc9b50371c7a9fcd86e9f00ea46d0 |
20-Jan-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 3371096.
EffectModule::process() was copying effect chain input buffer to
output buffer if no effect was active instead of accumulating it.
Change-Id: I2838af2e7b6654d0a76547625929a5453da68d02
ervices/audioflinger/AudioFlinger.cpp
|
| e21495572bebb9c7b5fad745ca1516e53e8fd395 |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
More fix for 64 bit offset.
|
| 5cc52d46226bf1ab6faa8910413153c0b86dc5c9 |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
More fix for 64 bit offset.
|
| 91a685f1eaa32cadb461755fb235239b308953c9 |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
Merge "More fix for 64 bit offset." into honeycomb
|
| 6e3edc2dffb0d424b02ac57b55114b0d13163f56 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
|
| 2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
More fix for 64 bit offset.
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
rm/common/IDrmManagerService.cpp
|
| 62c64c48f8ae8142b893b20cf08fab2cb2a1d69f |
20-Jan-2011 |
Andreas Huber <andih@google.com> |
am 559da2fd: am 3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
* commit '559da2fd899dcd88ccea3f7df31a27b41d6ca074':
Prefill the cache before trying to instantiate the media extractor.
|
| f16e4df61fb5482adffa1a541de985c48506ff28 |
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.
|
| 1c705e94c291897d23d236a7d118a68eace74406 |
20-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
|
| ac05c317cd818701535c5d72ce90da98c4bae75b |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
|
| c1c4de8bb19f378420285863816aa3cbdf6e8b70 |
19-Jan-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
am 7736b9a8: Merge "Video Editor: Fix for seek in exported clip" into honeycomb
* commit '7736b9a845059f503d980bfa64ccb45c303608ec':
Video Editor: Fix for seek in exported clip
|
| 7215b678d1e8f85a235d8d284c22be3da134a2c4 |
19-Jan-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
Merge "Video Editor: Fix for seek in exported clip" into honeycomb
|
| 2c036f7a42f813f814308421a61b84502e3a355a |
19-Jan-2011 |
James Dong <jdong@google.com> |
am aa474aa6: am fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb
* commit 'aa474aa6f9857272c5f74a14d8ab026ae8fc55c3':
Logging the duration range from different media tracks for recording
|
| cafbd578dcff2bcbe025b2757f9a163f2b8a5398 |
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
|
| 886c09ee81eb7b8878e487c7f801ea8ddb27c17c |
19-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Logging the duration range from different media tracks for recording" into honeycomb
|
| 9575717088e9f615e17d28f69581d3ea748a39e2 |
19-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 18790752: Remove the eng developement LOCALtags in makefiles
* commit '187907528a538105f1643b59da3e2f9f0f667a2f':
Remove the eng developement LOCALtags in makefiles
|
| bf3270869c4734e6b628d0a0dbd46015f622ea4a |
19-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Remove the eng developement LOCALtags in makefiles
Change-Id: I6da8691dba062cd54410ffafde27b7eca0b73aa2
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/vss/3gpwriter/src/Android.mk
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
|
| 7b6cdfc24a02f5bb72668ec7642ca06d937f981a |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
am 4026ea7c: am 0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
* commit '4026ea7c25089e88a49920035b937ab95ed47029':
Always revert to the previous bandwidth if the required sequence number cannot be found
|
| d049c605e68163aa01633dd76b4cc12c95cca5c5 |
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
|
| 65b3d76025c71d755b0fb3b6ead90255f25417ed |
19-Jan-2011 |
James Dong <jdong@google.com> |
Logging the duration range from different media tracks for recording
Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
edia/libstagefright/MPEG4Writer.cpp
|
| 02754925feadfbfb6bb07a6087e200c8d7c0cc41 |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
am ee48eaba: am 71bb6a2a: Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb
* commit 'ee48eabab8c32104eb04e2abb6f6212b94f32211':
Return a runtime error if decryption fails instead of asserting.
|
| 6bfb9ea1529f2823c79df3e4ae83453dfa888fc4 |
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.
|
| 88b7ad413c4b6d08697069b18488641d6ce31fd3 |
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
edia/libstagefright/httplive/LiveSession.cpp
|
| 88b348910a607ae399bcd693dd42a231d98da2c9 |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
Return a runtime error if decryption fails instead of asserting.
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
edia/libstagefright/httplive/LiveSession.cpp
|
| 18f7b4d9e9e21ede59fffae70336cd08a0489841 |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
am 8da1ca52: am 069ee21a: Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
* commit '8da1ca52808f81f41919e118c3667b794ee31f6b':
Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.
|
| d64d62616048f733bc3034249e56641164528f05 |
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.
|
| 662cb2487ed513ff3ac26b104b5715c01d78419c |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb
|
| b391290130f263441334ee4525a5832f0bea2ef0 |
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
edia/libmedia/IOMX.cpp
|
| bdbd7c6da5731becda6c467855e2240e159f8c67 |
19-Jan-2011 |
James Dong <jdong@google.com> |
am 6df89f2e: am 8e7d6263: Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb
* commit '6df89f2efc587b33134c545f594a5b1ac2cd9fbb':
Expose average video frame rate via MPEG4Extractor
|
| a027eaf8b23118354ffef89b40cc36bf93f1c769 |
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
|
| 113a95462d2018c62b9e6bc86e7f643ff46f29cf |
19-Jan-2011 |
James Dong <jdong@google.com> |
Expose average video frame rate via MPEG4Extractor
bug - 3362483
Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
edia/libstagefright/MPEG4Extractor.cpp
|
| 761645bfdb5cb848380762491c0dde9f44027c7e |
19-Jan-2011 |
James Dong <jdong@google.com> |
am 1324e3b1: am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
* commit '1324e3b1a4246f77d516b37fa98013ffad91268e':
Fix the presentation video resolution when it is different from the actual image resolution of the video.
|
| a5939efeaf8be373ee71941466ad5a2db1750881 |
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.
|
| e75ceba6e3f009118c5debbbe2de268beb350c9a |
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
|
| 2548b06179016c69d02a1655fbf48ab07a13bb72 |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
am d3bf3eea: am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
* commit 'd3bf3eeadd59748b9cbe7535378b4bdf8dd8f117':
Turn another assertion into a runtime error. Damn you surfaces.
|
| aa46ce8ac441981ecbf9e72fb4acc6677615efc9 |
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.
|
| 7509d7725207bfc28f7757c18518e21110c0736d |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
|
| c1fcccc92622927c1fe158c80dfaa5d6af4d4371 |
19-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am 42ac3249: am 42466b1c: Merge "Tentative fix for issue 3362362." into honeycomb
* commit '42ac32498aea67a43f666946c4b77a376f54cfaf':
Tentative fix for issue 3362362.
|
| 09ad2d8994ac770f60607dc3b1c848531ce076e9 |
19-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am 42466b1c: Merge "Tentative fix for issue 3362362." into honeycomb
* commit '42466b1cad4cec1aa746809dfcca702456415be4':
Tentative fix for issue 3362362.
|
| a91992013f26cd6ad293d3599c13601e0df7994d |
19-Jan-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Tentative fix for issue 3362362." into honeycomb
|
| 018761c5cc4aefd0495eaa4666f2372a59a7980a |
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
edia/libstagefright/OMXCodec.cpp
|
| 935752053ef2691dbb6d5a6d149e0e362c6e3c74 |
19-Jan-2011 |
Eric Laurent <elaurent@google.com> |
Tentative fix for issue 3362362.
The problem is likely that one method is called on the AudioPolicyManagerBase
instance while it is still being constructed by AudioPolicyService.
To avoid this, the AudioPolicyService mutex is held by the constructor until the
platform specific AudioPolicyManager is constructed and the member
mpPolicyManager initialized.
Also added an initCheck() method to AudioPolicyInterface to verify successful
initialization of AudioPolicyManager.
A similar change is done in AudioFlinger constructor.
Also added some missing protections in AudioFlinger methods where the
playback thread list is parsed.
Change-Id: I006b244ec057e1bb0aa5ebe426ef006e3b171056
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyManagerBase.cpp
ervices/audioflinger/AudioPolicyService.cpp
|
| b45c01c2b8588ff431b511151666a55a39f0a6ae |
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
nclude/media/stagefright/MetaData.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| ea59c3e26a903af458cb1cadaeed869a99bf5680 |
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"
|
| 6c2e4dcbb15d91f8b5970587afa21d642446f08c |
19-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| f6a039c84e3bfb432a57d976d0774355217fdb4e |
19-Jan-2011 |
James Dong <jdong@google.com> |
am 456570ef: am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
* commit '456570ef558d99200bdd9ffb80be22f157e17c53':
Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
|
| f6e3b6d3f097fca569dad806de426a4c6af5200c |
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
|
| 6707d77e643182e81e0fdfc249d09bd602b02170 |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
am f9846fcd: am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
* commit 'f9846fcdf89432d05c713a5f356a0bd1447d3cf1':
Apparently our native TCP sockets do not return an error from blocking "connect"
|
| ba89aeb3bd42fc97f9ded783cc398dbbd368b88f |
19-Jan-2011 |
James Dong <jdong@google.com> |
am d2225a06: am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
* commit 'd2225a06a315db9988236dcf5c5bca743f6d457d':
Fix the sluggish preview during timelapse video recording because software encoder is used.
|
| 4a259948da48dae228bf4d347adb27739ed58734 |
19-Jan-2011 |
James Dong <jdong@google.com> |
am 7644ae1d: Merge "Fix git_master-without-vendor build" into honeycomb
* commit '7644ae1d2da7c01aeb3a979f808d5e10f2961315':
Fix git_master-without-vendor build
|
| 2b4883641e324c50a2ee24c5bd15170c7d31e57d |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 13ecfb62545e521f807239864dc74ca1c295e3fa |
19-Jan-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
Video Editor: Fix for seek in exported clip
Change-Id: I5f519a9a987b3bfbff7ab9e6057a8a94be527982
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
|
| 0bae33c783a5929fe44d41da781d56c6e109421a |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
am 63e99c39: am 529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
* commit '63e99c39e1e1a0dd7989bb858447b3ca76738554':
Implement parsing of vbv buffering info in RTSP.
|
| fd1ad35b9cc4ffe2be3bb734c4e8bc65e9769f78 |
19-Jan-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
am 6d7d0da9: am 3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb
* commit '6d7d0da9fb5bc52282b3d1d1fc2ac6ad8a4eb01b':
Don't report 100% buffered when the stream ends prematurely.
|
| 003845d3a65c31283256d9c94387674bfb4e746b |
19-Jan-2011 |
Gloria Wang <gwang@google.com> |
Merge "rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/"
|
| f4c056aeacad2dac60a83ccd7928bfeaa9d6ddf6 |
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
edia/libstagefright/HTTPStream.cpp
|
| a2aba71b29fd7a201b3123736823fa2556dee2c6 |
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"
|
| de16890e98cdd241398ed155cd47daf061584a77 |
19-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
|
| 368ef16787c3fe2334dadc767e7418b610c83cbd |
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
edia/libstagefright/HTTPStream.cpp
|
| 0a32d7981b98fdfca48a1e35ca746f1cc11849d3 |
19-Jan-2011 |
Gloria Wang <gwang@google.com> |
rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
|
| 915cde53d1d1c9a1549f180d377db0b64a53233e |
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.
|
| 31389148f4ab7587e150f4043b7379eaefe2af2b |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 9b535e8217fed00778d095bab508d9d1bc13402e |
18-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix git_master-without-vendor build
Change-Id: Ia5944bd87ae788b070ff9e44b3428a303fb45ca5
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| cd6155846aa6f61ba9d958843a134656596ac0e7 |
18-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Fix git_master-without-vendor build" into honeycomb
|
| ba119eb166c9c06060c3d05b23202402287d7566 |
18-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix git_master-without-vendor build
Change-Id: Ia1ceb9d2d11725950c1cdc3215661830842c51fb
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/vss/stagefrightshells/src/Android.mk
|
| c8452c13ead79c476f9de56e3bbf461d448b60f4 |
18-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
am f9828f65: am 0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb
* commit 'f9828f6584ddbab9aab3abdbc47ef355651e7bfb':
MTP: Fix problems with modification dates for folders and non-media files
|
| 0db958fd28db5919a6cc14c2088161160abe3788 |
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.
|
| bf6489f8b4c03dda70bf7a549702b98da497e348 |
18-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
|
| e8036de113ba88646724ab6fd5d7bb5d248b46f2 |
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.
|
| 126983a5afae1a554a8bb26711bb01edb1ddf5b1 |
18-Jan-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Merge "Don't report 100% buffered when the stream ends prematurely." into honeycomb
|
| f203a0f833a3f215f9971444e7192bd905a11ebf |
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
|
| 21a6f9ffee8b3c014abfe165b8f7fd2224f49e1f |
18-Jan-2011 |
Andreas Huber <andih@google.com> |
Implement parsing of vbv buffering info in RTSP.
Change-Id: I7d871cafda2c4c65670a40ad9ab4f24317f8568a
related-to-bug: 3351915
edia/libstagefright/rtsp/APacketSource.cpp
|
| 1bd233ce7e1aa7730bc18d46ffd57791391738cd |
18-Jan-2011 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Don't report 100% buffered when the stream ends prematurely.
Change-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| aa95240d9096f97aa2e2022fae8764a4386c8951 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
|
| f6ec40fd5890f014f4a64c48a6b1be308c2886ec |
18-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 54fdc70b5592e4095b892b63bae4102f11399bfd |
18-Jan-2011 |
James Dong <jdong@google.com> |
Merge "support lowercase only files." into honeycomb
|
| 1fe449592af9c4e34f6e0d0f5e1f5dca37c7d715 |
18-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
support lowercase only files.
Change-Id: I2f22697a7847d14527b666980fc88412c6c49bdf
ibvideoeditor/osal/src/M4OSA_FileCommon.c
|
| 945956bb7126e483c3bcf7583c9f7acaae952830 |
18-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
videoeditor osal files check in on honeycomb
Change-Id: Ibb1f20329fbc6bb1629f5d6d4588eb6966f1c1ab
ibvideoeditor/osal/src/M4OSA_FileCommon.c
|
| bdda424ecfd2825c15b2360770da8c950c715c47 |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am bf6ccb04: am 307003a8: Merge "integrate videoeditor preview player." into honeycomb
* commit 'bf6ccb04b93f7a2738f29f2d96a69f32f7602f51':
integrate videoeditor preview player.
|
| 67cde67ff08b94ece035ac35a7a1b33b01677b1f |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 307003a8: Merge "integrate videoeditor preview player." into honeycomb
* commit '307003a844c90458bcfd7398c44bbae734936238':
integrate videoeditor preview player.
|
| 524effb5b841da901a141160480a6b00d1d9861f |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "videoeditor osal files check in on honeycomb" into honeycomb
|
| 9bbde4c405b538677ae2892ec5104f74d8a19ec6 |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "videoeditor preview code on honeycomb" into honeycomb
|
| 7c9d8018755adf1857571125ba1b3598c96ea506 |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Removed unwanted line in M4READER_Amr.h
vss core files upload on honeycomb
Change-Id: I61206ae2398ce8ac544c6fb01a76fe8917bce75b
ibvideoeditor/Android.mk
ibvideoeditor/vss/3gpwriter/Android.mk
ibvideoeditor/vss/3gpwriter/inc/M4MP4W_Types.h
ibvideoeditor/vss/3gpwriter/inc/M4MP4W_Utils.h
ibvideoeditor/vss/3gpwriter/inc/M4MP4W_Writer.h
ibvideoeditor/vss/3gpwriter/src/Android.mk
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Interface.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
ibvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
ibvideoeditor/vss/Android.mk
ibvideoeditor/vss/common/inc/From2iToMono_16.h
ibvideoeditor/vss/common/inc/LVM_Types.h
ibvideoeditor/vss/common/inc/M4AD_Common.h
ibvideoeditor/vss/common/inc/M4AD_Null.h
ibvideoeditor/vss/common/inc/M4AIR_API.h
ibvideoeditor/vss/common/inc/M4AMRR_CoreReader.h
ibvideoeditor/vss/common/inc/M4CLOCK.h
ibvideoeditor/vss/common/inc/M4Common_types.h
ibvideoeditor/vss/common/inc/M4DA_Types.h
ibvideoeditor/vss/common/inc/M4DECODER_Common.h
ibvideoeditor/vss/common/inc/M4ENCODER_AudioCommon.h
ibvideoeditor/vss/common/inc/M4ENCODER_common.h
ibvideoeditor/vss/common/inc/M4MDP_API.h
ibvideoeditor/vss/common/inc/M4OSA_CoreID.h
ibvideoeditor/vss/common/inc/M4PCMR_CoreReader.h
ibvideoeditor/vss/common/inc/M4READER_3gpCom.h
ibvideoeditor/vss/common/inc/M4READER_Amr.h
ibvideoeditor/vss/common/inc/M4READER_Common.h
ibvideoeditor/vss/common/inc/M4READER_Pcm.h
ibvideoeditor/vss/common/inc/M4SYS_AccessUnit.h
ibvideoeditor/vss/common/inc/M4SYS_Stream.h
ibvideoeditor/vss/common/inc/M4TOOL_VersionInfo.h
ibvideoeditor/vss/common/inc/M4VD_EXTERNAL_Interface.h
ibvideoeditor/vss/common/inc/M4VD_EXTERNAL_Internal.h
ibvideoeditor/vss/common/inc/M4VD_HW_API.h
ibvideoeditor/vss/common/inc/M4VD_Tools.h
ibvideoeditor/vss/common/inc/M4VE_API.h
ibvideoeditor/vss/common/inc/M4VFL_transition.h
ibvideoeditor/vss/common/inc/M4VIFI_Clip.h
ibvideoeditor/vss/common/inc/M4VIFI_Defines.h
ibvideoeditor/vss/common/inc/M4VIFI_FiltersAPI.h
ibvideoeditor/vss/common/inc/M4VPP_API.h
ibvideoeditor/vss/common/inc/M4WRITER_common.h
ibvideoeditor/vss/common/inc/M4_BitStreamParser.h
ibvideoeditor/vss/common/inc/M4_Common.h
ibvideoeditor/vss/common/inc/M4_Logo.h
ibvideoeditor/vss/common/inc/M4_Utils.h
ibvideoeditor/vss/common/inc/M4_VideoEditingCommon.h
ibvideoeditor/vss/common/inc/MonoTo2I_16.h
ibvideoeditor/vss/common/inc/NXPSW_CompilerSwitches.h
ibvideoeditor/vss/common/inc/NXPSW_CompilerSwitches_MCS.h
ibvideoeditor/vss/common/inc/SSRC.h
ibvideoeditor/vss/common/inc/gLVAudioResampler.h
ibvideoeditor/vss/common/inc/marker.h
ibvideoeditor/vss/inc/M4EXIFC_CommonAPI.h
ibvideoeditor/vss/inc/M4PTO3GPP_API.h
ibvideoeditor/vss/inc/M4PTO3GPP_ErrorCodes.h
ibvideoeditor/vss/inc/M4PTO3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4VSS3GPP_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_ErrorCodes.h
ibvideoeditor/vss/inc/M4VSS3GPP_Extended_API.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalConfig.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalFunctions.h
ibvideoeditor/vss/inc/M4VSS3GPP_InternalTypes.h
ibvideoeditor/vss/inc/M4xVSS_API.h
ibvideoeditor/vss/inc/M4xVSS_Internal.h
ibvideoeditor/vss/mcs/Android.mk
ibvideoeditor/vss/mcs/inc/M4MCS_API.h
ibvideoeditor/vss/mcs/inc/M4MCS_ErrorCodes.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalConfig.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalFunctions.h
ibvideoeditor/vss/mcs/inc/M4MCS_InternalTypes.h
ibvideoeditor/vss/mcs/src/Android.mk
ibvideoeditor/vss/mcs/src/M4MCS_API.c
ibvideoeditor/vss/mcs/src/M4MCS_AudioEffects.c
ibvideoeditor/vss/mcs/src/M4MCS_BitstreamParser.c
ibvideoeditor/vss/mcs/src/M4MCS_Codecs.c
ibvideoeditor/vss/mcs/src/M4MCS_MediaAndCodecSubscription.c
ibvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
ibvideoeditor/vss/src/Android.mk
ibvideoeditor/vss/src/M4AD_Null.c
ibvideoeditor/vss/src/M4AIR_API.c
ibvideoeditor/vss/src/M4AMRR_CoreReader.c
ibvideoeditor/vss/src/M4ChannelCoverter.c
ibvideoeditor/vss/src/M4PCMR_CoreReader.c
ibvideoeditor/vss/src/M4PTO3GPP_API.c
ibvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
ibvideoeditor/vss/src/M4READER_Amr.c
ibvideoeditor/vss/src/M4READER_Pcm.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
ibvideoeditor/vss/src/M4VD_EXTERNAL_Interface.c
ibvideoeditor/vss/src/M4VD_Tools.c
ibvideoeditor/vss/src/M4VIFI_xVSS_RGB565toYUV420.c
ibvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
ibvideoeditor/vss/src/M4VSS3GPP_Clip.c
ibvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
ibvideoeditor/vss/src/M4VSS3GPP_Codecs.c
ibvideoeditor/vss/src/M4VSS3GPP_Edit.c
ibvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
ibvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
ibvideoeditor/vss/src/M4VSS3GPP_MediaAndCodecSubscription.c
ibvideoeditor/vss/src/M4xVSS_API.c
ibvideoeditor/vss/src/M4xVSS_internal.c
ibvideoeditor/vss/src/glvaudioresampler.c
ibvideoeditor/vss/stagefrightshells/Android.mk
ibvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h
ibvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h
ibvideoeditor/vss/stagefrightshells/src/Android.mk
ibvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
ibvideoeditor/vss/stagefrightshells/src/VideoEditorMp3Reader.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
ibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
ibvideoeditor/vss/video_filters/Android.mk
ibvideoeditor/vss/video_filters/src/Android.mk
ibvideoeditor/vss/video_filters/src/M4VFL_transition.c
ibvideoeditor/vss/video_filters/src/M4VIFI_BGR565toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_Clip.c
ibvideoeditor/vss/video_filters/src/M4VIFI_RGB888toYUV420.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeRGB888toRGB888.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoBGR565.c
ibvideoeditor/vss/video_filters/src/M4VIFI_ResizeYUVtoRGB565.c
|
| 643290dc4c83da23b1b8ff4ed71118203274bb15 |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
videoeditor preview code on honeycomb
Change-Id: I9c3c9cb921ea697ab16732973d26ef9035cda2ee
ibvideoeditor/lvpp/Android.mk
ibvideoeditor/lvpp/DummyAudioSource.cpp
ibvideoeditor/lvpp/DummyAudioSource.h
ibvideoeditor/lvpp/DummyVideoSource.cpp
ibvideoeditor/lvpp/DummyVideoSource.h
ibvideoeditor/lvpp/PreviewPlayer.cpp
ibvideoeditor/lvpp/PreviewPlayer.h
ibvideoeditor/lvpp/PreviewRenderer.cpp
ibvideoeditor/lvpp/PreviewRenderer.h
ibvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
ibvideoeditor/lvpp/VideoEditorAudioPlayer.h
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
ibvideoeditor/lvpp/VideoEditorBGAudioProcessing.h
ibvideoeditor/lvpp/VideoEditorPlayer.cpp
ibvideoeditor/lvpp/VideoEditorPlayer.h
ibvideoeditor/lvpp/VideoEditorPreviewController.cpp
ibvideoeditor/lvpp/VideoEditorPreviewController.h
ibvideoeditor/lvpp/VideoEditorSRC.cpp
ibvideoeditor/lvpp/VideoEditorSRC.h
ibvideoeditor/lvpp/VideoEditorTools.cpp
ibvideoeditor/lvpp/VideoEditorTools.h
|
| ccb3506ed1845121b94f4e27244e61a46eb19815 |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
integrate videoeditor preview player.
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/include/AwesomePlayer.h
|
| 855ec7c4be7ad642721909d5837a8d25a117c22f |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
videoeditor osal files check in on honeycomb
Change-Id: Id6c5f9f8819158ebffa9fd4dbbf5979a0e5f5808
ibvideoeditor/osal/Android.mk
ibvideoeditor/osal/inc/LVOSA_FileReader_optim.h
ibvideoeditor/osal/inc/LV_Macros.h
ibvideoeditor/osal/inc/LV_Types.h
ibvideoeditor/osal/inc/M4OSA_CharStar.h
ibvideoeditor/osal/inc/M4OSA_Clock.h
ibvideoeditor/osal/inc/M4OSA_CoreID.h
ibvideoeditor/osal/inc/M4OSA_Debug.h
ibvideoeditor/osal/inc/M4OSA_Error.h
ibvideoeditor/osal/inc/M4OSA_Export.h
ibvideoeditor/osal/inc/M4OSA_FileAccess.h
ibvideoeditor/osal/inc/M4OSA_FileCache.h
ibvideoeditor/osal/inc/M4OSA_FileCommon.h
ibvideoeditor/osal/inc/M4OSA_FileCommon_priv.h
ibvideoeditor/osal/inc/M4OSA_FileExtra.h
ibvideoeditor/osal/inc/M4OSA_FileReader.h
ibvideoeditor/osal/inc/M4OSA_FileReaderRam.h
ibvideoeditor/osal/inc/M4OSA_FileReader_priv.h
ibvideoeditor/osal/inc/M4OSA_FileWriter.h
ibvideoeditor/osal/inc/M4OSA_FileWriterRam.h
ibvideoeditor/osal/inc/M4OSA_FileWriter_priv.h
ibvideoeditor/osal/inc/M4OSA_Memory.h
ibvideoeditor/osal/inc/M4OSA_Mutex.h
ibvideoeditor/osal/inc/M4OSA_OptionID.h
ibvideoeditor/osal/inc/M4OSA_Semaphore.h
ibvideoeditor/osal/inc/M4OSA_String.h
ibvideoeditor/osal/inc/M4OSA_String_priv.h
ibvideoeditor/osal/inc/M4OSA_Thread.h
ibvideoeditor/osal/inc/M4OSA_Thread_priv.h
ibvideoeditor/osal/inc/M4OSA_Time.h
ibvideoeditor/osal/inc/M4OSA_Types.h
ibvideoeditor/osal/src/Android.mk
ibvideoeditor/osal/src/LVOSA_FileReader_optim.c
ibvideoeditor/osal/src/M4OSA_CharStar.c
ibvideoeditor/osal/src/M4OSA_Clock.c
ibvideoeditor/osal/src/M4OSA_FileCache.c
ibvideoeditor/osal/src/M4OSA_FileCommon.c
ibvideoeditor/osal/src/M4OSA_FileExtra.c
ibvideoeditor/osal/src/M4OSA_FileReader.c
ibvideoeditor/osal/src/M4OSA_FileReader_RAM.c
ibvideoeditor/osal/src/M4OSA_FileWriter.c
ibvideoeditor/osal/src/M4OSA_FileWriter_RAM.c
ibvideoeditor/osal/src/M4OSA_Mutex.c
ibvideoeditor/osal/src/M4OSA_Random.c
ibvideoeditor/osal/src/M4OSA_Semaphore.c
ibvideoeditor/osal/src/M4OSA_String.c
ibvideoeditor/osal/src/M4OSA_String_priv.c
ibvideoeditor/osal/src/M4OSA_Thread.c
ibvideoeditor/osal/src/M4PSW_DebugTrace.c
ibvideoeditor/osal/src/M4PSW_MemoryInterface.c
ibvideoeditor/osal/src/M4PSW_Trace.c
|
| 125b7c567ab9a99b4982e31914ba2ad8b5cb3819 |
16-Jan-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am 89a11e5d: (-s ours) am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge
* commit '89a11e5d5c3210359679e6f211444e0d7240ae0a':
Squash commits of the following patches, cherry-picked from other branch - do not merge.
|
| 10cd7e1d15f2a347763d8b7897ffe6a4bd5e7911 |
16-Jan-2011 |
James Dong <jdong@google.com> |
am b3f44773: am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb
* commit 'b3f44773897588cf1ab6335444e4ca5fb0160a7f':
Fixed thrashing in the cached buffer during 720p YT video streaming
|
| ff26c207f0d7a6f616e22027986b5e79faeb7174 |
16-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 124bd980db90c4171d8949538fef9246e84397c3 |
16-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| f9c1f51b261d45632625b501f44f2b2214ce3352 |
15-Jan-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am 9286cfe5: (-s ours) merge 83fdc69e from gingerbread - do not merge
* commit '9286cfe5017363d95798d85163ec4f28aeb0c675':
Squash commits of the following patches, cherry-picked from other branch - do not merge.
|
| cc43adab338983c5b5bc8ca0658bbc2d56603f09 |
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
|
| cf3592c5bf1c66ba510934fff5eb57ee0b3fd761 |
15-Jan-2011 |
Jean-Baptiste Queru <jbq@google.com> |
merge 83fdc69e from gingerbread - do not merge
Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
|
| 6ee94582e3ce7bdd9625345e7564e3176a51a2f3 |
15-Jan-2011 |
James Dong <jdong@google.com> |
Fixed thrashing in the cached buffer during 720p YT video streaming
bug - 3340194
Change-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6
edia/libstagefright/NuCachedSource2.cpp
|
| 5358e878396e1c451e9f9ef07237c2e6ab662d49 |
14-Jan-2011 |
Android (Google) Code Review <android-gerrit@google.com> |
Initial empty repository
|
| 272f0b0ce076c39fa059a5e101ab80841d5fab02 |
14-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 507ac2ecfe044646f361ce4b0e9034b3d1094ef1 |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit 'c35b3268919e6201f269eb9011ae184c5f613bc3':
Initial OMA DRM forward lock contribution
|
| 6508ec903e7b6596a3b8167e3b18d0b966ea1b8f |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
Initial OMA DRM forward lock contribution
|
| 3ed11317ce695a413d337c60fde222f30306f092 |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit 'a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
|
| 13e05b3f569965d97ec7d7f65e4cd46c6a22c23d |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
Merge "Initial OMA DRM forward lock contribution"
|
| 9c2e665bc92059b2f36273ee7bf3dc9e672ec39e |
13-Jan-2011 |
James Dong <jdong@google.com> |
am 089971ea: am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit '089971eaba92225aadec21d55d028df7948df012':
Add audio encoding parameters check
|
| 641f3f4778ed52c4225ced1eb3ee59cb3ee72a67 |
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
|
| 87fded4789d285463eec0f9507ebdcaef12a3380 |
13-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 646010416701830e23125e3dbc960e50c91d0752 |
13-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 42dd1d5f186252a7f09f8fb1a46ea82e3877b2d3 |
13-Jan-2011 |
James Dong <jdong@google.com> |
Add audio encoding parameters check
bug - 3345296
Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| 937c34cbe5cfeb26a10ef56dd94a1108137f9e80 |
13-Jan-2011 |
Andreas Huber <andih@google.com> |
am f97e58ef: am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit 'f97e58efdac199906209781d04d712749f2a521d':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
|
| 09f31c14fb6d6568dd1f6a06381c7cfab688c08a |
13-Jan-2011 |
Andreas Huber <andih@google.com> |
am 126410ed: (-s ours) am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '126410ed9ec3dff26a4cf7fff41f098936d45b2a':
DO NOT MERGE: Fix Matroska issues
|
| d19fd00c6faaf28af60115b587ff00e1c32bda66 |
13-Jan-2011 |
Andreas Huber <andih@google.com> |
am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit 'c88b2c44117e7e3ff3deb786f7d984f4096a63de':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
|
| 0d75b03796a2b30cc5cf4baf5804e45219c62eac |
13-Jan-2011 |
Andreas Huber <andih@google.com> |
am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '0ef0d76a9d5477942d5586933d35d299671fadc5':
DO NOT MERGE: Fix Matroska issues
|
| f5ad2f9c204870a1f4dc95449774aab8d141674f |
13-Jan-2011 |
repo sync <andih@google.com> |
am b2d782d0: (-s ours) am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
* commit 'b2d782d084fd8859ccd582ebd6bc38d947370b99':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
|
| ae7f6cd0b9d0033ed0a2ded8da56a60ee636552d |
13-Jan-2011 |
repo sync <andih@google.com> |
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
* commit 'd439ac396ecb9e909c543424211d563325fea72b':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
|
| 95304d5488ba465f19cc788f1c7394218c2ea2d1 |
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
mds/stagefright/stagefright.cpp
nclude/media/IMediaMetadataRetriever.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/mediametadataretriever.h
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/include/StagefrightMetadataRetriever.h
|
| ebccf76cebe40667f9fc6d1317a6ae010dc82735 |
13-Jan-2011 |
James Dong <jdong@google.com> |
am 4fbf60e7: (-s ours) am 0569e589: (-s ours) 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 '4fbf60e724ec6aff3ec8d78a5fdb284e98c914cb':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
|
| cf97dff7e5d6ed4d80be0f468a43c2360836d439 |
13-Jan-2011 |
James Dong <jdong@google.com> |
am 0569e589: (-s ours) 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 '0569e58988bae5f08733e21e8d8adfa61fe89b7f':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
|
| 8647e1ad4dbd9a7398d5ccbefeb9810c70524dbc |
12-Jan-2011 |
Andreas Huber <andih@google.com> |
am 156a3c9b: am 7928ca6f: Merge "Fail to parse duration instead of asserting, if the server response cannot be parsed." into honeycomb
* commit '156a3c9ba702f3159e0b4a76c65606b5f97b276c':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
|
| 9ec785a3f739fcabebb5ae71d9b45b07b32a1095 |
12-Jan-2011 |
James Dong <jdong@google.com> |
am 999fb5a5: am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb
* commit '999fb5a5a952ffb0c13ee5d6940fa1a39f165bcd':
Publish MediaMetadataRetriever.java as public API
|
| 20df25aae1a065d3671d8d6d9d5d81836054de7b |
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.
|
| 3cb13098df7b0c2aaae7b18f1518b02447f3b8c0 |
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
|
| 3e9eeb3b411f56d9935f9240056107816da24653 |
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
|
| 7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e |
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
mds/stagefright/stagefright.cpp
nclude/media/IMediaMetadataRetriever.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/mediametadataretriever.h
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| c530f8268420fa4da0de03686559978510f2670a |
12-Jan-2011 |
James Dong <jdong@google.com> |
am 5df82ef9: am cb0f6d0b: Merge "Speed up MP3Extractor using cached reads" into honeycomb
* commit '5df82ef953a4b0f29ab4690b838a7b269b1b4ab1':
Speed up MP3Extractor using cached reads
|
| 367bb55aaf022b7f727478cbd3b50866a9e537f4 |
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
|
| 67988a9ba5a081d14dbd8a663516e1d484d829df |
12-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Speed up MP3Extractor using cached reads" into honeycomb
|
| 72b228f6b18763a95023fd8ba44eb7354cfd7f74 |
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.
|
| 934ca8cb1bcffcf1781a576ca625d2f901e5f0a9 |
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
edia/libstagefright/rtsp/ASessionDescription.cpp
|
| e49051406baa71cb63d5754d33908ce3df201af1 |
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
edia/libstagefright/rtsp/ASessionDescription.cpp
|
| 7cc497733b7602b99b783decfa8c002bc27e25aa |
12-Jan-2011 |
James Dong <jdong@google.com> |
Speed up MP3Extractor using cached reads
Change-Id: I53a5ed76bc2f76f0c184f3800b5448f677117ae3
edia/libstagefright/MP3Extractor.cpp
|
| bc0d4482a6d23f3373d02f9027a1af017a6d7749 |
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
am 5ac80dde: am e5cf7f2b: Merge "Fix race in buffer ref counting." into honeycomb
* commit '5ac80dde0480f06a7fab9a15c2df90d6aee1ba22':
Fix race in buffer ref counting.
|
| 0ea67d828529b3c3a0c6a6cfeb653ecdc7252a90 |
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.
|
| e7be8fe9ae977a253bd9976c6d4b260961c89109 |
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3229711"
|
| 4dafe5b814c923538a0f275b62220ec9cc94a9b5 |
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Fix race in buffer ref counting.
Change-Id: Id47c30469c3e3ec293ed2ef574a191275b5044d6
edia/libstagefright/MediaBuffer.cpp
|
| e7ee677360034e6ab7432a867bc7c17b719c86a3 |
12-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| ef4b78f280498c034316d33cde7117fe0bd91635 |
12-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| fc4f5aad4af1e2d8eea5e7d7f69d1cad4704cbb7 |
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3229711
Change-Id: I3a4d41597cb92a1526417a622390dbb93dc71e99
rm/drmserver/DrmManager.cpp
|
| 4c0104e004f30d7e48381ef8d728b2e93931611f |
12-Jan-2011 |
Andreas Huber <andih@google.com> |
am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
|
| 9a0cf4fb7d18e186e06341bde915de234992d969 |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/mkvparser.cpp
edia/libstagefright/matroska/mkvparser.hpp
|
| 960737e761895d5850beabab809d03b3621d0ec3 |
12-Jan-2011 |
repo sync <andih@google.com> |
resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
|
| a8fa482f6dcbd5b58ddc8b630e3fb01370ebe583 |
12-Jan-2011 |
Andreas Huber <andih@google.com> |
am d22f7149: am 0827e697: Merge "Increase cache size and low-watermark threshold, also" into honeycomb
* commit 'd22f7149736aba8f8e4ac4c7b1e307c2ddd0fb04':
Increase cache size and low-watermark threshold, also
|
| 5cdaad23c45dee1f14cc533db5bf83472af613c2 |
12-Jan-2011 |
Andreas Huber <andih@google.com> |
am 850e76b4: am 7f92be88: Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
* commit '850e76b426be9330a8ef5928e173aa809d62564d':
Properly parse Matroska lacing flags and extract all frames contained in a block.
|
| bdcc8dc002f9b936fe6cd0a8ae4f8a6cdf523c40 |
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
|
| 575bb4d0fe5da758c695a046bb318caa0cae3e1f |
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.
|
| c4c3a2d4123f7dfe8c6ed0c26fb14aeb7b8d8f61 |
12-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Increase cache size and low-watermark threshold, also" into honeycomb
|
| 48ea80aaaa574986083fa06ba1bcfc36a3bd592d |
12-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 3b7983cf: am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."
* commit '3b7983cfea8885e394e7d625a31cbd0ae71e8edb':
DRM Framework bug fixes.
|
| fd52174eaacf661e9e7b1ff0001a9587f1b90b87 |
12-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Properly parse Matroska lacing flags and extract all frames contained in a block." into honeycomb
|
| 145e68fc778275963189b02a1adcbe27cce4d769 |
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
edia/libmedia/mediaplayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/NuCachedSource2.h
|
| ac2652c25f5d2a38709131f7731651bc5819fed5 |
11-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."
* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
DRM Framework bug fixes.
|
| 01cd56dd3ae8ebbb349924cdf6bffea84f0df7fc |
11-Jan-2011 |
Marco Nelissen <marcone@google.com> |
am f61caad0: am d1da80a4: 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 'f61caad0b8e01345fde98b4dff3d110127d5d669':
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
|
| b03f5627d4e0d80ea7b185e0af1d8a5d19461325 |
11-Jan-2011 |
Marco Nelissen <marcone@google.com> |
am d1da80a4: 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 'd1da80a4b3d50c1be120b0e873363da711428a81':
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
|
| 50c8bea8fba2fcafb14696399028bdbc094dc995 |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/mkvparser.cpp
edia/libstagefright/matroska/mkvparser.hpp
|
| 50cc95772245a73fd1245cb1f02642b31b96f5d1 |
11-Jan-2011 |
James Dong <jdong@google.com> |
am cb903eb7: am 53006903: Merge "Fix uninitialized rect structure for retrieving rect cropping information from decoder" into honeycomb
* commit 'cb903eb7764285d640bc819beb117c7de6c3286e':
Fix uninitialized rect structure for retrieving rect cropping information from decoder
|
| 8eb04084b96d59802615f0e0570359c35ca3df61 |
11-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Fix uninitialized rect structure for retrieving rect cropping information from decoder" into honeycomb
|
| 0d85990f20106513b6da5a446702aa62ab61397f |
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
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.h
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/rtsp/MyHandler.h
|
| 38e6f20962b366fffe86dc33f9093ce4af87425a |
11-Jan-2011 |
James Dong <jdong@google.com> |
am b447763d: am f2e48873: Merge "Don\'t release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp" into honeycomb
* commit 'b447763d6e3f564d7f02969b117e165b47fb14cb':
Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp
|
| cdf54e358e7e3a75980d5ac6ed7f63a8011ab7a9 |
11-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| 47024fea7086a4fef7b930c927b8ba07d4c36c5e |
11-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| b0fb6bf746f1d611033c55a4a1ab5a4b0e212a95 |
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
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 7b8a803497450bb90b9c4f5ba3426bf984fad274 |
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
|
| 88b90c3f8f611ce0ddbce7c0261d1726b5d9ac41 |
10-Jan-2011 |
Andreas Huber <andih@google.com> |
am 0c12065f: am b736cb28: Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
* commit '0c12065f037b4fa57d554e794059715f243c88ea':
Return a runtime error instead of asserting if the M4vH263Decoder fails in start()
|
| 0ecfbd1cf37dbfb44d19c27351f5769309ac028d |
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
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
|
| d12096de26f97b91c7a969e7fe2c3de1394ce24b |
10-Jan-2011 |
Andreas Huber <andih@google.com> |
am b1914aec: am 748ba9a9: Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
* commit 'b1914aece8fcb590e015036fa1025428e2e67895':
NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.
|
| 32ad210e4e4bcbdf912a01c9d2ff105cb3c5056f |
10-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into honeycomb
|
| 31e2508c75018145a8238925ff1a08cbde4e799a |
10-Jan-2011 |
Andreas Huber <andih@google.com> |
NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.
Change-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d
related-to-bug: 3336496
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/foundation/AMessage.h
edia/libmediaplayerservice/nuplayer/DecoderWrapper.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/ACodec.cpp
edia/libstagefright/foundation/AMessage.cpp
|
| 32c8335c6b6eb87a88e9193db1a5aab29175d043 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMX.cpp
|
| ef415adcef23c06dc2a68f83b6aa0b7e77154abb |
10-Jan-2011 |
James Dong <jdong@google.com> |
am faa75436: am be0ae5ea: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object" into honeycomb
* commit 'faa75436ef7ae82304df81b3ffc78a7803f4bb12':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object
|
| 14c858e80dfe2030c9f343dc0c6e2048e030731b |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMX.cpp
|
| 6e6561f5f2b3a250ef26c9048d9b0d27e86e0ea3 |
10-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| ee4d0d6fb91fda6bd8ef349d6b610baac2c53c3a |
10-Jan-2011 |
Eric Laurent <elaurent@google.com> |
am 108221ee: am 2f67e0e7: Merge "Fix issue 3317627." into honeycomb
* commit '108221ee8c34db657f7a82ba01dd04fe3d76b19c':
Fix issue 3317627.
|
| eb0d0c48ebfcee5e8141ae25fe42a9eac6aae230 |
10-Jan-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 3317627.
The fix consists in selecting the digital audio device (SPDIF/HDMI)
when available if the routing strategy is STRATEGY_PHONE.
Change-Id: Ie500ae92f5c01f2511988543852ba559c6e5994b
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 5c5ea652a8a2210a85f7c6a54f07b593aaef54b3 |
08-Jan-2011 |
James Dong <jdong@google.com> |
am 3f0c1353: Merge "Awesomeplayer : Frame dropping logic change" into honeycomb
* commit '3f0c13538a5e36c040748051eddc0135e1813c0b':
Awesomeplayer : Frame dropping logic change
|
| aee6c07b3572bf2510cd9e7d29c454fcfedde31d |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 9cfc9eff42a0700029c39e89c38b52488845ad63 |
08-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 0544d059: Merge "DRM Framework bug fixes."
* commit '0544d05990c0f43a143e98e71f7fc60277872806':
DRM Framework bug fixes.
|
| c29dd6f4ccd7ea7e41921d48d03d26e159aeaae4 |
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
edia/libstagefright/OMXCodec.cpp
|
| 6612058e8918fa7941d3d3a0737ddb0fbac111c1 |
07-Jan-2011 |
Marco Nelissen <marcone@google.com> |
am af5473ee: Merge "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" into honeycomb
* commit 'af5473eeddbf2149427df0bd8b49f6b2182c629e':
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
|
| 11f8109ad8646d3acd9a0987613229cde59d52c1 |
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
nclude/media/mediametadataretriever.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| c2322f7ac756e78de9491c17dc3c0dd14456c599 |
07-Jan-2011 |
Gloria Wang <gwang@google.com> |
Merge "DRM Framework bug fixes."
|
| 53b058d5bd0bce77fe3f66d3e27d1d662ee4b2d4 |
07-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| 943eb803a7338fe77e9b8718d15a8f68709464b6 |
07-Jan-2011 |
Andreas Huber <andih@google.com> |
am 0d1e1550: Merge "Fix typo." into honeycomb
* commit '0d1e15509bb29e2688ccd72e984b63a874b62195':
Fix typo.
|
| 0fd65001142a7ce3c3a87148a4e7b36e7476b036 |
07-Jan-2011 |
Andreas Huber <andih@google.com> |
am ca808ae2: Merge "If the stream for the new bandwidth doesn\'t have the segment we\'re looking for..." into honeycomb
* commit 'ca808ae207a95750d0f34752a7ad5313a2c2b446':
If the stream for the new bandwidth doesn't have the segment we're looking for...
|
| 9b83b8f02407459399c25e313aa3df9f4553191d |
07-Jan-2011 |
Andreas Huber <andih@google.com> |
am f25410ed: Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycomb
* commit 'f25410ed9695f3f07ce0302232fa6e1985ffffd7':
Use NuPlayer for HTTP live streaming playback by default.
|
| d8eed2a493f4476e935a905a822bea6608a87392 |
07-Jan-2011 |
Jamie Gennis <jgennis@google.com> |
am 478353e2: Merge "Add camera service support for SurfaceTexture." into honeycomb
* commit '478353e23188cdd6f3dd3674f122b50ec37438b4':
Add camera service support for SurfaceTexture.
|
| 3796a4d988b5874238ffa869cdcd624ed1be397a |
07-Jan-2011 |
Andreas Huber <andih@google.com> |
am 1932fef9: Merge "Colorconverter may not support some src/dst bitmap configurations." into honeycomb
* commit '1932fef94a14d0a1b86213864a2bcc690e0faa5e':
Colorconverter may not support some src/dst bitmap configurations.
|
| 33ce248d89a35973bd3697819365b34fd3ecd0ef |
07-Jan-2011 |
Andreas Huber <andih@google.com> |
am cc9585fb: Merge "If we failed to initialize the codec after transitioning to IDLE state, don\'t assert" into honeycomb
* commit 'cc9585fb38534f0c882cf58d3db9038198beb1b1':
If we failed to initialize the codec after transitioning to IDLE state, don't assert
|
| 3678eb46faf7c19ad76bcb5daf4ada5ea7298d27 |
07-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
am 27480cd4: Remove support for obsolete PTP content provider
* commit '27480cd49470af667dc8985f45b5ba43ab9ed4cd':
Remove support for obsolete PTP content provider
|
| 369b2375d6c938c0c68cb65c13ee3808289fee61 |
07-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
am 215b682b: MTP: changes to use new usb_request support in libusbhost
* commit '215b682b8a02ac51d820b8e301d50431bdd09b3d':
MTP: changes to use new usb_request support in libusbhost
|
| e28b1e565705ffb85b05c8e226e1ab5010cb3821 |
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
|
| 20ad3a341a96e7746015ccb7369fa567897e11f6 |
07-Jan-2011 |
Andreas Huber <andih@google.com> |
Fix typo.
Change-Id: I2d7796425ea746432964ce48959b6c227d31df11
edia/libstagefright/httplive/LiveSession.cpp
|
| f1e1e8ede22cb6b14ffa77371bc2b6e7edf4632c |
07-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| aea5aff45a1af14e249ac311f0a128a621a7d13e |
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
edia/libstagefright/httplive/LiveSession.cpp
|
| 288fb7e5bd7060cbe9b737500975754c9312e2db |
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
nclude/media/mediametadataretriever.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 9a3c0d65bfa55df779ebe285d5d26e257ca37c22 |
06-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Use NuPlayer for HTTP live streaming playback by default." into honeycomb
|
| 4b197e1ffe46eb73ebdb80efc984bfde336b8e92 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/httplive/LiveSession.cpp
|
| 93aa950be52dc89f370c423f7b90c52093f9a3fa |
06-Jan-2011 |
Jamie Gennis <jgennis@google.com> |
Merge "Add camera service support for SurfaceTexture." into honeycomb
|
| bfa33aae4f54c0020a0568b16a3acb7b30b6ca3d |
20-Dec-2010 |
Jamie Gennis <jgennis@google.com> |
Add camera service support for SurfaceTexture.
This change enables the use of a SurfaceTexture in place of a Surface as
the destination of camera preview frames.
Change-Id: Ic70d404c8fe261e9d5da6f1de93d6babb5b191cb
amera/Android.mk
amera/Camera.cpp
amera/ICamera.cpp
nclude/camera/Camera.h
nclude/camera/ICamera.h
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| b1787e3b95e96cc002377d41518cc183f64b58c4 |
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
nclude/media/stagefright/ColorConverter.h
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| 4d785ae6b940c62610612baf9d24f1ee607a2714 |
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
edia/libstagefright/OMXCodec.cpp
|
| 1472eb39f7516faa26de200d8592464c8aaac38e |
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: I801131610ad9801b935f7b700d61f9b62733fbca
related-to-bug: 3328212
nclude/media/stagefright/ColorConverter.h
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| f6ce160749ac3de2a1658d466f3b7f5ba14bc798 |
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: I0ecfb2a4977727de17e73f534e2511a3d0747644
related-to-bug: 3328222
edia/libstagefright/OMXCodec.cpp
|
| 5de2001a5c3f854b63dbcea284e02f930881ca75 |
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>
edia/mtp/Android.mk
edia/mtp/PtpCursor.cpp
edia/mtp/PtpCursor.h
|
| 42d0b79a787814d42e4c6f9dfe14f13cc0f6a758 |
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>
edia/mtp/MtpClient.cpp
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
edia/mtp/MtpEventPacket.cpp
edia/mtp/MtpEventPacket.h
edia/mtp/MtpPacket.cpp
edia/mtp/MtpPacket.h
edia/mtp/MtpRequestPacket.cpp
edia/mtp/MtpRequestPacket.h
edia/mtp/MtpResponsePacket.cpp
edia/mtp/MtpResponsePacket.h
|
| f3ed21ae20c0c5798aabd51eba2d7e955c3cc0b9 |
06-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to honeycomb
|
| d1108d74e13a74dc72e49513e0393e924f3d112c |
06-Jan-2011 |
James Dong <jdong@google.com> |
am a8ce7736: am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
* commit 'a8ce773607c26dd4336f57856afce507fb98a279':
Suppress the recording sound in the recorded video
|
| e6bf51ea9c5a4c1294e9a6c26d8a9b86534fee1f |
06-Jan-2011 |
James Dong <jdong@google.com> |
am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
* commit '35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
|
| bade4951bd8b2c9148df9018c44903b9d48d1f7b |
06-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Some more fixes regarding HTTP live in NuPlayer."
|
| 22fc52f6f72f39e33c3970d0291de3569118aa5c |
06-Jan-2011 |
Andreas Huber <andih@google.com> |
Some more fixes regarding HTTP live in NuPlayer.
Change-Id: I9e29615fa8ee6c7bd4189373a75c20caef3fd2b1
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
|
| 149d3b0565c9b7e56af344d0e5c2f121236fa119 |
05-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Seek/Duration support for completed http live streams in NuPlayer."
|
| 43c3e6ce02215ca99d506458f596cb1211639f29 |
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
nclude/media/mediaplayer.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libmediaplayerservice/nuplayer/StreamingSource.h
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/LiveSession.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
|
| eb8cab7bb77aac80a5a2e6fe0171e20116e80ef0 |
05-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Fixed a typo in the enum for unknown camera error message"
|
| 0b2214dacca14639429e3ed803dbb8a7096face0 |
05-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| 019e96a6c6228c2565d8bc172f6278b31384aca5 |
05-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Use video output if necessary for timelapse video recording"
|
| f9e25f165ea24fe2f498d5513d65f9236bec87eb |
05-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| fdd65a0fc7df2c878cc601e4c0f4021cb264f051 |
05-Jan-2011 |
Pravat Dalbehera <pravat.dalbehera@sonyericsson.com> |
Initial OMA DRM forward lock contribution
OMA DRM forward lock agent is plugged into the
Open DRM framework. Forward lock agent implementation contains:
- Forward lock engine to communicate with framework
- Converter to encrypt the original file into a special format
- Decoder to feed the decrypted data for rendering
- Lightweight unique key-encryption mechanism
- Documentation
Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
rm/libdrmframework/plugins/common/Android.mk
rm/libdrmframework/plugins/common/util/Android.mk
rm/libdrmframework/plugins/common/util/include/MimeTypeUtil.h
rm/libdrmframework/plugins/common/util/include/SessionMap.h
rm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
rm/libdrmframework/plugins/forward-lock/Android.mk
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngineConst.h
rm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
rm/libdrmframework/plugins/forward-lock/internal-format/Android.mk
rm/libdrmframework/plugins/forward-lock/internal-format/common/Android.mk
rm/libdrmframework/plugins/forward-lock/internal-format/common/FwdLockGlue.c
rm/libdrmframework/plugins/forward-lock/internal-format/common/FwdLockGlue.h
rm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
rm/libdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c
rm/libdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.h
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
rm/libdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.h
rm/libdrmframework/plugins/forward-lock/internal-format/doc/FwdLock.html
rm/libdrmframework/plugins/forward-lock/internal-format/doc/images/image001.gif
rm/libdrmframework/plugins/forward-lock/internal-format/doc/images/image002.gif
rm/libdrmframework/plugins/forward-lock/internal-format/doc/images/image003.gif
rm/libdrmframework/plugins/forward-lock/internal-format/doc/images/image004.gif
rm/libdrmframework/plugins/forward-lock/internal-format/doc/images/image005.gif
rm/libdrmframework/plugins/forward-lock/internal-format/doc/images/image006.gif
|
| 627baacc748c5e2ed68bdb256aea4d70fcfe9ce4 |
04-Jan-2011 |
Wu-cheng Li <wuchengli@google.com> |
Camera::create should fail when it fails to connect the camera.
bug:3197565
Change-Id: I3439a25c06b00615e8257e6b3db85df081643643
amera/Camera.cpp
|
| e6615671a51c85f409c071f15babb76198f1ce92 |
05-Jan-2011 |
James Dong <jdong@google.com> |
Fixed a typo in the enum for unknown camera error message
Change-Id: Id9f8432e2ba8e1474ee020438d6456f1f450398a
nclude/camera/Camera.h
|
| 91dcf1510491c4128f506a0d28e64de5ecbf459d |
05-Jan-2011 |
James Dong <jdong@google.com> |
Suppress the recording sound in the recorded video
bug - 3309194
Change-Id: Ib8fb248943bc22f963d67537bfdbc6056c5a159b
nclude/media/stagefright/AudioSource.h
|
| 28934a90e168291f6c77c56e8a05f272e5151bbd |
05-Jan-2011 |
James Dong <jdong@google.com> |
Use video output if necessary for timelapse video recording
Change-Id: I88d0cc824f0fbf8b2f392fbc23c69b5bfefda1b8
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| c213b812514d16dd401cd308b9203b70bfbb3d5f |
04-Jan-2011 |
Andreas Huber <andih@google.com> |
Merge "Properly shutdown the decoders on a reset() in NuPlayer's implementation."
|
| 1aef211b4e5dc952081727bfd2318b2cb5ca4506 |
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
nclude/media/mediaplayer.h
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
|
| c2f95fba3ab2a4e512fd1152a12e64691f2ea73d |
04-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method"
|
| 6e5cf568f4a5dee4be6ec991e1a96497303fb019 |
04-Jan-2011 |
James Dong <jdong@google.com> |
Remove captureFrame from MediaMetadataRetriever.java class
It has been replaced by getFrameAtTime() method
Change-Id: I9ed762e10e61dbc188e2a740e489a3e2ef9a6bb2
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 65a170e3ac593a29abd0c76e9aa531fabad7f56d |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 962813a15f7fad52341effb174db461fbd344fc4 |
04-Jan-2011 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| 8afe66571ba14c7f923966d7270287e6f950ef38 |
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
edia/libstagefright/yuv/Android.mk
|
| d1b056a099b29e81d65582a8612210967fb71f93 |
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>
edia/mtp/Android.mk
|
| 5bc087c573c70c84c6a39946457590b42d392a33 |
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
mds/stagefright/stream.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp
edia/libmediaplayerservice/nuplayer/HTTPLiveSource.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libmediaplayerservice/nuplayer/NuPlayerSource.h
edia/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.cpp
edia/libmediaplayerservice/nuplayer/StreamingSource.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/httplive/LiveDataSource.cpp
edia/libstagefright/httplive/LiveDataSource.h
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/include/LiveSession.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
|
| 53df1a460bcfdd129ca2bc416dee2009e35c042e |
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
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
|
| 224da6db57f5b0e5ed08addf1d85564e3710e952 |
22-Dec-2010 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| df42f949c8bd05b81d94633767514fff88f52062 |
21-Dec-2010 |
Andreas Huber <andih@google.com> |
Better handling of forming absolute https URLs, runtime error on https:// access.
Change-Id: I7f6275520b0bd070e645024dd151a8541b8787b2
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/M3UParser.cpp
|
| 27a932a79b99fd2d869125e4c08b230fb6108860 |
21-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| 3831a066bcf1019864a94d2bc7b4c9241efc5c22 |
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
edia/libmediaplayerservice/nuplayer/DecoderWrapper.cpp
edia/libmediaplayerservice/nuplayer/DecoderWrapper.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
|
| 41152efd144ccf70c380d5c9a32105c02a039f43 |
21-Dec-2010 |
James Dong <jdong@google.com> |
Add more debugging code to track down hang during video recording
bug - 3276561
Change-Id: I1e02590b23031f29bcbfc4a1064f039ed80cb862
edia/libstagefright/CameraSource.cpp
edia/libstagefright/OMXCodec.cpp
|
| bcb5fc264f781ab856d9d03b725eb373f25b7760 |
21-Dec-2010 |
The Android Automerger <android-build@android.com> |
merge in gingerbread-release history after reset to gingerbread
|
| c255d9a090413e227f735b872d15905046ca32f0 |
21-Dec-2010 |
The Android Automerger <android-build@android.com> |
merge in honeycomb-release history after reset to master
|
| 54c02a58e5ad4b7b2668f63caa9d189e958f5544 |
20-Dec-2010 |
James Dong <jdong@google.com> |
Merge "Backward-compatibility max file size support, ignoring 0 or negative file size limit"
|
| 2d1e5d35be5e6d4b55ac8b39fbfcbeb60fcdd084 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| a4d153424bf33646a86a7e968064dabb8e073c52 |
20-Dec-2010 |
Jamie Gennis <jgennis@google.com> |
Merge "Change a Stagefright assert to an error check."
|
| 981bff56f56d1743f6cb9b02c686d67a4d7eb110 |
20-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
* master: (38 commits)
Stale cache management to address a P1 bug # 3296131.
Remove WebView leak
Hide IME Switch Button when a handset is locked.
Use settings of the visibility of IME Switch button
Fix bug 3273104 - Fix SeekBar holo style
Fix bug 3295495 - Wrong menu item selection in PopupMenu
Measure spinner items for sizing the dropdown view.
Fix bug 3292288 - Make Action Bar trap taps
Demo hack!
Bug 3292797. Talkback accessibility doesn't work at times.
Fix 3295530: Fix crash in RecentApps when we have no recents
Fixing leak in StackView
Add initial support for TAB navigation.
Fix a constructor declaration to match its definition.
Eliminate tracked allocations and the inNativeAlloc option.
Fix 3148496: Update LockScreen clock to use new font.
Some fixes to the new loader management.
Updating NumberPicker resources and DatePicker selector color for the Light Holo theme
AutoLink identified spans are selected when long pressed.
Tweak action bar show/hide animations
...
|
| 60693ddde0e435def1617848f545c78cec452766 |
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
edia/libstagefright/OMXCodec.cpp
|
| 29185b949a56cb624e6a0c2ad08e5fd44319359c |
17-Dec-2010 |
android-merger <android-merger@google.com> |
reconcile history of release and master
|
| 95289e216a300ddfadf2beec9c8f2c0af3d7e784 |
17-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3217707."
|
| 357b7a806e530902ab60ceab877ea608a7e3e053 |
17-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MediaScanner: Add support for scanning empty directories"
|
| 626c85f3a9ec8e34a1e4af31eddf118d75ee6416 |
17-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3217707.
The problem is that when the A2DP headset is disconnected, there is a transition
period during which the A2DP sink pumps data at a very high pace.
This makes that:
1 the audio flinger mixer thread spins and starves binder threads thus delaying
the completion of the A2DP output stream shutdown
2 we read the audio http audio stream faster than normal and we reach the end of stream
for audio while video is still playing if the streamed file is small enough.
The fix consists in detecting abnormal short write intervals and sleep to restore
a normal write pace.
Change-Id: Iab127882494ab0e26266371dc0ce5c2ff6fa476e
ervices/audioflinger/A2dpAudioInterface.cpp
ervices/audioflinger/A2dpAudioInterface.h
|
| b5e8536e41bbbbfe336e1d9614c73278e51590eb |
17-Dec-2010 |
Eric Laurent <elaurent@google.com> |
am a1608902: am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
* commit 'a1608902f95dc8ff31a52c1f1c384829a803a701':
Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
|
| 74de24045c00d641e79483b459d7d00d3d5bffe3 |
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.
|
| 3e9f9f1596d4225ddd9288b4f7b24a15221374dc |
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>
nclude/media/mediascanner.h
edia/libmedia/MediaScanner.cpp
|
| 6e6b1cae2bac1b78205cefab8e4e9e9538982965 |
16-Dec-2010 |
Andreas Huber <andih@google.com> |
Instead of asserting, gracefully abort and signal and error.
Change-Id: I170a602ed80e6c85a94e46deadfc02aaf92bfebb
edia/libstagefright/httplive/LiveSession.cpp
|
| 5a7f242cfc0bd3b5208c21c27c0f5f348e98a0dc |
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)."
|
| ac13b81c590386b3a42e381b31d7614ca53b79c5 |
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
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
|
| 49bcbaed50918071ec9508acdb6c1ea398e64751 |
16-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix speakerphone routing to analog dock"
|
| f4a0e014f53c131dbb9ae86921b8064993c09e61 |
16-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Remove now obsolete implementation of streaming from AwesomePlayer."
|
| d0c5158d5244418880bb85122e9fd0e378892c2a |
16-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly announce decoder output format changes, make sure AMessage::dup does."
|
| 85704836f33a199d7e442a23db82abbd5620d35d |
16-Dec-2010 |
Andreas Huber <andih@google.com> |
Remove now obsolete implementation of streaming from AwesomePlayer.
Change-Id: If62bedbf74c8e987d6651604d7bebc9da381e86a
edia/libstagefright/AwesomePlayer.cpp
|
| 2c2814b900a61fa07ddfff860b143fbbe9c740e9 |
16-Dec-2010 |
Andreas Huber <andih@google.com> |
Properly announce decoder output format changes, make sure AMessage::dup does.
Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/foundation/AMessage.h
edia/libmediaplayerservice/nuplayer/DecoderWrapper.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libstagefright/foundation/AMessage.cpp
|
| 0b456a6a33de8cb7c641724579382a31a1beaa2c |
16-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Fix speakerphone routing to analog dock
The audio routing policy when speakerphone is on and a dock with built-in
speakers is connected should be to output audio to teh dock speakers
Also removed route to SCO car kit if forced usage is not SCO as the SCO
socket might not be established.
Change-Id: I1aa2954092e28de935304b90f7a7a64d661934c7
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 37b9572791dab3b35cc4db5f43741e857029d772 |
16-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
* master: (50 commits)
Add LayoutTest http/tests/appcache/foreign-fallback.html to the DRT ignore list
Add EXTRA_SKIP_UI to skip the confirmation page.
Whenever LoadBinary fails, recompile. Fixing the multi-instance bug.
Fix 3274309: Returns correctly sized thumbnails for MINI_KIND video thumbnails.
Changing StackView layout to space items differently
New SearchView assets and close-button behavior change.
Fix for testAccessTransformationMethod cts test.
Look again; the system bar is now diamonds.
Fix text shadow rendering issue.
Show keyboard when user starts a text selection.
workaround [3201922] display not on: log full of gralloc errors
Opted to recognize "h263" or "H263" boxes in an mp4 file
Correct an error code to pass CTS.
Initial support for a true streaming player for mpeg2 transport streams.
Put Log.wtf's terrible failure in logcat -b main.
Updating the light Date picker theme. Some UI fixes.
Allow a JNI local ref to be passed directly into globalRef().
b/2946595 Remove the touch events filter upon maps.google.com team's request.
Turn thumbnails back on.
Properly order the data written out to the transport stream by timestamp.
...
|
| 0f01764099d7a65b8921725df3340140f9fc4cd5 |
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
edia/libmedia/AudioSystem.cpp
|
| a6256238d9015c42129fe43791968768fe501efa |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| e071b055cee301d71335519601474c62b10af411 |
16-Dec-2010 |
James Dong <jdong@google.com> |
Opted to recognize "h263" or "H263" boxes in an mp4 file
bug - 3278240
Change-Id: Ifd1b1f3e5dd55dbf2c33bbad9dd51998c25bfc15
edia/libstagefright/MPEG4Extractor.cpp
|
| c08bb264768f773cd6d10b8736ccfc4745645135 |
16-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly order the data written out to the transport stream by timestamp."
|
| f933441648ef6a71dee783d733aac17b9508b452 |
16-Dec-2010 |
Andreas Huber <andih@google.com> |
Initial support for a true streaming player for mpeg2 transport streams.
Change-Id: I153eec439d260a5524b21270e16d36940ec3161a
mds/stagefright/Android.mk
mds/stagefright/sf2.cpp
mds/stagefright/stream.cpp
nclude/media/MediaPlayerInterface.h
nclude/media/stagefright/ACodec.h
nclude/media/stagefright/foundation/ADebug.h
nclude/media/stagefright/foundation/AHierarchicalStateMachine.h
nclude/media/stagefright/foundation/AMessage.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/nuplayer/Android.mk
edia/libmediaplayerservice/nuplayer/DecoderWrapper.cpp
edia/libmediaplayerservice/nuplayer/DecoderWrapper.h
edia/libmediaplayerservice/nuplayer/NuPlayer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayer.h
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDecoder.h
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerDriver.h
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerRenderer.h
edia/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp
edia/libmediaplayerservice/nuplayer/NuPlayerStreamListener.h
edia/libstagefright/ACodec.cpp
edia/libstagefright/Android.mk
edia/libstagefright/foundation/AHierarchicalStateMachine.cpp
edia/libstagefright/foundation/Android.mk
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 3a1775247e26f274ef249442ef038ddf7217b68c |
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
edia/libstagefright/MPEG2TSWriter.cpp
|
| 60c5b57edd3c8f4bdf6b38cf5b8a193ba770bb72 |
15-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Proper recovery of timestamp information in the transport stream parser."
|
| a093f92042cf65060d1474c0fe116c12f8981717 |
15-Dec-2010 |
Andreas Huber <andih@google.com> |
Proper recovery of timestamp information in the transport stream parser.
Change-Id: I647c73688c95529f54f0bb6af17d109dfe2bb11d
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
|
| 10f0d3f2fcd721e0d5639106f83668b0360bc173 |
15-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Change audio routing policy for HDMI"
|
| f3a8d32fd475ec68d966fa6f12a4c975ba80b659 |
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
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| f6c49c6b8d4dc22a1a58191494631bd764f6212f |
15-Dec-2010 |
android-merger <android-merger@google.com> |
Merge branch 'master' into honeycomb-release
|
| 00502849dcc54086ad9fabbd90ef3d0e41ae78f5 |
15-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Emit better (correct) timestamps that respect AAC upsampling."
|
| 41dabbcd9ab62d7ecea1570cc76c39ac485de2ce |
15-Dec-2010 |
Andreas Huber <andih@google.com> |
Emit better (correct) timestamps that respect AAC upsampling.
Change-Id: I6587416c9caa0e263aa8ec6c6d89a42e28f6ff19
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| d27f1e6959cdcdadfa471b9824686d784ca55def |
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."
|
| 123e95a584556a64a2e0f9e242f48b9a080750a5 |
14-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly signal the condition if we run out of input data."
|
| 93b47835ef496da664f98949ba3bb6c4583559a6 |
14-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Support malformed ID3 V2.4 tags written by early versions of iTunes."
|
| 763b772bb6bca6a4aaef85cec840fd7061630d61 |
14-Dec-2010 |
Andreas Huber <andih@google.com> |
Properly signal the condition if we run out of input data.
Change-Id: I7a5ada8c25c1d32ca603b3b2c75e1808e140c367
edia/libstagefright/OMXCodec.cpp
|
| 428d96d5f882d01acb0abb7e1ceb51d4ccc48efa |
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
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/include/ID3.h
|
| 1a9c7fd81bc5e3ad2daf929658f6c04a6f81b772 |
14-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| feafefb1ed8d86100161f521fc7a44b819bd9529 |
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>
edia/mtp/MtpServer.cpp
|
| 36fb2077764093a0a19ed65770078b9987bd82b1 |
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
edia/libstagefright/WAVExtractor.cpp
|
| 985f838934510983d8a887461e98dca60a6e858f |
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
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| a37fe6bf720683250d7fece6ed35a447694dda1f |
13-Dec-2010 |
James Dong <jdong@google.com> |
Merge "Revert "Allows the authoring engine to skip frame.""
|
| e9855b826ffa390c13fff9965460d05761c96407 |
13-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 20c3be0e0394e1340c036685eb1edb8f6ef5a2ac |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
|
| 79e23b41fad961008bfde6e26b3c6f86878ca69d |
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
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MediaSource.cpp
edia/libstagefright/OMXCodec.cpp
|
| 8d45a37ff076814db39471f15d309567605b3416 |
11-Dec-2010 |
James Dong <jdong@google.com> |
Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers"
|
| abdd2ba259a5dc863a821c9d1187d83f2e2395ac |
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
edia/libstagefright/CameraSource.cpp
|
| 81db008f75b697c6341043bd56312d6bcef6f302 |
10-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| b3fd981d5f8bbf629dd8a07b06b4b656b70cb944 |
10-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Fix audio mode log.
Since the new audio mode IN_COMMUNICATION was added, the audio mode log
was broken.
Change-Id: I4fdafc3b98a1b0ceb55058a9e47fed99b3dbe6ad
ervices/audioflinger/AudioHardwareInterface.cpp
|
| d69c7f654cc772b03717999c1b24402d5c40e69f |
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
edia/libstagefright/CameraSource.cpp
|
| 986ef2ad4c96952711d87af481f3afb40aa10775 |
09-Dec-2010 |
James Dong <jdong@google.com> |
We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore
releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME).
Change-Id: I2ecb9b3b11dab6bf868ccf8effda1b8df5bcde3c
nclude/camera/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
|
| b41ad26dba96d70f53fff46d10eb589c2b3eb6f8 |
10-Dec-2010 |
James Dong <jdong@google.com> |
Merge "First step towards renabling Timelapse video recording"
|
| f7454622eaac287d20ab43013d7015fe42b894f8 |
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>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
edia/mtp/MtpPacket.cpp
edia/mtp/MtpPacket.h
|
| ba29002c7aee13c068049037cd14bba6a244da6b |
10-Dec-2010 |
James Dong <jdong@google.com> |
First step towards renabling Timelapse video recording
Change-Id: I93836b066fb69d5152d3774546a9935057a1f12f
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 424c6cbfa75da5f4f889ab6517dfee4dd024ba2d |
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>
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/mp3dec/Android.mk
|
| 771a79084ee04c2c800174433c167c37e8e6fca8 |
09-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 151827eba283d97771aaa4494e5a1a6573dafcfb |
09-Dec-2010 |
James Dong <jdong@google.com> |
Merge "resolved conflicts for merge of c402def7 to master"
|
| 234ec865db84542cab33b7a5f1ca6e6dcc40c5fa |
09-Dec-2010 |
Mathias Agopian <mathias@google.com> |
Merge changes Id4222c9b,I3c1a9172
* changes:
More clean-up. Get rid off the "blur" effect in SurfaceFlinger
fix [3259708] Graphic Buffer Mapper does not support YV12
|
| c96e481795f4d6b02e7c1eb6d2d5adb076c88cef |
09-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Improve argument checking in SendObjectInfo"
|
| e6c315a714dbc75cd2b92bcdcf42caa6dca07d8b |
09-Dec-2010 |
James Dong <jdong@google.com> |
resolved conflicts for merge of c402def7 to master
Change-Id: I328e7c41ad410f07322f6d3a32251e495710c090
|
| 181a379b43c1e85389e8bb60825d9b608502717a |
09-Dec-2010 |
Mathias Agopian <mathias@google.com> |
fix [3259708] Graphic Buffer Mapper does not support YV12
remove a bunch of a code that was there only to support broken gralloc implementations
Change-Id: I3c1a9172224cbcc283601abfbbd695a20815451f
nclude/private/ui/sw_gralloc_handle.h
|
| 7d44e4da3bc3d56c6a9aed1f27f51cfd5b54108f |
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
|
| 03dfce9672b36c1a334959a602f909b8410bec50 |
08-Dec-2010 |
Mathias Agopian <mathias@google.com> |
remove support for PUSH_BUFFER surfaces and overlays
the same functionality is now supported through
the h/w composer HAL, and YUV support in the GPU.
Change-Id: I8146605449954b8e8fd7f78810b7d873c2d8f5bf
nclude/camera/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| fd34626771a63d3a835863e1b4bf71dcb26e28d8 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpProperty.cpp
edia/mtp/MtpServer.cpp
|
| e8079d0f6afcb138a0e5882ccbaf93647ea77c5b |
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
edia/libstagefright/AwesomePlayer.cpp
|
| cb0cb25002f1b5fe0d02c997bac487b5b6c5c682 |
08-Dec-2010 |
Andreas Huber <andih@google.com> |
Fix thumbnail extraction for extractors that don't have a preference.
Change-Id: Id305a44416b08a667aae86c2109aa4dff9f17342
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| a829968ac3ba900dd22d2122253f67099d9d6f9f |
08-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Better buffer status management and verification in OMXCodec."
|
| 92bf2f96c53d24adc1ace362439e82ca2cf6b856 |
07-Dec-2010 |
Andreas Huber <andih@google.com> |
Better buffer status management and verification in OMXCodec.
Change-Id: I90410f2ac0d8ff86076a239dc6e281b1bc4d8643
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 70e72304ecac41ea7c4e043c2687131cf3ca366b |
08-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| e52fda6714a209fa2117d970919324b56573f90f |
08-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Support format argument in host GetObjectPropDesc command"
|
| 99e393a39a31bfbdeb435462939519e2d0279433 |
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>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| faac5c1a0aac9b09c4edf3d3ca3ea266787fd0c5 |
08-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Read property code before calling isDeviceProperty in MtpProperty::read()"
|
| 5da864845e024833c4c7f641acd7c88187a6bc1e |
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>
edia/mtp/MtpProperty.cpp
|
| 14609818a401ee874482042131f7a3cbd77395b2 |
08-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Improve MtpProperty logging support"
|
| 0c7c7c76a96a82ec728a2d5c091941c4057ffb25 |
07-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Improve MtpProperty logging support
Change-Id: I46800b99763edcc5e994d912941f9f5e9b1c94d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
|
| 79d8c23752e3004b62e513b2057a389346cdc335 |
08-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Host support for GetObjectPropsSupported and GetObjectPropDesc"
|
| 043b601774c0f302b73ed713772cd1bd62f43fe4 |
08-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Use correct return type for getSupportedObjectProperties"
|
| baf00537ab2a022c11a8e3bdc5518e39846d0d20 |
08-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "Revert "MTP: Remove static library build for linux host.""
|
| d767742343f03f9a2f9bd0a3f84061d40433d84d |
07-Dec-2010 |
James Dong <jdong@google.com> |
Merge "Don't drop video frames but to release them."
|
| 98693f674125484de8873d969c209276a6dd604b |
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>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| 2e09e289b7e136481e9215bb61ed47cee5d9919b |
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>
edia/mtp/MtpServer.cpp
|
| ddc4497c17b23d4a9828f977d5ac11ee36059da9 |
07-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Revert "MTP: Remove static library build for linux host."
This reverts commit d46c683f0e13ad9341ba83453835f6658ae5ad15.
Change-Id: I7e56760c92bad1d66d4a1f2415328a4d2138de84
edia/mtp/Android.mk
|
| 97f2c9d530c9663deeb840f332dee205a7a11cdd |
07-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "API Support for both synchronous and queued commands, optionally associated metadata."
|
| 74225f01f6de2a163767e3163583a68243ca6772 |
07-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 6baa5de62a91b151af7a19036706b3d45143a32e |
07-Dec-2010 |
James Dong <jdong@google.com> |
Don't drop video frames but to release them.
bug - 3259009
Change-Id: Ib7634f10a7fe7b7ce7014b79b07957d194bae1a7
ervices/camera/libcameraservice/CameraService.cpp
|
| 5a68e17d07369a16b16a16dcdc539c293b8c2810 |
07-Dec-2010 |
James Dong <jdong@google.com> |
am 23b791cd: am d57fbe88: Fixed a race condition where some recording frames may not be released
* commit '23b791cd0f725d188b84dabfd9eeab4e3775b869':
Fixed a race condition where some recording frames may not be released
|
| df1f37adddb03227b63e2bb45887cbcf2bb56313 |
07-Dec-2010 |
James Dong <jdong@google.com> |
am d57fbe88: Fixed a race condition where some recording frames may not be released
* commit 'd57fbe887fabd027e644caeaa2139c863143a786':
Fixed a race condition where some recording frames may not be released
|
| b3e40847bebc9acd035a1d693885fd14d58beaf2 |
07-Dec-2010 |
James Dong <jdong@google.com> |
Fixed a race condition where some recording frames may not be released
bug - 3258924
Change-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b
amera/Camera.cpp
|
| a3748084e110b2d7c689a3b38b274e6a95756c5d |
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."
|
| 14acc736e336cbd6026df781d4f411e908831815 |
06-Dec-2010 |
Andreas Huber <andih@google.com> |
API Support for both synchronous and queued commands, optionally associated metadata.
Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
mds/stagefright/stream.cpp
nclude/media/IStreamSource.h
nclude/media/stagefright/foundation/AMessage.h
edia/libmedia/Android.mk
edia/libmedia/IStreamSource.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/foundation/AMessage.cpp
edia/libstagefright/foundation/Android.mk
|
| a44153c1a57202fb538659eb50706e60454d6273 |
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
mds/stagefright/stagefright.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/Android.mk
edia/libstagefright/httplive/LiveDataSource.cpp
edia/libstagefright/httplive/LiveDataSource.h
edia/libstagefright/httplive/LiveSession.cpp
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/LiveSession.h
edia/libstagefright/include/LiveSource.h
edia/libstagefright/include/MPEG2TSExtractor.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| f20c213a91eed005ac1c650cfa6f53bfd64c6458 |
06-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| ea7b485595f8cec6a66668b5c54c8f297d843f77 |
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
nclude/media/stagefright/CameraSource.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
|
| 19026fb20c4aba2e83fc8804396e1e5f95523afc |
04-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 16afe2fb439cab6125bb46a07a8078d4ce1c1ea5 |
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
mds/stagefright/stagefright.cpp
nclude/media/IMediaMetadataRetriever.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/mediametadataretriever.h
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/include/StagefrightMetadataRetriever.h
|
| 1cc73922339a110d7ffc47e8842f958492dd85bf |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| 3bac12183aa69cc83e1d19b49d4b06a75318d694 |
02-Dec-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| decd96988e495133e4a1728f612d4c9fdb4d218e |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/include/M3UParser.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
|
| f6882a9c8144dc0fd07f3434bb870e5251f51275 |
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.
|
| 5c2ccf1a4ff8465c076689b6c2d74f2cd4498df2 |
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.
|
| d28b0e7057ea1b85d70f6aa25415655eb67ca126 |
02-Dec-2010 |
James Dong <jdong@google.com> |
Merge "Be conservative in estimating the file size limit." into gingerbread
|
| 14072e56ef34f6ea4b517d69c13b61ad5ec67337 |
02-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 5561ecff: am 077bc4ac: Merge from open-source master
* commit '5561ecff7bdcb8a8f377d442ca64ee87ee1356b8':
Fix HTTP redirect missing statuscode 303 and 307
|
| aecdb70affacb10cde3e7fc22f30fc9fbf631fce |
02-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 077bc4ac: Merge from open-source master
* commit '077bc4ac019ad33abd613448e11d3ad501218991':
Fix HTTP redirect missing statuscode 303 and 307
|
| c97803c62399535d24cbc0e8a2104529f4cd737a |
02-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| 7f7371ad2df83fe6a085089446575d0bcd24d59a |
02-Dec-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from open-source master
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
|
| 40ce1f262cc4edbc8b7c470830325466263acaec |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpProperty.cpp
edia/mtp/MtpServer.cpp
|
| 4070a15be31dd309446cdd400342628a8f0b1328 |
02-Dec-2010 |
Eric Laurent <elaurent@google.com> |
am ed98a7c7: am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit 'ed98a7c776e0a7a20390b3d51f8f7ab7d292a7d0':
Fix issue 2641884: Bluetooth volume is dependent on in call volume.
|
| 9f9886c113a661b2e1784999a5876f7e47754bf4 |
02-Dec-2010 |
Eric Laurent <elaurent@google.com> |
am 78d81851: Merge "Fix issue 2641884: Bluetooth volume is dependent on in call volume." into gingerbread
* commit '78d81851a8ef6691541215afb19e5bc690a4c3c0':
Fix issue 2641884: Bluetooth volume is dependent on in call volume.
|
| ed7c671a57f89d389c9d6cd67e0698f160f69916 |
01-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 2641884: Bluetooth volume is dependent on in call volume.
The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces
voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream
volume did not actually change. So even if we re apply volumes when switching to bluetooth
device, the volume voice volume is not changed and remains what it was when routed to earpiece
What makes things worse on Passion is that stream volumes are limited when connected to bluetooth
and their actual value does not change as soon as they exceed the limit threshold.
Change-Id: Id7c317db45b392a1c20dca2859678e3c64a371ed
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 094b148b8587a67c19585e2af2cc7b53868bfb89 |
01-Dec-2010 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of 0d28be68 to master
Change-Id: Iec5f810c366d3e1c14a6f6294b0aea4ffb30ae3e
|
| 1110ebc912bf2d8c072d1e4bc3688a52674e708c |
01-Dec-2010 |
Eric Laurent <elaurent@google.com> |
am e23212bc: Merge "Fix issue 3142808." into gingerbread
* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
Fix issue 3142808.
|
| e178aafa2282cb0027bcb6ba1d52913e8cfda175 |
01-Dec-2010 |
James Dong <jdong@google.com> |
Merge "Add preferred preview size support in the camera framework"
|
| 075a1f660b77fe47b165db1aff97cdd05e300391 |
02-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3142808.
There is a bug in the way audio policy manager handles A2DP interface suspend/restore
when SCO is used. This bug is not new but has been triggered by a change in the timing
of the events received by audio policy manager when a call is setup and torn down
introduced by commit 164a8f86c7e48992691368c4895709c3bdb835a4.
The fix consists in grouping the control of A2DP suspended state in a single function
that is called systematically when conditions affecting this state are changed:
- call state change
- device connection/disconnection
- change in forced usage.
Change-Id: I46ee2399ee5547b60511fc6cfd32e2720091b0f8
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| c661062c22a086af1fac91e3ea8b4dada2ee7f2c |
01-Dec-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| caf3fabafbbb7f4dc41a8feb1abb35ff0e700786 |
01-Dec-2010 |
Andreas Huber <andih@google.com> |
am b460779c: (-s ours) am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
* commit 'b460779cff97f2619e22911264350f5dbb7e76bc':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
|
| 4a13451b30f73eb5a05c430e386de6b34dd23b88 |
01-Dec-2010 |
Andreas Huber <andih@google.com> |
am 9157478d: (-s ours) am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
* commit '9157478dcfb624a57e2ee83fb3cffd0bb2f72685':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
|
| edc77799729ab1376c04ab12756f22d2c839110e |
01-Dec-2010 |
Andreas Huber <andih@google.com> |
am aeaa3b3c: 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 'aeaa3b3c6ad004b9a13fc9d48c924c77042e8c22':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
|
| 15e4155a951bc2daa0a60c41ee2b5195bca9f5df |
01-Dec-2010 |
Andreas Huber <andih@google.com> |
am 3a2dc0d5: (-s ours) 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 '3a2dc0d573bcfdebc1464ee9316767c2fca91a55':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
|
| 0f5a6f9231e04b5c04af5dc2ad020755e2616f31 |
30-Nov-2010 |
James Dong <jdong@google.com> |
Add preferred preview size support in the camera framework
bug - 3237021
Change-Id: Ica8a3ae5cfbee462b74de98770e33277186c9a2b
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| acd234bba9f048971d66890009eeff9a8db94be3 |
01-Dec-2010 |
James Dong <jdong@google.com> |
Be conservative in estimating the file size limit.
bug - 3045580
Change-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| c75872920cd2de02d04bdc132ad5cf6d78c0578f |
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.
|
| 899ed7543ad9bb82f9d31f8b03ab2215c8c9cd2c |
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.
|
| 03b55cc9d3529995925c8df0d4a35269e591188c |
30-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
|
| 8e37a5c7b8c9be46e3068d43e6caf7e81036a363 |
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.
|
| 8cb5a643fe566acb720aab0bde6fead6e75ef8bc |
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
|
| 8ba606c3b8a807058c92d95dcd7bcfdbc28147ae |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/mkvparser.cpp
edia/libstagefright/matroska/mkvparser.hpp
|
| 462b1d71866fd53564e15db699eff47ad99915d1 |
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
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| acd441dd1f44a5c6c3702dbafe3f82d52dd83d67 |
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.
|
| 2d6dbfb5e3f16d800d2e0b5da283001e53e72768 |
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.
|
| 09b3581ef7ddba70c5d89d252de3a15d512aa49b |
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
edia/libstagefright/AwesomePlayer.cpp
|
| ecd0a4f0b5bdd51bc35097b402202d6349f016ba |
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.
|
| 4d0565de200e61f457e4d97fcfbc4c9ccd81bdad |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/SoftwareRenderer.h
edia/libstagefright/omx/OMX.cpp
|
| 7a1e1bdde7a28d9573367d6f95b736fd793ace0c |
30-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Make sure buffer is big enough before reading the data packet"
|
| 1d34b4b921cdac91116e456d97b57a1931e9e335 |
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>
edia/mtp/MtpDataPacket.cpp
|
| d344781962563e0e32d8cbca9007159a3c58e1b2 |
30-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'master' into honeycomb-release
|
| c618b5af98dec06d49374a61a5a94016f9fec2d3 |
30-Nov-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
DRM Framework bug fixes.
- Make sure to clean-up obsolete listeners.
- Close cursor after using it.
- Add virtual destructor to the base class of OnInfoListener.
Changes are made by SEMC and Sony.
Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
rm/drmserver/DrmManager.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
nclude/drm/DrmManagerClient.h
|
| 879e9cb6b4e8b09a5c7d4942ce36125193deadde |
30-Nov-2010 |
Chia-chi Yeh <chiachi@android.com> |
Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
|
| 7a3811c4bbe0af2e89157094559f9709722533e8 |
29-Nov-2010 |
android-build SharedAccount <android-build@google.com> |
manual merge due to conflicts
Change-Id: Id3901c3969111ea43ffdbfeadcf33491bb1c1114
|
| de42783c730b211abba8d949c955d6defb854739 |
29-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Revert "Temporary workaround for issue 3187563""
|
| 3967a2a353436941277dcffc3babec209ac5d812 |
29-Nov-2010 |
Per Osbäck <per@osbeck.com> |
Fix HTTP redirect missing statuscode 303 and 307
Change-Id: I1c5f3a9f348a05d0558b31f912e10a59382eb24c
edia/libstagefright/HTTPDataSource.cpp
|
| e558276ea14c1a165aa3b319885e9512b8322613 |
25-Nov-2010 |
Gloria Wang <gwang@google.com> |
Remove empty Widevine make files
Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
rm/libdrmframework/plugins/widevine/Android.mk
|
| e4db265e478bdac2381d85cf3dd41bbda14271b4 |
23-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Revert "Temporary workaround for issue 3187563"
This reverts commit 065299b58d1c00cd24e442fa192561decf7b1fec.
The work around for issue 3187563 is not needed any more since the new kernel
DMA driver implementation (commit 7953250be7c9a1c3417e21b20032b571d495d218)
fixes the root cause.
Change-Id: Ibaac2826b63c8e5825ae2e5cab2fb2f0e51ab7b4
ervices/camera/libcameraservice/CameraService.cpp
|
| 32cb1ba657a1094bb815f4d39f3e4bf12ce8437e |
24-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3225810.
Take a wake lock whenever A2DP output stream is active.
Change-Id: Ie50e6d4cb34c8a1ba97b301ef25e10aeb153d8f3
ervices/audioflinger/A2dpAudioInterface.cpp
ervices/audioflinger/A2dpAudioInterface.h
|
| f06a0dc05ecc648b836ae8eb379da5670226a25f |
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>
edia/mtp/MtpServer.cpp
|
| 91a822eb44e7d70f92954304c5d574bb7350bcfd |
24-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Support streaming data across binder boundaries."
|
| 841af895d7f5051b9e96899710dba8d3fe2af1f2 |
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.
|
| f05ff073495b0bb3e49859aee5b54d3e25088985 |
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>
edia/mtp/MtpServer.cpp
|
| d81ce3cf2e6479915658a0829eced062e3655320 |
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>
edia/mtp/MtpPacket.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| b892d0e5556ed6ded3e0548f75ab16fc2e3d92c3 |
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>
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
|
| e2b1028852120bcfded33b8f06f66b780437fe92 |
23-Nov-2010 |
Andreas Huber <andih@google.com> |
Support streaming data across binder boundaries.
Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
mds/stagefright/Android.mk
mds/stagefright/stream.cpp
nclude/media/IMediaPlayerService.h
nclude/media/IStreamSource.h
nclude/media/MediaPlayerInterface.h
edia/libmedia/Android.mk
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IStreamSource.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 40ffa177d5077407c09949bcd4ff0031cff8ad6d |
23-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Do not getConfig on video encoder on output port"
|
| 495f154b602a0103b24b98226370349100a26adf |
23-Nov-2010 |
James Dong <jdong@google.com> |
Do not getConfig on video encoder on output port
Change-Id: Id53e01dd8f3ec0c9ca94bb1d6dfccd7696254a2d
edia/libstagefright/OMXCodec.cpp
|
| 57151f37d7c91e031e91f67a83ee49cad33b4867 |
22-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Rename MtpCursor to PtpCursor
Change-Id: I8ce257641388b195f3e17995d323355b19355dc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/Android.mk
edia/mtp/MtpCursor.cpp
edia/mtp/MtpCursor.h
edia/mtp/PtpCursor.cpp
edia/mtp/PtpCursor.h
|
| 8e4d78541aafe9df78db510b3c804222cceb1e40 |
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>
edia/mtp/Android.mk
|
| 31d7235c79667f88002d9ad87207099ed438a197 |
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
|
| 6dc4726e7fa14e4006f6790c6f1ba02cfe888870 |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
|
| e81e8153c85fa0b0aebae686f6ba51ed2c3a2d11 |
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
|
| f798e438c3997fd3fb39538bf3e958cfdc7a477c |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
am d9334934: Merge "Update of DRM Framework."
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
Update of DRM Framework.
|
| c533edc9c70dd9434e2e496dc0d52f534472c7e0 |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
Merge "Notify the playback status to DRM agents before the playback starts"
|
| 14db41b80c75fd4edfa6c5ed4c776d3537eefb41 |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
Merge "Update of DRM Framework."
|
| 321b630783709eeb18952c3408303489db4ea9eb |
23-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| f5ab57c2d5e02af7483c94eddb177e4f5c9e9892 |
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
mds/stagefright/Android.mk
mds/stagefright/stagefright.cpp
nclude/media/stagefright/ColorConverter.h
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MetaData.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/colorconversion/ColorConverter.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/SoftwareRenderer.h
edia/libstagefright/omx/Android.mk
|
| c130b5bf563d049bd391ccd96985ac278ef8ff8d |
05-Nov-2010 |
Gloria Wang <gwang@google.com> |
Notify the playback status to DRM agents before the playback starts
Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
edia/libstagefright/AwesomePlayer.cpp
|
| a7e43c6266fa02a30647d74aa9d348f5cb85b8fb |
22-Nov-2010 |
Gloria Wang <gwang@google.com> |
Merge "64-bit file size/offset support for DRM framework"
|
| f53263a7d580fb550dbc6c8d4f104119beb82ad7 |
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
edia/libstagefright/SampleTable.cpp
|
| d8f4d4a919fb4fa6bbd405d03dc91f079c3c2e37 |
20-Nov-2010 |
Wu-cheng Li <wuchengli@google.com> |
am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbread
* commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6':
Improve camera documentation.
|
| 8a674dcc94936e2306121016ab258b4c00cc9d98 |
19-Nov-2010 |
James Dong <jdong@google.com> |
Display AVC video sample profile and level for "stagefright" util
Change-Id: I04b3f67d162cf3827bc74ad98cd1e1a0f5f14172
mds/stagefright/stagefright.cpp
|
| 42005680c0817a786f07712ffa359f0883944120 |
20-Nov-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 589e8381: Merge "Improve camera documentation." into gingerbread
* commit '589e838116b0dffa696fa39336d0588124877f98':
Improve camera documentation.
|
| 8577676b0f9247f994ca00bc59fdbcd1318e32b6 |
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.
|
| 5b12af0ea4b98ad60bc066bceb8504d16fcca41d |
20-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Removed uncessary FILE structure pointer for I/O"
|
| 97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807 |
20-Nov-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
|
| 0e89c2282c31173ad03b7593c9587bab5799d89e |
20-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3157123."
|
| a2cd44cb5067b4fe98794860690394254d3ac73c |
20-Nov-2010 |
Gloria Wang <gwang@google.com> |
64-bit file size/offset support for DRM framework
Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
rm/common/DrmEngineBase.cpp
rm/common/IDrmManagerService.cpp
rm/common/ReadWriteUtils.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
rm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
nclude/drm/DrmManagerClient.h
|
| f5aafb209d01ba2ab6cb55d1a12cfc653e2b4be0 |
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
nclude/media/AudioEffect.h
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
edia/libmedia/AudioEffect.cpp
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| cb614f2208ecb7afe1d20125dbc2a61673d1d892 |
19-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "PTP: Fix permissions problems with files imported via PTP"
|
| 27afe3a1cc9c07ac4884a7720087a597aea3c76f |
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>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| 674ebd0b4e1143e38392a4e3bb38b4679a4577bc |
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
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/FileSource.h
nclude/media/stagefright/MPEG4Writer.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/MPEG2TSWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
|
| 60d88f898219b08603548a953749e417e399df62 |
19-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Fix an artifact of going from off_t to off64_t"
|
| 5ab3435dff2ad1b3631cb58745b20483fc1db4d0 |
19-Nov-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am f69f356e: 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* inste
* commit 'f69f356ebaf33aa150817c44ee2bd781f24e4e71':
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*
|
| a9a25c3113b0c744f7d4e69c55fcd7a661ae4cfd |
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*
|
| 7fe4ed1207fa587c65231f9a32374ae4b618d6c0 |
19-Nov-2010 |
Andreas Huber <andih@google.com> |
Fix an artifact of going from off_t to off64_t
Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
edia/libstagefright/NuCachedSource2.cpp
|
| 87995623c1865721daeb0da9efffca42e940c854 |
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
edia/libstagefright/Android.mk
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/stagefright_string.h
edia/libstagefright/string.cpp
|
| b9ff444a7eaf7ffd43970c0477110c6808bd4a7c |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| 3473846f64f5b28e1cbeb70ef5867073fc93159e |
16-Nov-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
Update of DRM Framework.
-Access permission handling
Introduce an internal function which allows the desired process to
access decryption flow. This new function is just for reference and
each OEM manufacturer should implement/replace with their solutions.
-New API, getMetadata()
This API is for retrieving media metadata from container-based DRM,
such as OMA forward-lock content. This API asks DRM agent to retrieve
media metadata hiddein inside of DRM special container.
-New API, acquireRights()
This API wraps acquireDrmInfo() and processDrmInfo().
If DRM agent has valid implementation of both APIs,
Application can acquire DrmRights only by calling this API.
-Bug fix in event loop of OnInfoListener.
Separate OnInfo event loop from mail thread loop so as to avoid
the issue that message is not dispatched when mail thread is busy.
Changes are made by SEMC and Sony.
Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
rm/common/Android.mk
rm/common/DrmEngineBase.cpp
rm/common/DrmMetadata.cpp
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
rm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
nclude/drm/DrmManagerClient.h
nclude/drm/DrmMetadata.h
|
| c2c8868e59bde7f48998e1d89a0d77217bc64767 |
19-Nov-2010 |
Wu-cheng Li <wuchengli@google.com> |
Improve camera documentation.
bug:3212606
Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
nclude/camera/Camera.h
nclude/camera/CameraHardwareInterface.h
nclude/camera/CameraParameters.h
|
| 6ed70d2d41f9929d1c3f5179d947766495f9efe5 |
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
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 317ca79a49746dbd1b6bb83712e93e2dc5f6e4f0 |
19-Nov-2010 |
James Dong <jdong@google.com> |
Merge "64-bit file size/offset support for media framework"
|
| c726bd8b7b9929fd917b01e5551a66ad5fe2c04e |
18-Nov-2010 |
Jamie Gennis <jgennis@google.com> |
Set the external display usage bit in Stagefright.
Change-Id: Ie18fa773fdb83508d96300dd7e4e4c7c3cdc4540
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| c7fc37a3dab9bd1f96713649f351b5990e6316ff |
16-Nov-2010 |
James Dong <jdong@google.com> |
64-bit file size/offset support for media framework
Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/FileSource.h
nclude/media/stagefright/JPEGSource.h
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/JPEGSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/ThrottledSource.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/XINGSeeker.cpp
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/include/LiveSource.h
edia/libstagefright/include/MP3Extractor.h
edia/libstagefright/include/MP3Seeker.h
edia/libstagefright/include/MPEG2TSExtractor.h
edia/libstagefright/include/MPEG4Extractor.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/NuHTTPDataSource.h
edia/libstagefright/include/SampleIterator.h
edia/libstagefright/include/SampleTable.h
edia/libstagefright/include/ThrottledSource.h
edia/libstagefright/include/VBRISeeker.h
edia/libstagefright/include/WAVExtractor.h
edia/libstagefright/include/XINGSeeker.h
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 07e946ce4908eea5eebb30ea89f088fc7c679b5a |
18-Nov-2010 |
Andreas Huber <andih@google.com> |
Log H.264 profile/level in OMXCodec
Change-Id: I5bf98e1ace701b543234dd9dae1315037ff363c2
edia/libstagefright/OMXCodec.cpp
|
| 17468ee8dbfe5eb0b9a4f72be80cbb92a5134800 |
18-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for "chunked" HTTP transfer encoding."
|
| 22c86bdeabc3e7e65913136e44e30aceb1685f4f |
18-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Fix an issue wherre error notification will not be sent after mediaplayer reset"
|
| 7d23aa2a8354046ae0390eb5ad492346af5bce0f |
18-Nov-2010 |
Andreas Huber <andih@google.com> |
Support for "chunked" HTTP transfer encoding.
Change-Id: I2f20d2d9ec0fa0c840b429049b0385289a30e774
related-to-bug: 3205131
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| a1680bce73ea1b051cc92e0df651a53944b104ee |
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
edia/libmedia/mediaplayer.cpp
|
| 14d32754d3a9c1ccf49188c489f224800cd747a7 |
18-Nov-2010 |
Gloria Wang <gwang@google.com> |
Merge "Add getUri() for streaming"
|
| 771b85d9245a24273497792a2515d88d31c99e1e |
10-Nov-2010 |
Gloria Wang <gwang@google.com> |
Add getUri() for streaming
Change-Id: I56e15e67cc5f4d0f41c9e2985404a4d89d757e7e
nclude/media/stagefright/DataSource.h
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/NuHTTPDataSource.h
|
| cf6a8d23345a6e54834e53b1eb7e465f3cb5e914 |
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
edia/libstagefright/MediaExtractor.cpp
|
| e1b8cf1cafb75ce1339b67eb1764e224a257c579 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
|
| d0e9487cd8b2b4ef63583ebedfdce30b3d098f15 |
17-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Set correct format for abstract audio playlists"
|
| f5b2ff2a636d1a98e959553376ebffa3a2749843 |
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>
edia/mtp/MtpServer.cpp
|
| 38f63d7b118448c93dcdd10ec77a5e61c283928c |
17-Nov-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Add new audio mode for audio communications other than telelphony."
|
| ba529e486dde15fe75ea1b48570f9d60a4cf3c48 |
17-Nov-2010 |
Andreas Huber <andih@google.com> |
Support post-decode video rotation.
Change-Id: I9ac90871269c5e132e98a9bf3ad8cae00f329f17
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/MPEG4Extractor.h
edia/libstagefright/include/SoftwareRenderer.h
|
| 0a5ca668c6f7d45706e9aec4a1dfec0aacc6d233 |
16-Nov-2010 |
Andreas Huber <andih@google.com> |
Remove all traces of legacy renderer support in stagefright.
Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
nclude/media/IMediaPlayer.h
nclude/media/IOMX.h
nclude/media/MediaPlayerInterface.h
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/VideoRenderer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IOMX.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/OMX.h
edia/libstagefright/include/SoftwareRenderer.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXRenderer.h
|
| 6f9f029f7fc625bb2a1b448ad30a80a6a6a73b20 |
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
edia/libstagefright/httplive/LiveSource.cpp
|
| f1fb01a7f00b8da90a36268aba8584a872e99175 |
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
nclude/media/AudioSystem.h
nclude/media/EffectApi.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 8fff6bb0000e43f02c9d04ca90f941fdefdc1356 |
15-Nov-2010 |
James Dong <jdong@google.com> |
Add initial stereo capture support for AAC encoder
Change-Id: I1b9335f036ff42d958d0b32f25359b21733f96d4
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/include/AACEncoder.h
|
| b6c22ce7992f0ec3b39c5208e1dcccf70242c510 |
16-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Proper support for variable NALsize lengths of AVC content in .mkv files."
|
| b10f3669a9b73cd024662c2b70f5155bc0c2cd21 |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| c42478ed7b8a379d2f8a43d4d349680c8a37573f |
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
amera/Camera.cpp
edia/libstagefright/CameraSource.cpp
|
| c2db5a15b819368c2c19099cc912c095a45e6bac |
15-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Switch to use kKeyFrameRate for recordvideo utility"
|
| f9c2d3381e0bb174194347b927ef2b36329f3a54 |
15-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "More HTTP live support, AES encryption etc."
|
| d42c40fdbf51cb384a4df4d0bd1b2a74d022c48f |
15-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Refactor h.264 profile/level support into avc_utils."
|
| a5c46895e956e445caffb4642a38486211def018 |
15-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Provide bandwidth estimation support in NuHTTPDataSource"
|
| c7f26cb1fcb2fd3d9af0a6bc9333f1443a688fad |
15-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Remove legacy PV stuff"
|
| c62165b829f0244ad8e3646b3c4e314d6b4ccbb1 |
15-Nov-2010 |
Andreas Huber <andih@google.com> |
Provide bandwidth estimation support in NuHTTPDataSource
Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29
related-to-bug: 2368598
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuHTTPDataSource.h
|
| e332a9181cf6a3155ed1a0fd2afc212ccb1f2753 |
15-Nov-2010 |
Andreas Huber <andih@google.com> |
More HTTP live support, AES encryption etc.
Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c
related-to-bug: 2368598
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/httplive/Android.mk
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/include/LiveSource.h
edia/libstagefright/include/M3UParser.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ESQueue.cpp
|
| bfd41f33c77c66ead48ee378e4ea4b7bfa5fca1f |
15-Nov-2010 |
Andreas Huber <andih@google.com> |
Refactor h.264 profile/level support into avc_utils.
Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358
related-to-bug: 2368598
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/include/avc_utils.h
|
| b6da06e9dfb916da4b88e09e8a83e22ddae445b5 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpDebug.cpp
edia/mtp/MtpProperty.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/mtp.h
|
| 30d713a1c18a5ff892a7f13b2524ba624b70890a |
11-Nov-2010 |
James Dong <jdong@google.com> |
Remove legacy PV stuff
Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
nclude/media/PVMediaRecorder.h
nclude/media/PVMetadataRetriever.h
nclude/media/PVPlayer.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
|
| 225f4d2b175794100884b2ca5cecec1909fe9243 |
14-Nov-2010 |
James Dong <jdong@google.com> |
Switch to use kKeyFrameRate for recordvideo utility
Change-Id: I3f6abfed9c39223fe5c1a1b9c094b7ce8a8ca67f
mds/stagefright/recordvideo.cpp
|
| 2d71233de5450f1b128c8149fdbdf39b937f3cb8 |
13-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
|
| 56ecd20263d7f63476f756fc5d8b043b325c7bfb |
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
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 393410a441b6d06daf286ed496470e9d6b2b6ca8 |
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
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| 54f5501a61bfc13930f9f8d08cbd71a69924d4cc |
12-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Temporary workaround for issue 3187563"
|
| a628f89503e024e2b3f4dad88edd326845e058b9 |
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
edia/libstagefright/include/NuCachedSource2.h
|
| e3aac34f9e0d825aaad597f70e2b3dcb615ef313 |
12-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Temporary workaround for issue 3187563
The audio HAL does not always handle properly simultaneous input and output stream
state changes. This happens in particular when starting video record because output
stream starts and stops while input is active.
Temporary disable the video record jingle the time the audio HAL issues are solved.
Change-Id: I3b923d81af543a335deae9e22d7f396bb5791d91
ervices/camera/libcameraservice/CameraService.cpp
|
| 3279bde5c424f58f630a16426bad42e074ca07d6 |
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."
|
| 34ef0f32c8fc0186236a27e07405328cc1f7c56d |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/NuCachedSource2.h
|
| d78b7ad3c16068877f6da93f9fc8f117393fcd3e |
12-Nov-2010 |
Jamie Gennis <jgennis@google.com> |
Merge "Implement reducing the buffer count of a Surface."
|
| b50a8033f1c7c2b58913212825f9200f1a9e5652 |
11-Nov-2010 |
James Dong <jdong@google.com> |
Add color format query support to QueryCodecs()
Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| effae7fc1aab5354aae649d958db3c8ed77cafa7 |
02-Nov-2010 |
Jamie Gennis <jgennis@google.com> |
Implement reducing the buffer count of a Surface.
Change-Id: I7f979c60c06d654aa8265002836277434bc1a64f
Bug: 3095167
nclude/private/surfaceflinger/SharedBufferStack.h
|
| be0646b4ef6f764c854b61f572c18f8c4fc9a8b0 |
11-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Fix memory leak when 0-memcpy quirk is used"
|
| f23c4f92c3b0202435cf87db2642156fabc46f02 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 7ce05cf6009a2fbbceb3d2c0ff639473d0b7d6a9 |
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>
edia/mtp/MtpServer.cpp
|
| 5f0cb5c62553125715dbbb171f0b81e4b7c6d6ac |
10-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Fix uninitialized variable"
|
| 62db7db731c47a00ee1493e94f3e1d953c6e297a |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| a65856b922a9b56eb87b06a87679ddd781db53bf |
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
|
| d472e2804190ea6261a88dae546e5908309209f9 |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDebug.cpp
|
| 0181726d0cc2d0fc6f6a53b6479dcf0fc41b9499 |
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>
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
|
| 381cb338a94a93bdfe3a5d78a08142a83d2fd8e8 |
10-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 4f4d72de3bcf2a670c2a1007fdb46d78f47ed173 |
10-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder"
|
| b2c59c3b3e670575cc0011176ca30e03bfde3e80 |
10-Nov-2010 |
James Dong <jdong@google.com> |
Fix missing breaks in the profile/level conversion code in M4vH263 encoder
Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| 42ea76335f4c582e9843d6bf4b1fe258bcbf27fc |
09-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Some refactoring and added support for another form of vbr headers."
|
| 4456da54bcd206ed1f518c69cc959ca65a179c83 |
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
edia/libstagefright/Android.mk
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/VBRISeeker.cpp
edia/libstagefright/XINGSeeker.cpp
edia/libstagefright/include/MP3Extractor.h
edia/libstagefright/include/MP3Seeker.h
edia/libstagefright/include/VBRISeeker.h
edia/libstagefright/include/XINGSeeker.h
|
| c643d77a099b0e86ad12de9b498f6f780e03184e |
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
nclude/media/mediarecorder.h
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 0bc8984f6b98a63ba74de7bca697173108dfdd3b |
09-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Rotation support"
|
| 13f6284305e4b27395a23db7882d670bdb1bcae1 |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/MPEG4Writer.cpp
|
| fed975bb3775ebdac136b21e01a9d49aec5b4d23 |
09-Nov-2010 |
Andreas Huber <andih@google.com> |
Added a commandline option "-x" to the stagefright commandline tool.
To display a histogram of decoding times and ideal frame rate distributions.
Change-Id: Id8d70fd2960858c75f5f91ae9ebb9902ad5c37d3
mds/stagefright/stagefright.cpp
|
| 30db2709395c73fb3b4ee334119ceba68c95ab13 |
09-Nov-2010 |
James Dong <jdong@google.com> |
Fix a build break due to the missing kKeyRotation
Change-Id: I6bf030c946abe7a95f8f7bc464e6507fb02cf39c
nclude/media/stagefright/MetaData.h
|
| 2cef2eff28fd5ba3eaa875dd2e22e74b6f464121 |
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
|
| beda607a0b2775484b10d7e6a15eec1e956b3cec |
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
|
| ce0febae177d1816ee7a6750ed9fba52472b9a71 |
09-Nov-2010 |
James Dong <jdong@google.com> |
Support extracting thumbnail from rotated video tracks
Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
nclude/private/media/VideoFrame.h
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 858154e43f7646b767ef4c27af889c741fc5d9c2 |
08-Nov-2010 |
Andreas Huber <andih@google.com> |
am 2e1a8967: (-s ours) resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
* commit '2e1a8967243a88d73f3b3485b07a02aa4f8d16d9':
Support post-decode video rotation.
|
| 3baff73198ce852fa60080bd32703028298b4d65 |
08-Nov-2010 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
|
| 957eaf4c622937d829188a31d71bf2f8aa378816 |
08-Nov-2010 |
James Dong <jdong@google.com> |
am d8166a71: (-s ours) am 1653e261: Merge "Rotation support" into gingerbread
* commit 'd8166a719e192a026bf25a82b8eb6212823950a3':
Rotation support
|
| 4974d5eaf838d893c418b85bd47f6f114d9b5aaa |
06-Nov-2010 |
James Dong <jdong@google.com> |
am 1653e261: Merge "Rotation support" into gingerbread
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
Rotation support
|
| 5ea6ccf2d954f266a8ca622a04aabc3035d00919 |
06-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 85d9b4225d024bb0d602b48bd6d5219cbebd7b8e |
04-Nov-2010 |
Andreas Huber <andih@google.com> |
Support post-decode video rotation.
Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
nclude/media/IOMX.h
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/MetaData.h
edia/libmedia/IOMX.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/MPEG4Extractor.h
edia/libstagefright/include/OMX.h
edia/libstagefright/include/SoftwareRenderer.h
edia/libstagefright/omx/OMX.cpp
|
| aca1fe35480ae76dd6bae167ade40adc955e2d0d |
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
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/MPEG4Writer.cpp
|
| 412abda7a92b842378ecb5fd9bdb43a73d29f468 |
05-Nov-2010 |
James Dong <jdong@google.com> |
Merge "Use meta data in the media recording framework"
|
| c2daea219b626a961d5ccef0b6b22c2496509748 |
05-Nov-2010 |
Gloria Wang <gwang@google.com> |
Merge "Add support for WV DRM"
|
| b371426ce4cf2fa6d8c3d1903b61322feb165d35 |
01-Nov-2010 |
Gloria Wang <gwang@google.com> |
Add support for WV DRM
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/WVMExtractor.cpp
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/include/NuHTTPDataSource.h
edia/libstagefright/include/WVMExtractor.h
|
| 8480835b4bc1350646376aa7f3ae33742a7adeb1 |
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
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/OMXCodec.cpp
|
| a3d7a3174b600a0df3cf452b708c940e93bb651a |
04-Nov-2010 |
Jamie Gennis <jgennis@google.com> |
Merge "Fix a MediaBuffer leak in Stagefright."
|
| 23580e7cc8102a0502ae662a12562dd388fd3e65 |
04-Nov-2010 |
James Dong <jdong@google.com> |
am c25c28a4: (-s ours) am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerbread
* commit 'c25c28a496012f64da57f5beb3b99f7424abb602':
Revert "Support rotation in media recorder"
|
| 691ea5906edde2b65077352d59c79120363eee7b |
04-Nov-2010 |
Hiroshi Lockheimer <hiroshi@google.com> |
am 0ce42c9d: (-s ours) am c181a082: Merge "Support rotation in media recorder" into gingerbread
* commit '0ce42c9d315ea6bf0e4f81b14b9e1a38f8979897':
Support rotation in media recorder
|
| 43a0f387fa505836fc9ab2406ac12478f23995d1 |
04-Nov-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 6d80795874f85b4dbd4f8425ea3326f65ea8abb0 |
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"
|
| ff5bfcf19da45e6bb0136ef818b7c4bf8fd8db3d |
04-Nov-2010 |
James Dong <jdong@google.com> |
Revert "Support rotation in media recorder"
This reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| c59e5f5b601db3b7b8217474ac644a0e600a84df |
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
|
| 5b6edb79827a910d8e677e35e77bc12fdc7772b9 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| ed45fe0730a7e7fc9944741428f5a484350acc8a |
02-Nov-2010 |
Jamie Gennis <jgennis@google.com> |
Fix a MediaBuffer leak in Stagefright.
Change-Id: I548e60b07cf1676476874b156cfbc4ffefdfa2b9
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| dbd40762b0d68e1a8333ec2f46acaf71e5938673 |
03-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."
|
| 09ddead9fcb391efd718738245455398a7ec6887 |
27-Oct-2010 |
Andreas Huber <andih@google.com> |
Experimentally reenable mpeg4 and h.263 hardware decoders.
Change-Id: I1be266bd4534004a08e8836b48cc6c09ca890ccc
edia/libstagefright/OMXCodec.cpp
|
| a935bc4696e4060c362b0f6913cc220331667a35 |
03-Nov-2010 |
James Dong <jdong@google.com> |
am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit 'a3f5b615d7adc5a644cbedd55100deba562ec0ac':
DO NOT MERGE
|
| b251f75d5ca3fa19cfe8a284717e00dec31f18ea |
03-Nov-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
|
| bf3122eed31cd24acdf5cfd25541db0beb77e6f0 |
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.
|
| 26490f71a5a50b2200d60de28ad0ea6b1d0a1847 |
03-Nov-2010 |
James Dong <jdong@google.com> |
am f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
DO NOT MERGE
|
| 63a0a11e8b3292253b3d3bf3a7f7dc733cf6762f |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 23e1202062a79cab313908891d91863742153df5 |
02-Nov-2010 |
Gloria Wang <gwang@google.com> |
Merge "Disable some logs"
|
| 5a6d1487905df5ea28168bd907aae93c0688dadf |
02-Nov-2010 |
Gloria Wang <gwang@google.com> |
Disable some logs
Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
|
| 3041096d137144d9d1ebdd6df88ebe8e85133c05 |
02-Nov-2010 |
Gloria Wang <gwang@google.com> |
am ef8a810b: Merge "Update of DRM framework"
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
Update of DRM framework
|
| bf955268acc4a5a73632cb5f64093d1796c769df |
02-Nov-2010 |
Gloria Wang <gwang@google.com> |
Merge "Update of DRM framework"
|
| 606649635ecb5a7f1378f2538a25fee64214ff42 |
02-Nov-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp
Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455
|
| b235dee7be544a6c990ba4f8d89ab03e38c826f8 |
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>
nclude/media/AudioSystem.h
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| 0821a824a718a28fa5144309bf09ea40411c8ae0 |
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
nclude/media/stagefright/HardwareAPI.h
edia/libstagefright/OMXCodec.cpp
|
| 678d25019bd951a6af083bee0282e5b907713849 |
02-Nov-2010 |
Andreas Huber <andih@google.com> |
Merge "Notify surfaceflinger about (changes to) the crop rectangle output by the decoder."
|
| 55426ce7eded04c9993149edd86f861cfccb4d19 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
|
| e943f84129326ab885cc7a69dcfa17f766b72b89 |
08-Oct-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
Update of DRM framework
- Overload openDecryptSession() with uri parameter
in order to accept URI of DRM content,
Following API is added,
DecryptHandle*openDecryptSession(const char* uri);.
- Unify texisting three event types of processDrmInfo()
so that caller of DRM framework does not have to handle many event types.
- Let DrmManagerService call load/unload plugins API so that
client of DRM framework does not have to manage plug-in load/unload.
- Trivial fix in DrmManagerClient.java is also incorporated.
Changes are made by Sony Corporation.
Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
rm/common/DrmEngineBase.cpp
rm/common/DrmInfoStatus.cpp
rm/common/IDrmManagerService.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
rm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
nclude/drm/DrmInfoEvent.h
nclude/drm/DrmInfoStatus.h
nclude/drm/DrmManagerClient.h
|
| 67f4cae120b49fad8b53a83499db1545bfa41e38 |
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
edia/libstagefright/OMXCodec.cpp
|
| 51ef3f681e275f6edc6886c7a2dd409e6734a0ee |
01-Nov-2010 |
Gloria Wang <gwang@google.com> |
Media scanner support for FL(Forward Lock) DRM file types
Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 02a1db7dc1de2f2df306ec10bab992bc8bbaaca8 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 6b6a736ec71c692c165952fe653a7766075e94bb |
01-Nov-2010 |
Chia-chi Yeh <chiachi@android.com> |
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
edia/libmedia/Visualizer.cpp
|
| 81509a7383ee6c564978afe4e3a0fa1363b88b1e |
30-Oct-2010 |
Gloria Wang <gwang@google.com> |
Merge "Add support for WV plugin"
|
| 6dc55e7067d2baaf92970bd03412df98bf7f88c8 |
30-Oct-2010 |
Gloria Wang <gwang@google.com> |
Add support for WV plugin
Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
rm/libdrmframework/plugins/widevine/Android.mk
nclude/drm/drm_framework_common.h
|
| 565b4951c444fb6c3e273aa1ffe3008393f46bef |
30-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Added some debugging log messages at stop()"
|
| 88c647bb7403ec964a97742408f55df43ed8c6c3 |
30-Oct-2010 |
Gloria Wang <gwang@google.com> |
Merge "- register DRM sniffer only when drmserver is up - notify DRM agents the status after seeking"
|
| a89082944308805b0def7de87c67e370e74b8789 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
|
| cb09c03450bb09304ad5afd2d223254bf2e6e38c |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 05ea6434ed399395e2dbe9f68abb44f04b274cb0 |
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
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
|
| c8ca26ed63edcf2731c4773b8ce3141930cc7245 |
29-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Added profile and level translation in SW video encoders"
|
| 1b4adabf3e3c6f9367f48c3bdaa8b99c60ad334e |
28-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| ff1df9951d09f1a1a8ae2dbc42b82b0f9c164e5e |
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
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/mkvparser.cpp
edia/libstagefright/matroska/mkvparser.hpp
|
| 5cb8fdbfeda95fdc70e8edb69adc20c57cb277be |
20-Oct-2010 |
James Dong <jdong@google.com> |
Added profile and level translation in SW video encoders
Change-Id: I6b9c33c7e4b497f3dc61b2a0dcf4e65727f9bcdd
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| fc9ac988e08a8b4c42e58999300265989f26f24c |
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
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.h
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
|
| c8b3ca3caf7edc08d652937d29724ae7a496655a |
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
|
| 2726a0ff895ecc0eac3ea5dbc04f407b008cc7f0 |
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
|
| d0041bc2649a4989965e4684563200029e324808 |
27-Oct-2010 |
Andreas Huber <andih@google.com> |
Merge "Remove annoying warning during mpeg4 extraction."
|
| 51d6cc75dd2c1b343601b76a93fded170ce6cb43 |
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."
|
| 4e6572967da698d568a44d18797b751ec8ae5401 |
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
edia/libstagefright/FileSource.cpp
|
| 75fc7654280ac2a72fa8124b88e616219a3e61e2 |
27-Oct-2010 |
Andreas Huber <andih@google.com> |
Remove annoying warning during mpeg4 extraction.
Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32
related-to-bug: 3093774
edia/libstagefright/SampleTable.cpp
|
| 64c3bdea8cba454d4404baded584ea0f0611b3ee |
27-Oct-2010 |
Marco Nelissen <marcone@google.com> |
Fix off-by-two and other bugs in the visualization code.
b/3137511
Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
edia/libeffects/visualizer/EffectVisualizer.cpp
|
| 6d309134e3a2c8c1687724a8a8632424ce9a1e33 |
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
edia/libstagefright/MediaExtractor.cpp
|
| 68ce42aa767e03febe7b851b717ae38d3952a80e |
27-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 7b54d6652692ce078df9c606d2d72ebc8ee1f4a2 |
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
|
| 7b74bba58149afe9ff4c67cd508928c303851cc3 |
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
|
| 53409d6fe668e695e92479371f0ec162723feed5 |
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
edia/libstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
|
| d6d4ba97bcb39bf6d0cde32ce7bef1753e420548 |
26-Oct-2010 |
Gloria Wang <gwang@google.com> |
Do not create drm directory here. Fix for bug 3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
rm/drmserver/DrmManagerService.cpp
|
| bbf03557f2008fad77bf9340460d4e6a28cbb957 |
26-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Add two creation flags to OMXCodec::Create()"
|
| deeb96121e9d67ee4c0701c88d5b5cfadc4541b2 |
26-Oct-2010 |
Gloria Wang <gwang@google.com> |
A temporary fix for "Waiting for service drm.drmManager".
Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
edia/libstagefright/DataSource.cpp
|
| d332a72e8f71caea0d3dc898db6a9d7a929fad32 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 1104688c53b1815b543dbe1ef1ca56c7a77f241c |
26-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Remove OMX.PV.* components from OMXCodec.cpp"
|
| c810b75fd04eef8af509bb42aa8837566a374b32 |
23-Oct-2010 |
James Dong <jdong@google.com> |
Remove OMX.PV.* components from OMXCodec.cpp
Change-Id: Ie43c00a4d589e9cca6e9505a5dabd4e0d8af321a
edia/libstagefright/OMXCodec.cpp
|
| b33fd3c77c59b93291135a36638b2777606863d2 |
26-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Don't change the video recording frame rate if it is not requested."
|
| aceaaf303422bbe3a7b8d9cdb96495dbf8109c23 |
26-Oct-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of 965f960e to master
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
|
| 635730831e08c32a5fe7c59125e0919b7e7899cd |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
|
| a9741a9232c81eaf59179acef91f5be46c42264e |
26-Oct-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
|
| 4cd5c79858d5c8508dffdcba5a0fcb941a39cbef |
25-Oct-2010 |
Andreas Huber <andih@google.com> |
Merge "We don't have access to the md5 implementation on the simulator, let's disable digest authentication in rtsp for simulator targets."
|
| c21143636f2c6078c8ad6b096f69a9208591342b |
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
edia/libstagefright/rtsp/ARTSPConnection.cpp
|
| dcd25efb46c41c8d24a0a9cf61fb57f84149709e |
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
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/FileSource.h
nclude/media/stagefright/MediaErrors.h
nclude/media/stagefright/MediaExtractor.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DRMExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/DRMExtractor.h
edia/libstagefright/include/MPEG4Extractor.h
|
| 9ef9214b5abe49e0004973b7e460b19b066b7770 |
25-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 9a4b3063bdfb60918c05289ceac7b5092858b501 |
25-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5'
* commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
|
| d8cba5371423841e6a85816ad4a7fd88d3a60b12 |
25-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp
* commit '89821204379816f6bee6902c4f132c014700c3b0':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
|
| e09591eff55fdff1868b32c3e046c62f800330fc |
14-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
Mirror the camera preview if the camera is front-facing.
bug:3095272
Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
nclude/camera/Camera.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| b2ee05b6c453b7da24b23139489ad92bb2c79621 |
20-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge
Now overlay does flip before rotation.
bug:3114236
Change-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 9065ce6207730f55566eb3b78f9b487b1a4502b6 |
24-Oct-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Ignore b04e3940 from gingerbread-plus-aosp - already in master
Change-Id: Iad2179aa6cf6214ba32239774846bad676f6b976
|
| 315940bf8ab4b49a49ff986afaf4775a2cacc381 |
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
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 5b2146fc017b02bb5f096b1ac336efd3558a117c |
22-Oct-2010 |
James Dong <jdong@google.com> |
Merge "OMX extension to support storing meta data in video input buffers during recording"
|
| 615b4b3f1c33af33f9b082b385ffd973146d749f |
22-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 7f6ff8eb6eed438590e24f0b536c65110976bcfb |
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
|
| ddcd04f2b3fef095e9f4020d5f87b7259e6921e9 |
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
|
| 12ac08f2e1ffb74fd4efdc726066db15e6d3d50d |
22-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Turn the media time adjustment in file writer back on" into gingerbread
|
| 5b6a01e65aa4129a9226667536d1bc1dad5980d8 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 46818115e1b5e7b41ab1ccbd6a863f164f0d3425 |
22-Oct-2010 |
Mathias Agopian <mathias@google.com> |
am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '46beb43357e32507189203db4626d0df954abe62'
* commit '46beb43357e32507189203db4626d0df954abe62':
Mirror the preview for front-facing cameras. do not merge
|
| 8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb |
22-Oct-2010 |
Mathias Agopian <mathias@google.com> |
am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp
* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
Mirror the preview for front-facing cameras. do not merge
|
| 04e410dac8a4e69cff7aaa78c2c0871ce0b027ca |
22-Oct-2010 |
Mathias Agopian <mathias@google.com> |
Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
|
| e870772a78ffe08b1c14a791e368f1499f1be0f3 |
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
nclude/media/IOMX.h
nclude/media/stagefright/HardwareAPI.h
edia/libmedia/IOMX.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| cf5e77c0676f6af1685de30ad902fe94e476907f |
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
|
| 78f3eeab66cb26f75baa86b7b611a1f9a0dfc804 |
21-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 9acb8a2030444c46f9c4fa55e1f6137058cf46f8 |
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
|
| f83dd80384f70da1f6d36d60e831439ff7739ad7 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| edffc0fcbe02409e8e56e06c3b1dccc7215d2947 |
21-Oct-2010 |
Jamie Gennis <jgennis@google.com> |
Merge "Fix the non-ANW video decode path."
|
| bf2ba2a97927c24d14c0e71158abe7b49c557c68 |
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
edia/libstagefright/OMXCodec.cpp
|
| 642a8eac64b7370fd874c4d34654583c50c0850c |
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()."
|
| 6a05c9e912aeb8bfe1ef99516def91a177a481b6 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| a3c740f68f30f3f929cdc8d6ad9ab562502bdff0 |
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."
|
| 4579b7d49f6dd4f37e6043e59debfd72d69b8e7b |
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
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/rtsp/MyHandler.h
|
| 244c73a2f07d4d88e3aace982e522a1d90ff49cf |
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."
|
| 5f995b0e72ed6f186cb0ab2a525c4cfce614f3a9 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| dc99cd65fac3964637f2674db07323c07f720279 |
20-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Fix an issue where the video size was incorrectly retrieved from preview size"
|
| f96c9d193c70c7216b34e6c65f046a09a2a81f14 |
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
edia/libstagefright/CameraSource.cpp
|
| 6a9da9fc558263548ebfbae2cbf177eb7454a41b |
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
nclude/media/stagefright/MediaBuffer.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/OMXCodec.cpp
|
| fda404290828338b2d07a339024796b948074df7 |
20-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 95b18cb9224f79a781c827e0da45c58a644acece |
19-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
Mirror the preview for front-facing cameras. do not merge
Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V
or FLIP_H first. The formula should be changed after overlay is fixed.
bug:3059865
Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
nclude/camera/Camera.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 4d63523ece864ea783cf9ceeb036400af5804397 |
20-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Make camera source ready for handling meta-data video buffers."
|
| 5c9523154d106b555db6c41f85ab205a4f189b02 |
19-Oct-2010 |
James Dong <jdong@google.com> |
Make camera source ready for handling meta-data video buffers.
bug - 3042125
Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| e2ad6734eccc4b9ea7857c747ff9469a9c11ba09 |
19-Oct-2010 |
James Dong <jdong@google.com> |
Camera framework change required for 0-memcpy recording
bug - 3042125
Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
amera/Camera.cpp
amera/ICamera.cpp
nclude/camera/Camera.h
nclude/camera/ICamera.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 78a1a286f736888ae7af8860b2c424af0d978848 |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| f705b5aa8c3b319f7b49f9ea46207187278076f9 |
19-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Camera hal change for 0-memcpy in media recording framework"
|
| 8be92d5cd9881d39b0fad0d00cc48123fc43dd1d |
19-Oct-2010 |
James Dong <jdong@google.com> |
Camera hal change for 0-memcpy in media recording framework
o document the camera hal to clarify the reviewer's questions.
bug - 3042125
Change-Id: I3edf701d084933ee8d1e3b054d222e8c9dfc42a5
nclude/camera/CameraHardwareInterface.h
|
| 74e1e56dfa15be0ffea82c60d81846c4f6615421 |
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.
|
| 60d6ac48ea94f9613e21200f3bcf04b7e818ba11 |
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.
|
| a3764dee0d52e65d16005a411e2d4efd0af20953 |
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.
|
| 2ad46bea6b7ef92b24e9bd98b0b459beb71b96ab |
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.
|
| 9969c0b798ad81764b67f5a098f7c417b82dcc89 |
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.
|
| 4769cc92740e3ab58e9263d42553c12bbf79e3be |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| dab1d3ec1e43539fe9f192cc18d2f54986583efc |
19-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 475c5fabc59a86eb667f3afb4b1523f9b98797e3 |
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.
|
| f200777290d2e3e8b580c512cc0808eae9790705 |
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
edia/libstagefright/foundation/ALooperRoster.cpp
|
| 1bd36ef733ad5c5fa06106387e7ee0df39c33116 |
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.
|
| b5b39d2c348f54a40fc800c9efec17d7f1e8a486 |
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
|
| 232c33806f6e839a7db76f645d52b5647e097f8c |
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.
|
| acc82a3bad22af17008a839d993e3bd7a5d9b5af |
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
edia/libstagefright/MPEG2TSWriter.cpp
|
| f3712f026aad1fc46b1df18d1dba718281e39726 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| c540e63b50c214ccb0eabc93806a64c5b145d110 |
18-Oct-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Fix build (bad merge)
Bug: 3101573
Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
edia/libstagefright/colorconversion/Android.mk
|
| 1691a76853244cf18621ebca8c0f5430f826c265 |
18-Oct-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Remove one more opencore include path
Bug: 3101573
Change-Id: Id60845e4c46523e910504fe6e707f8247a3b6102
mds/stagefright/Android.mk
|
| 8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9 |
18-Oct-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge fb474872 from gingerbread-plus-aosp
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
|
| 8684cd9c53e7cd8c34863fe371ea68a765ca4162 |
18-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 3e00cc070090fa3eab16792da90aa33823cd6db1 |
18-Oct-2010 |
Andreas Huber <andih@google.com> |
am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4'
* commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
|
| b0d62457a9630b144187dcd5b143ee9c91f591d0 |
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.
|
| 06fa2bcce5dd80b406a23f980d8c9fac1524ebfd |
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.
|
| 30550ba7a19372daa7424710ca1367bb7299e459 |
16-Oct-2010 |
Andreas Huber <andih@google.com> |
am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp
* commit 'ff7a7a455c15077e2b691efa370619f06058f697':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
|
| 88639379ad055483736a8ca672a99e107f4fcd4a |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627 |
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
mds/stagefright/Android.mk
edia/libmedia/Android.mk
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/codecs/avc/dec/Android.mk
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/Android.mk
edia/libstagefright/codecs/on2/dec/Android.mk
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/httplive/Android.mk
edia/libstagefright/matroska/Android.mk
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/tests/Android.mk
edia/libstagefright/rtsp/Android.mk
|
| b10d28f233bb881cc12260c320892e5feb198e9a |
15-Oct-2010 |
Andreas Huber <andih@google.com> |
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c
related-to-bug: 3101573
nclude/media/stagefright/openmax/OMX_Audio.h
nclude/media/stagefright/openmax/OMX_Component.h
nclude/media/stagefright/openmax/OMX_ContentPipe.h
nclude/media/stagefright/openmax/OMX_Core.h
nclude/media/stagefright/openmax/OMX_IVCommon.h
nclude/media/stagefright/openmax/OMX_Image.h
nclude/media/stagefright/openmax/OMX_Index.h
nclude/media/stagefright/openmax/OMX_Other.h
nclude/media/stagefright/openmax/OMX_Types.h
nclude/media/stagefright/openmax/OMX_Video.h
|
| d804a1a27b42541157fddf725593d4e2ccaa6ad5 |
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.
|
| b9d3038ec950665639e26acd51329ebc800e780d |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 3e8742fa4a5f0f8b185274763f6ec4e6c3a89344 |
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.
|
| 6fed68ded4ab2c042b7ca14409a24aee916313d5 |
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.
|
| a44501ea0896c2508bd6b807185d9049be6752f3 |
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
|
| f9f083e2853740c97588f4db82c24645ae5880e4 |
15-Oct-2010 |
Kenny Root <kroot@google.com> |
resolved conflicts for merge of a127c07c to master
Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
|
| d6119356f45c9c57cac812357d969ecc3001087e |
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.
|
| 3befd2273602ec4bb111330a58f2cea228613de5 |
14-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 8cde59da2dd8540466aff5e94e9a6e5f74df1f10 |
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.
|
| 2959a5a5b4d151e14da3abe0289c15693409eb84 |
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
edia/libmedia/Metadata.cpp
|
| 0b5181ddfdde400f9cac6db239cf97ced3b67e22 |
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.
|
| a82c3c631a9c0bb721e35d03714715ffe3b0b0c3 |
13-Oct-2010 |
Andreas Huber <andih@google.com> |
Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
|
| 217c81ec709f657bc2817b2083e400946b13e9d8 |
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
|
| 11b72e19970f620adfb1aa458b45ff06cec77f10 |
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
edia/libstagefright/OMXCodec.cpp
|
| f61551f4fc79e7da879802e3974afa9b03ffb5d0 |
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
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPConnection.h
edia/libstagefright/rtsp/MyHandler.h
|
| 7fbdb0903dfbf70b314a74e64e28fb880cdb9247 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| e4edd632d48720b44f7878273f46d192d5703150 |
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.
|
| 43024e1f4953d9b8891b7b72f10e76f11812e772 |
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.
|
| 5cb77e080ced5362b5f047e107327b3cb6ece6c9 |
13-Oct-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for writing to MPEG2 transport stream files." into gingerbread
|
| 59b7dc39ea8332d3418a599e51447d7edb612ac4 |
12-Oct-2010 |
Andreas Huber <andih@google.com> |
Support for writing to MPEG2 transport stream files.
Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
nclude/media/mediarecorder.h
nclude/media/stagefright/MPEG2TSWriter.h
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/MPEG2TSWriter.cpp
|
| bff07d0b22a5ee2d9f044f6cb5e4be1532017ab0 |
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
nclude/media/stagefright/DataSource.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/include/LiveSource.h
edia/libstagefright/include/M3UParser.h
edia/libstagefright/include/MPEG2TSExtractor.h
edia/libstagefright/include/NuCachedSource2.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 43a2b3b5fd4e15ffed4235f348d5eba168e8432c |
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.
|
| 3aef88247a4c980da41c6f448ac5276ca72b9f52 |
12-Oct-2010 |
android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> |
merge and resolved conflicts
Change-Id: I60fe814e8a1fafdc90bac7a4031de9328951e6a4
|
| 012716a857641a977afd16ff6be4bf66fc403884 |
08-Oct-2010 |
Wu-cheng Li <wuchengli@google.com> |
Fix camera display orientation.
bug:3036262
Change-Id: I6fc3dc381fcfaceba09fd5bd14afb85045b3d676
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 23d2071ab44d7b5e3b16e8a81e11884faf01092f |
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>
edia/mtp/MtpServer.cpp
|
| a543d453047fbc09e11c38d1597ae2c71d9a02d9 |
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.
|
| 2bc940b4f961e588459c83862b2c6bea314a4027 |
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
edia/libstagefright/rtsp/MyHandler.h
|
| 250e051e564e3b6f5a88314379d5e145a2b5615f |
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.
|
| e31aa743466972764f9db5a88a713621ff0a29ae |
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.
|
| 9086ce254ac8769dbe90afd5146fce509a86418f |
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.
|
| f0dee1c7bb5ed2b90b2207bde7552d0f9ce2c3b1 |
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.
|
| d10091147c620aab1ca8da97a3c55e1644859cb1 |
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
|
| 1c8ef86f2c25272488c171f1469f996ebf335edc |
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.
|
| 7d6b5cfe9a3f8f4ba59e0843c034ddb4d24e1b0b |
11-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 2eeadf9ded4b5770a713496e9887d668889987bc |
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
|
| 0714c8262054cb6a532025feb082b21b502a128b |
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.
|
| 14d23de89e24f7725eb2b68322e40f94951813c4 |
10-Oct-2010 |
Gloria Wang <gwang@google.com> |
am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp
Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382'
* commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382':
Update of DRM framework.
|
| 0e4d896cb9ab813131c45b3b1fcd4cc66d341468 |
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.
|
| 79e0ac144ca9bb771e2c6b1954c882da12a4bea8 |
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.
|
| 2b37ced30f89437c804c3945b901019b86d210ae |
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
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
|
| 54ff19ac69ace7c05ea90d225e26dab3b133f487 |
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
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| a218d85f3b481c372ccb2d5e2f4d1cc515258845 |
09-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| b4ff90196e0bff3d80bb922933cd646381c2d1b4 |
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.
|
| 0dcd837af4169bdb6fb2a0c384722dc4f57433c6 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 3ec866c1ea1a9b254bb41383311887b53dc418d4 |
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.
|
| c68a48c474f609df3eeb7d9738675d6ac8835e0a |
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
edia/libstagefright/avc_utils.cpp
edia/libstagefright/include/avc_utils.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/APacketSource.h
|
| abc40fd3f7effc025ccad91d05f5d6bb2a4c857c |
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.
|
| 6f3cba53efdd985ab13734c7ad90eb373ae9b9f7 |
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
|
| c7e61d5e67a8218d33835a1b5ca0256b30699ae7 |
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.
|
| e6d26450e5a01be5b7f1343578e7237e68db7737 |
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
|
| 2d511ff0eb4c6127659795b642825c55879a15bc |
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
edia/libstagefright/avc_utils.cpp
|
| 6a3bc8ca890fae9019c668c9f6262403f0769d44 |
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
|
| a5412b0431a22e52a4cc1623b92eb48fcd4d985c |
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.
|
| 70f521de2675ce6eedf4b22beed94ea1289b0f38 |
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
nclude/media/Metadata.h
nclude/media/stagefright/MediaExtractor.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/include/ARTSPController.h
|
| cb71fba37c51352d6e980bfe1f3e93ff803d550e |
08-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Name the writer threads" into gingerbread
|
| 80d41229f6207602b298cb3de89af2ee5e776bee |
08-Oct-2010 |
Andreas Huber <andih@google.com> |
Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
|
| 0f8283abf4ab9ffcc33e7dc53f9f862d5a08e132 |
08-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| a9d9dd2425c32f6868c35f49a3e8f29aafba931a |
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
edia/libstagefright/rtsp/MyHandler.h
|
| 74684081846ee6e68325fa5aba5c45b7447fd368 |
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
|
| bea16187c176837d35e7294f1f14ac195c5d5cad |
08-Oct-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Added getter for session Id to AudioSink" into gingerbread
|
| 4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1 |
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.
|
| a6f61fc8e3d06373c17f0a38ff600e2b71c414fa |
08-Oct-2010 |
James Dong <jdong@google.com> |
Name the writer threads
Change-Id: I51461c3800ac5850e21ff398e80eb20b562264b3
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| 8c563ed9ca8a863a66965330b5d14bb4b4ab59d4 |
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
nclude/media/MediaPlayerInterface.h
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c |
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
edia/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h
edia/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h
|
| fbc504d6a8ec1204b5fa203924f8324ff4aa0e74 |
08-Oct-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp
Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76
|
| da91f0b87bded1e4ebc9cc1a1712c7a0d44fba84 |
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.
|
| 712a002fa3a507158c9ae3435b843edd3a69d7e8 |
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.
|
| fa6a5d481474ba11517c8d0eb6431595d387b81e |
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."
|
| a240812f10335fe4c8677da824293b7e04aad7e9 |
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
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 173e75df12ad5398f3650a30e430dcac0cbcf278 |
07-Oct-2010 |
Eric Laurent <elaurent@google.com> |
am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'
* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
Fixed AudioFlinger not always pausing tracks
|
| 2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc |
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.
|
| 2a4d22d79e927f2245537921e10fc5fda1c47a29 |
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
nclude/media/stagefright/MediaErrors.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/LiveSource.h
edia/libstagefright/include/M3UParser.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| fff59460a567a96ffc8d946bf6f477b4570080a1 |
07-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Add two more options to "recordvideo" utility"
|
| 2b82e9652ba049e754c2cc74e381282f231d5fbf |
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
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 51a7ac55e98dea42ccd2b358b114f0a761bbc63e |
07-Oct-2010 |
James Dong <jdong@google.com> |
Merge "0-memcpy video recording framework"
|
| a9424e227d90eff8ac387c1810a642b33d22e2c7 |
07-Oct-2010 |
James Dong <jdong@google.com> |
0-memcpy video recording framework
Part II: proposed camera hal change
Change-Id: I51663cf5de2b00f71e4ff1828080094676065444
nclude/camera/CameraHardwareInterface.h
|
| c97a1325466bb0e6cee884ec24a04b65082b853a |
07-Oct-2010 |
James Dong <jdong@google.com> |
Add two more options to "recordvideo" utility
o also removed unused code
Change-Id: I49471b0ac1cf70b5eedcde78a21e7770c312c5d6
mds/stagefright/recordvideo.cpp
|
| 7874f08d41f8bd02e2cd52d260ff7bfd80167477 |
07-Oct-2010 |
Mathias Agopian <mathias@google.com> |
am ff04e97f: am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb'
* commit 'ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb':
fix [2835280] Add support for cancelling buffers to ANativeWindow
|
| eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946 |
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
|
| 50d956878e13bc68477f1286eddb223c684912bb |
06-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 8805043df9bba6206839b3a754f2bca4f62a1721 |
06-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Use setVideoSize API in StagefrightRecorder"
|
| 8746c2cf3192033237b465a2834817bf473b9583 |
06-Oct-2010 |
Eric Laurent <elaurent@google.com> |
am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Merge commit '37947afe904220bdf0a1a85a22824d8619be8e36' into gingerbread-plus-aosp
* commit '37947afe904220bdf0a1a85a22824d8619be8e36':
Fixed AudioFlinger not always pausing tracks
|
| 0bcae473ba1cd1d72e7cef8fbab449db060dc8d7 |
06-Oct-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
|
| 185a9a54fb29d3d691c6ec16a7403af194a023b9 |
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
|
| af59ce2407fa4e6e5d8f1664a4df2daf1badd407 |
05-Oct-2010 |
Eric Laurent <elaurent@google.com> |
Fixed AudioFlinger not always pausing tracks
If the pause request is received before the AudioTrack buffer was
completelly filled and the track ready for mixing, the pause is
not executed: the track just underruns and stays in pausing state.
The fix consists in considering the track ready for mixing immediately
if pausing.
Change-Id: Ia6cb4703fee2126e41011a6400ea8eeb3a3e5456
ervices/audioflinger/AudioFlinger.cpp
|
| a782d22f3eacd337c135feb12362934fc0adb6ca |
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.
|
| b2e3954c94717e43b3dc9b880564f166cfbbc0a2 |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 8a04d4691995554e61740bce3f16f48a93ff99bf |
05-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| b0ade8a64d3b3bee75b544313d2047efbb9604f7 |
05-Oct-2010 |
Mathias Agopian <mathias@google.com> |
am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit 'f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp
* commit 'f461930872beb4362998642c115691bdd2e94617':
fix [2835280] Add support for cancelling buffers to ANativeWindow
|
| 50817931e4cb4ae0019fd13c831a2839349834c5 |
02-Oct-2010 |
Mathias Agopian <mathias@google.com> |
fix [2835280] Add support for cancelling buffers to ANativeWindow
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.
Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 11e69dea99ca2ace7bf8eb56ce6f6528fc906813 |
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
|
| a007e8229fb2be4866c483f9cd6c4af238a2da5e |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| deed343476e45165ed176c036c8f77b170bacfeb |
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
|
| 3754a7901b6bed448eaecfbd29a4705b30a6b656 |
05-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Resilent media time stamp adjustment" into gingerbread
|
| 872a481558350634a3fd5cb67939de288af00ecb |
03-Oct-2010 |
James Dong <jdong@google.com> |
Resilent media time stamp adjustment
Change-Id: I13ab87c05f26bb11a3cc9bf8559f98e6ea0752db
edia/libstagefright/MPEG4Writer.cpp
|
| 5f4d93467a03b3a38320416f8cc2c2c2c94bf3fc |
04-Oct-2010 |
James Dong <jdong@google.com> |
Use setVideoSize API in StagefrightRecorder
Change-Id: Ia7ddf5e8d2b931453d2cb801169906191349ca07
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| 05425bc043f6dc45cc093065d5270b70100681b5 |
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.
|
| 8b62c6ae868e01f4c5783566fe2fa20408b61caf |
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.
|
| 83977eb230d829cfe520f55d7977037a904ce548 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 0074d69add482a351b4e0004d62b1cb8ed475505 |
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.
|
| 66e3c30dc6c6e46bd56cb3dcd9fbd732c517a887 |
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.
|
| 6954535ba64374e4e941cd83019a7af53edfb098 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 924ee2b508a422ac2b0c0e44b771064bfb61ca09 |
04-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 2272ee27d9022d173b6eab45c409b3c3f57f30ec |
20-Sep-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
Update of DRM framework.
- Change "void" type of return value to "int" for returning status.
- Add some of overloaded Java APIs which accept database Uri as input.
- Add asynchronous APIs
- Add OnEventListener and OnErrorListener for asynchronous APIs
- Disable debug log
- Change decrypt() API to accept an optional buffer needed by some of DRM schemes
Changes are incorporated by Sony Corporation.
Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c
rm/common/DrmConstraints.cpp
rm/common/DrmEngineBase.cpp
rm/common/DrmInfoEvent.cpp
rm/common/DrmRights.cpp
rm/common/DrmSupportInfo.cpp
rm/common/IDrmIOService.cpp
rm/common/IDrmManagerService.cpp
rm/common/IDrmServiceListener.cpp
rm/common/ReadWriteUtils.cpp
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/drmserver/StringTokenizer.cpp
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/include/ReadWriteUtils.h
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
rm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
nclude/drm/DrmInfoEvent.h
nclude/drm/DrmManagerClient.h
nclude/drm/DrmRights.h
nclude/drm/drm_framework_common.h
|
| 0d14c25355b7807b88fcdc76040ef986aa754815 |
30-Sep-2010 |
James Dong <jdong@google.com> |
Video size retrieval/configuration support in camera hal
This is the first part of the camera hal change required for
0-memcpy of input video frames for video recording.
o removed check in setVideoSize()/getVideoSize() for impl consistency
Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| c2945f514a66ac3ec2972f8d9dbb6219bb8f243a |
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
|
| 97b4b6461f61f14f19cee147531de619816b11a7 |
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
|
| 1fd01cbce6edb54334579f89e49a679207204619 |
02-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Turn off media time adjustment by default" into gingerbread
|
| d0ea545d8357e7d86ad5f19cb2c6499c91786473 |
02-Oct-2010 |
James Dong <jdong@google.com> |
Turn off media time adjustment by default
Change-Id: I1f8021d605d0fd896e0639607a84e3f7c459612e
edia/libstagefright/MPEG4Writer.cpp
|
| b0a3b13b847481c3656f8119f3abd4f746eb2a89 |
01-Oct-2010 |
James Dong <jdong@google.com> |
Merge "Add a video record utility"
|
| 01c048aad73aec73f03cc79538839b08b8c1d1c7 |
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...
|
| 555e9dc7439d89846f4d76046d45b628e2d7499e |
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...
|
| a49c0d09653da20a7194d96fa43b230b2580ba75 |
01-Oct-2010 |
Andreas Huber <andih@google.com> |
Merge "Start playing live streams from the start, no the middle..." into gingerbread
|
| fa1dc774ac8b929666519c57560bf2ce6d422e0f |
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.
|
| 6466853f05e3f3b050de210490cc0fc855e60bb7 |
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
edia/libstagefright/httplive/LiveSource.cpp
|
| c0c726a34f2a35623e0451315d86bead0dcc8f2e |
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.
|
| 969247b7ab387743035dece47356678c8aec2ac4 |
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:
|
| caf5a483b16c2d123eddcf28241ad71131568033 |
01-Oct-2010 |
Andreas Huber <andih@google.com> |
Remove development-only code.
Change-Id: Ic2ca0efb631eb779ca157fb01b02aa19a1222c06
related-to-bug: 2368598
edia/libstagefright/AwesomePlayer.cpp
|
| 32d34824b2bad653ec5e9ef767e50f13a8c182d7 |
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:
|
| 6a63a939601645404fd98f58c19cc38ca818d99e |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/avc_utils.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/include/avc_utils.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/mpeg2ts/ESQueue.cpp
edia/libstagefright/mpeg2ts/ESQueue.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 48322316de22332fa5e949f77c3c1500e0cde80f |
01-Oct-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| c69c13e18a88090c6b06ba8ac244e75cf5e76e38 |
01-Oct-2010 |
James Dong <jdong@google.com> |
Add a video record utility
Change-Id: I3aa7cadf399aa319ee9ca3f391fd8599742bfb7e
mds/stagefright/Android.mk
mds/stagefright/recordvideo.cpp
|
| 9ad6e8bd9fab860e639f6ce95479e4b2a9b03ff5 |
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
|
| b3788b6d0f5a003d3d3e621ad605e2f3f4cb11e8 |
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
|
| 44d9848d6656777a18019223e0d35f2fcc67719a |
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
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| e1cd6c405d0d488f50248b97ee469bc36fa0f9a0 |
29-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 02d615bcb70a1bfe26dd5e3d719d621ee5c4ed87 |
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.
|
| 1720ba0dd73f807cd9b6d90ffbfa581e18b6de08 |
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.
|
| 922855214d0e8ae4159794d7f751f780b3243552 |
29-Sep-2010 |
Chia-chi Yeh <chiachi@android.com> |
Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread
|
| 88cfb59fde78a07ac8797008cf79b22193e983d9 |
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
edia/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
edia/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
edia/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
|
| 9e2e2d2bc86372bde4673c31ef416b2f29d87ac2 |
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.
|
| b91d92d7147c10dd19987706d30dea011ff459af |
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.
|
| 307e7f5295fefe8e21113dabebf434cac0d71e6d |
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.
|
| d3a36cdc4f061eae0fd429a86d023e1e4a744d97 |
28-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| dac69110ed1073bf0a9827a3f78698896dd05d97 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
ervices/audioflinger/AudioFlinger.cpp
|
| fb9b87b6c22d940e5e7cb4b5e7cfae99015a0131 |
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.
|
| 8267b65adcfd944c3f465425183ad7f38b0999e5 |
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.
|
| b8b92e517c4168a96f4d29d35cba7a87f0913c87 |
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:
|
| f4d14086206af57fa2d0144e94124fa73be84968 |
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.
|
| 036fad5034d05beecae19da6da46e1ce7be78e64 |
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
|
| 51be6db7d0e802b3f5d067e39e543ae4f09ed01c |
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.
|
| c7d368d990303dc5369c7c61579f88c5059dc8d7 |
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
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| 10d64915079bfb316a3949fe7fa35dca37a92af4 |
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.
|
| 6fd2b44b156c4ef28e131183f0fe8f7dcecfcc6e |
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
|
| ed54ad0f8619ae416b0968ade6248894cbfc4dba |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 668549b81b97fe706d15d5f6d4b767f63796e022 |
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.
|
| 8211da9eabe28037ebcc23bbfbbe20cb21cb0cdc |
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
|
| cdcd43b47c881aa34b3a6c396e91d0c1b4f3674a |
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:
|
| 640d660f03b2dd52969ebcdf57d1d4b371581781 |
28-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:" into gingerbread
|
| db6222212528637d8f2afa7f49fc3c8c915bafbe |
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
nclude/media/stagefright/MetaData.h
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
edia/libstagefright/include/VorbisDecoder.h
|
| 2658b3f8736a378ad5956aefed069387808d8cd3 |
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.
|
| 6a7b8f67fc9b36c9dd46bc355e7d22f7ba2421aa |
28-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 3a2f37f40cfceb181ee61ae53a7d6954ce9717cd |
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>
edia/mtp/MtpCursor.cpp
edia/mtp/MtpCursor.h
|
| b36f2df1daf7e733be7c51f93792f8fc4252544c |
28-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
resolved conflicts for merge of 191a25e1 to master
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
|
| 02fa834249a01144d6f23137951538600aa5d611 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 2c423a4dc0988e3195c781d56f119514789b604b |
27-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread
Merge commit '83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp
* commit '83ea6389097570e8526a0b612051bb591186f165':
The old overlay should be destroyed if orientation changes.
|
| 0da4dab0a45a2bc1d95cbc6ef6a4850ed2569584 |
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
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MPEG2TSWriter.h
edia/libstagefright/Android.mk
edia/libstagefright/MPEG2TSWriter.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 4a73f3da3501db6e95473a4a653d6319c6d618e2 |
24-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
The old overlay should be destroyed if orientation changes.
Previously the orientation was wrong after suspend and resume.
When the camera app is resumed behide the lock screen, it
orinteation is portrait. When users slide to unlock the screen,
surfaceChanged is called and the orientation is landscape.
The camera app stops the preview, sets the display orientation,
and starts the preview. Overlay should be destroyed if the
orientation has changed.
bug:3031640
Change-Id: I38b527f9ea78c91b538463292152c023383b4695
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 214a2bdcf6f8f26a0218f2d7a8d822c7b3a71d03 |
27-Sep-2010 |
Jamie Gennis <jgennis@google.com> |
Merge "Fix the CameraHardwareInterface::setPreviewWindow comment."
|
| c0540f0bfd5cc0a67e96855496918c9cd212f1ea |
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
|
| eb4caf47783c4c06042b9bbe5d1526e8e859a8be |
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
|
| e2dc4aa0578dea9ab8c13ea4b69b7e6d0d1711d8 |
27-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread
|
| 8428af5381e835cc783b7ecb0d71cb60961c99c2 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 703f59f1c935c264dc11567d3d5183c76cc370ba |
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
|
| bcce675910251fcfd2467ffe0784bc2858b3b85a |
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
|
| 676570f3c6b41e8b854cb31e8ceaa370980eb6fc |
27-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerbread
|
| 7539a0594204c3436571bacabe50a14c78dedf5f |
27-Sep-2010 |
Andreas Huber <andih@google.com> |
Support other kinds of HTTP redirect in NuHTTPDataSource
Change-Id: I3268a94cfb48cee9caa8914804d7907ff91d8a8e
related-to-bug: 3037686
edia/libstagefright/NuHTTPDataSource.cpp
|
| c425ffbfdca80c663b16a875228c15a1147a75f4 |
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.
|
| da4b9bdd4682fb3a20964908cb18d02c943b7f35 |
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.
|
| 2e730571c4b032a3efb5af6169b6d29eb6e7e9ac |
26-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 9b4e14edf6c20bcb5830b692121042cccffedfe6 |
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
|
| be92346b66d396830b30f535bc4b8a545b8c0009 |
26-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix some warnings
Change-Id: I1302cacd1df885c770332cecaaea9f7c8ab97b88
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpObjectInfo.cpp
|
| dde372033b4da75ebde7ea2afdec1c1b86ab5a42 |
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>
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
edia/mtp/MtpStringBuffer.cpp
edia/mtp/MtpStringBuffer.h
edia/mtp/MtpTypes.h
|
| a77e059f0b46220730f3a127652fad6e9999c705 |
26-Sep-2010 |
Jamie Gennis <jgennis@google.com> |
Fix the CameraHardwareInterface::setPreviewWindow comment.
Change-Id: Ied7eb7872e581e23d9f6f02a551320cdd675e51e
nclude/camera/CameraHardwareInterface.h
|
| 7cee5d3c3673d9a325d8096eea0ba48258fc656c |
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>
edia/mtp/MtpProperty.cpp
|
| 0fa449cc475580d995e9d56756c3da5507d2b6f6 |
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
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/Visualizer.cpp
|
| e5f3fd0b8e54a71d0c53c414650d2e8c60c31aaa |
25-Sep-2010 |
Andreas Huber <andih@google.com> |
am a1c7b096: am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Merge commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34'
* commit 'a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34':
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
|
| 2207a10949a7f3fe7ebf5a52974c45221d8acc46 |
24-Sep-2010 |
Andreas Huber <andih@google.com> |
am 6d8fae72: Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
Merge commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6' into gingerbread-plus-aosp
* commit '6d8fae722cfb2833dd542b2a5e613582a9096fc6':
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
|
| 74aa142af3eefd53e676b0a57e6032c9340f561e |
24-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Added two more video encoders"
|
| 76e2c7be04aeff55f3e6a473ff1cd6d9ec2d620c |
24-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool." into gingerbread
|
| f43c92f8d7b1d81cc7248031970d68dc65579be0 |
24-Sep-2010 |
Eric Laurent <elaurent@google.com> |
am 692dfafe: am 880dfe4f: Merge "Fix issue 3007862" into gingerbread
Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e'
* commit '692dfafe02d04cdbab5367546e166580c92e4d2e':
Fix issue 3007862
|
| ea314ac049884b31c5a2a4fecc42e8a50f928a33 |
24-Sep-2010 |
Andreas Huber <andih@google.com> |
Instead of just writing one track to the .mp4 file, write all of them (at most 1 video and 1 audio track). Also support httplive URIs in the stagefright commandline tool.
Change-Id: I67b287cf76546191f398939aabe4480d9e79a948
mds/stagefright/stagefright.cpp
|
| 7bfa78d39ecdc39eeccdbc07f3bb9538176f4209 |
24-Sep-2010 |
Eric Laurent <elaurent@google.com> |
am 880dfe4f: Merge "Fix issue 3007862" into gingerbread
Merge commit '880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp
* commit '880dfe4f675128188f8d598f2025a417ccabd1bf':
Fix issue 3007862
|
| 35dd00b82892c39351ab674ea5626e8065d18a2f |
24-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3007862" into gingerbread
|
| 84e9a10fde8a4ae3da4f88d7911c154933aa457f |
24-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3007862
Removed a cross deadlock condition between audioflinger and audio policy
service mutexes.
Audioflinger::createEffect() locks audioflinger mutex and then calls
AudioSystem::getOutputForEffect() which ends up in
AudioPolicyService::getOutputForEffect() which locks audio policy service
mutex. If at the same time, the command thread in audio policy service is
processing a command(set volume, set route...), the mutex is locked and the
command will call one audioflinger method which in turn will attempt to
lock audioflinger mutex.
The fix consists in releasing audioflinger mutex before calling
getOutputForEffect().
Change-Id: Id44e7feb36e0a295731f6aa97cf32d022edd34d0
ervices/audioflinger/AudioFlinger.cpp
|
| 1d30fc0c9f416c26f1c40560f645a08b2c947687 |
24-Sep-2010 |
Andreas Huber <andih@google.com> |
am 19fe783d: am 37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839'
* commit '19fe783d83b10ecfae3494f7b1ceff9584ad3839':
Proper sync-frame detection for sources that don't already provide it.
|
| cbbf994c26c62bda411af5743d9b898cf6a0fd27 |
24-Sep-2010 |
Andreas Huber <andih@google.com> |
am 37155854: Merge "Proper sync-frame detection for sources that don\'t already provide it." into gingerbread
Merge commit '37155854b4d9ca405e5c41c4ab271006a4716193' into gingerbread-plus-aosp
* commit '37155854b4d9ca405e5c41c4ab271006a4716193':
Proper sync-frame detection for sources that don't already provide it.
|
| 9f25277389e0be7818830b72cc32cca7f0db825f |
24-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Merge changes Ie8bd9107,I1065179a
* changes:
MTP: Reenable GetObjectPropValue and SetObjectPropValue
MTP: Minor debug output cleanup
|
| 677f5700c5ea35256079ef14e06b7382e438d860 |
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>
edia/mtp/MtpServer.cpp
|
| a881b44cc7e18bdfa03251bc65b7d0903a1b1efc |
24-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Minor debug output cleanup
Change-Id: I1065179aa64f43c7d8067ccda249319a016840ab
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpServer.cpp
|
| fdcf11233dbd42612ee7d740a52c5f91b0243be0 |
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
|
| 4620df7b92a85074a2fcdca3fc6f3a3d432bffb8 |
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>
edia/mtp/MtpCursor.cpp
edia/mtp/MtpCursor.h
|
| 6d59aa4bb8e9734a9197290a027356e88552f59a |
24-Sep-2010 |
James Dong <jdong@google.com> |
Added two more video encoders
Change-Id: Ia426da5bfc255974d7bbf3915a473543e0841dc9
edia/libstagefright/OMXCodec.cpp
|
| bbc38312e4521cfd4299203591ef366b7624f043 |
24-Sep-2010 |
Andreas Huber <andih@google.com> |
Proper sync-frame detection for sources that don't already provide it.
Change-Id: Iafeee847b015c5cf6bec6dd5fac22a8d3e8cb78e
mds/stagefright/stagefright.cpp
|
| 0597872f3ff7cc3c8549c26483158c22c3d09126 |
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.
|
| 7504187b46abb91df54539c569840b4c3f0ae1ce |
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.
|
| 1f78badb5398c17526be021e3c9e3c4aa24536ec |
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
|
| 95fcef25b48e35b625899288971ab628efbf8584 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 45adaf601ea69f8bd060c8a219e1ccf7045bbfa4 |
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
|
| 8872633927679cfeb77948ba7b562e07e899ef91 |
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
|
| 5257d874dd68bf67b75c316f44e32e18ede0b469 |
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
|
| bf0025d50700fa9693b56035f72a99d0fd23aa9a |
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
|
| 59f63db5d1cdc91336a2b82e195e0000091cd6e3 |
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
edia/libstagefright/OMXCodec.cpp
|
| c12791a6f5015aafdd47391817889e94c1f42af0 |
23-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 97e0fcc0cb69692a6c518e2bfaf9892a164e7f58 |
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
edia/libstagefright/OMXCodec.cpp
|
| cc08406f74b67b1b7e532ef8ed534c0476ced636 |
23-Sep-2010 |
Eric Laurent <elaurent@google.com> |
am 11746caa: am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc'
* commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc':
Request permission for global audio effects.
|
| 8fe26ff7c76fb0c80c41c603b384d63814da97f7 |
23-Sep-2010 |
Eric Laurent <elaurent@google.com> |
am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '08959c6396b8a52194554f961ae8fd874c994e4e' into gingerbread-plus-aosp
* commit '08959c6396b8a52194554f961ae8fd874c994e4e':
Request permission for global audio effects.
|
| fac4895de4ae63928ff0cf2ccece106eb6d33f72 |
22-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Request permission for global audio effects.
Applications creating an audio effect on the output mix must
have the MODIFY_AUDIO_SETTINGS permission.
Change-Id: I57d88533f91ad0d33680107d79abcec28f7263b5
ervices/audioflinger/AudioFlinger.cpp
|
| ebad184047143b8439e4ce1bd80dacb8d0573e0e |
23-Sep-2010 |
Andreas Huber <andih@google.com> |
am 2de0a50a: 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 '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1'
* commit '2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1':
Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
|
| 325bc94e89e786ab1e44bc33428fd5f9382c4e34 |
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.
|
| 9fb467e5c50795afda3675efd5ba0e5cd552fd75 |
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
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| 75acc1d6e36fb255a6e0b772678969d6353970bb |
22-Sep-2010 |
Andreas Huber <andih@google.com> |
am cc6b941c: 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 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e'
* commit 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e':
Make sure we drain the avc software decoder's output queue once we run out of input data.
|
| c8f53719e482b60c63b7d584c2528fa007598dac |
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.
|
| 5a808f8de7b81081ac682e96b625d45fcf43fe46 |
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
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/include/AVCDecoder.h
|
| 079cc2e29823e16ff775cebb5709bcb3a24a809d |
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
|
| 3cc8eb61f0931b53e4a6ea5346ac5720d01161d8 |
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
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| 9dbd5240b3096b6a44525b22d8a10057ce13cec9 |
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
|
| 15b1eeaf7f694939873bb28a2ef223e6826ef568 |
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
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/include/AVCDecoder.h
|
| 1ce6e92e478bb44ec6fdd324a2f6a2b3e282f7de |
22-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| a4d13a5419af68fe5adb521e265f8c80c4e760b1 |
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.
|
| cd20f59a3987e738b50adb02761ef853d6531597 |
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.
|
| 5ee6bb5a8665cf09aa6266012d6ba7d405886724 |
22-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2913071." into gingerbread
|
| a60165dbfcc44c6114ce63dba38bb3f08f614081 |
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.
|
| 3f94dacbd43b48bb629a79e45e738ead37c5debd |
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.
|
| 1f6ea1df082767b51a311630f5b72e2e264c1e3b |
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.
|
| 4d6205a5ceb3e53cdcbf4f473e7bb1509503c1c5 |
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.
|
| a3121424e0680647e8ab7beb4229db6d8d4f337f |
22-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "This log message is codec specific." into gingerbread
|
| 43d4f743a9990cebc999d670ffb5a06133b80a54 |
22-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Remove stagefright foundation's incompatible logging interface and update callsites." into gingerbread
|
| 6e4c5c499999c04c2477b987f9e64f3ff2bf1a06 |
21-Sep-2010 |
Andreas Huber <andih@google.com> |
Remove stagefright foundation's incompatible logging interface and update callsites.
Change-Id: I45fba7d60530ea0f233ac3695a97306b6dc1795c
nclude/media/stagefright/foundation/ADebug.h
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/ThreadedSource.cpp
edia/libstagefright/foundation/ADebug.cpp
edia/libstagefright/foundation/ALooperRoster.cpp
edia/libstagefright/foundation/Android.mk
edia/libstagefright/foundation/hexdump.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/AAVCAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTPSource.h
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/rtsp/UDPPusher.cpp
edia/libstagefright/rtsp/rtp_test.cpp
|
| 0e75f0f0147baeb6277c3dcc4403cf0201155a99 |
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
edia/libeffects/visualizer/EffectVisualizer.cpp
|
| 955194dc6a9f74dc4aeb4559f71f0323dc2f8166 |
22-Sep-2010 |
Andreas Huber <andih@google.com> |
This log message is codec specific.
Change-Id: I603ae7bd13b186a6df0a26ea9abe073e89276caf
edia/libstagefright/OMXCodec.cpp
|
| f13c1a67704b81500c146f0e07bf8135baae9008 |
21-Sep-2010 |
James Dong <jdong@google.com> |
am 7e8a16e8: am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread
Merge commit '7e8a16e884632c85a54dc351c0b4f79aea116237'
* commit '7e8a16e884632c85a54dc351c0b4f79aea116237':
Allow record to set input color format as a command line option
|
| ee7797e08ca6cdcc1a4d3663f83946a11287ab74 |
21-Sep-2010 |
James Dong <jdong@google.com> |
am d3c9fce3: Merge "Allow record to set input color format as a command line option" into gingerbread
Merge commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3' into gingerbread-plus-aosp
* commit 'd3c9fce36caa3991b2bc035ab80f92e110b0c0b3':
Allow record to set input color format as a command line option
|
| e9364134485f78f8e8354b27419b67646f343812 |
21-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Allow record to set input color format as a command line option" into gingerbread
|
| ddca588b03095141035f338b5dc4bb65b105ce62 |
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
|
| 9219e0b4eb346b5e0a1a21e77fe22b8c2232ec4b |
21-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'
* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
|
| 4b64ef5073432ee87b9037d9e04aedf6b46590e2 |
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
|
| 425587d4566c1667448bf91fa452b4def8b6cedb |
21-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Another attempt for fixing AAC+/eAAC+ related issue" into gingerbread
|
| 470644a573b24bc13e0e357a01902322dee0a716 |
21-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2' into gingerbread-plus-aosp
* commit 'd45cb72ac0d7d57829ffc9223decb89a5fc42ce2':
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
|
| ac4205c9064ca961883b1ccf2ce565e449c0983e |
21-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
This constant is not public yet. Continuous autofocus should
behave differently in still camera and camcorder. In camcorder,
lens movement may be more smooth. And the triggers to start a
new focus search may be different. If there is a need,
FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future.
Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 18269453d3c6c350c9743a03820d41a69dbb4654 |
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
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/include/AACDecoder.h
|
| 32eaa26f6152913b015f855a930cd8f12bd21d4d |
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>
edia/mtp/MtpCursor.cpp
|
| a73367993a9d53a4daceeb40ede183e60dd571e5 |
19-Sep-2010 |
James Dong <jdong@google.com> |
Allow record to set input color format as a command line option
o Only YUV420SP and YUV420P are supported
Change-Id: I425e8b29d9dca8c05066c1cd777f8bdede52964a
mds/stagefright/record.cpp
|
| d44b51d9fcb0b5d891d2abece83a551e71ebb73b |
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.
|
| a2845350d5ed4518915cf54b15dccf26f064884e |
18-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| b7f9af3f357ceea5af519b972828334274f2a420 |
18-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 979d233237271c2acc0c3902508e208fce16a1c9 |
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.
|
| 6901625dcb847871e23f04b9a282dc5d313a1d57 |
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.
|
| 6d2969a09ffe48c1600fd48caeb6293a92e204c2 |
18-Sep-2010 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 1fc97385 to master
Change-Id: I9b1fb673844eb822313067d3be16b6c1ce1f2ccb
|
| 1c1503cf47c0a37a30e7acac2c5d29140fc61a5f |
18-Sep-2010 |
Marco Nelissen <marcone@google.com> |
Add a check to track a problem the monkey script has been triggering.
Change-Id: If3896946d993cbab2442e17740f18efd7e753a3b
edia/libmedia/mediaplayer.cpp
|
| 467bdb0df9909b20492c103ff6839f39d346c670 |
17-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Adding default profiles for specific levels."
|
| d5672bc7162fa49abf9bb5844195887e911aa7ce |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| ab1b9612fc5ad9d98ff76b3eb18d9f48a295f13e |
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.
|
| 583027ca28629510622bde541cc1649371ac9502 |
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.
|
| 00998fbb52dfa78ac3a4b3706d64fc612926bfbc |
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
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMX.cpp
|
| 78eff720c86eb6d4e3d45a144df60b2ca464d2d4 |
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
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 095916d92ea2378aea6fc35e80e368172c02021b |
16-Sep-2010 |
Andreas Huber <andih@google.com> |
Register the new OMX components.
Change-Id: I795287c63073ca86ad0f97d6afcfc85c401dc984
edia/libstagefright/OMXCodec.cpp
|
| 302a965f4bf5d179ccc68b7d853e2806941de020 |
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.
|
| d6c23e7e09b97350a9e7a54dca91a9c7c48cb9a5 |
17-Sep-2010 |
Andreas Huber <andih@google.com> |
am 23c6ad7a: am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread
Merge commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0'
* commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
|
| 0e38944cc890cc3c68077c8e29d63e6107c9d184 |
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.
|
| 2f9c204a8190ea2210b6e87eea718a44abff0b18 |
17-Sep-2010 |
Andreas Huber <andih@google.com> |
am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread
Merge commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead' into gingerbread-plus-aosp
* commit '549629d36690ac09498d0a9b2aac4ae4ceb7eead':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
|
| 876742d2526fdf03190dad2ab9deb76b7c02939f |
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
|
| 102dfe09e7b58efc2d67c212779d2ac3a0be5204 |
17-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)" into gingerbread
|
| c225da975515892952602cd3b1e24efc0cceaa4d |
16-Sep-2010 |
Andreas Huber <andih@google.com> |
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
Change-Id: Iec809df89e6b75706cf5b1ce21006c2e217e018f
mds/stagefright/stagefright.cpp
|
| 104fcb88d4125caff74f63be4ce23537ca693ac7 |
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
edia/libstagefright/WAVExtractor.cpp
|
| e2d8ba8c36fd39eb98f604b11654aa5466673260 |
16-Sep-2010 |
James Dong <jdong@google.com> |
Add YUV420P color format support for video output from camera hal
Change-Id: I5c8266348d0840361c8095ce351ac85c44d4068f
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
edia/libstagefright/CameraSource.cpp
|
| d051aba29f1dc6a0cc52b1ba8dbc5abf35b360cb |
16-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 38a7476749eb4b4fd117b6e64027870077eb22d8 |
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
|
| eafc0ea74b2929e6d7704320b1bf910e6ef162be |
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
|
| 0270f47ffeee4907ba1626f6871f5157e529e54e |
16-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread
|
| ada349a3340d495a89c322dead7fea09d3538919 |
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.
|
| f868457219ca363d94d48d94ae6be39d7239052f |
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.
|
| f01691f44dcbe38a0ab3914e7c709ddc009d95dc |
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
edia/libstagefright/OMXCodec.cpp
|
| 47dc308b114f2ee83f71bc9787db343ff3cc64fd |
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.
|
| 5a0beab037fa8fd630c4c3290c8bbf410a51596a |
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
|
| 72b2749aafff4643bd91b845c621fb7211b96208 |
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
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
|
| 96d22b2f001b2ad7dc6573152995263016bc4a08 |
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.
|
| aae3516293e58c0b015d4109bde58c11d503433c |
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
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/ThreadedSource.cpp
edia/libstagefright/include/ThreadedSource.h
|
| 32c41f51d5abd11623fe153888128a36e0184301 |
16-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| 1db7c215a91bbb3245d09b3c9a63e0b4d4b24552 |
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
|
| 70fb57d15b829e3f20224727311f945e3bb13f3b |
16-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix problem in lvm effect bundle wrapper" into gingerbread
|
| 29cc743e57f2a1701a0a0d3a0e5406ed0f2e8a89 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| ae0de4aa0a0eb85ff28ca9db6e7edf737a90ae52 |
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.
|
| 0a1b9dcf0106731e1b8113fb77e933ffaf70bd0b |
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
|
| 3bdab1621022eddf125386daa7c097c3df64b16b |
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
|
| ac5f724d00c8ac2040f01485873b6373f8994354 |
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.
|
| 26b4a13c69cbf7e9174dde8c51ee50526b02d215 |
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.
|
| 616715ab614ce25ea395a8e9a553a82637f1021d |
16-Sep-2010 |
James Dong <jdong@google.com> |
Fix potential unintialized variable yuvformat
Change-Id: If0a77855d98b45769a154b25d6535f30cd41536a
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| eae61939e1dc3079fac58887ad1af08d1de074c7 |
16-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Upgrade to the latest .webm project code." into gingerbread
|
| acf67ea7f5ae70a093d8b164872ad1bce502f807 |
16-Sep-2010 |
Andreas Huber <andih@google.com> |
Upgrade to the latest .webm project code.
Change-Id: I645eff9b7c10bf33144977e6093663407af402e2
edia/libstagefright/codecs/on2/dec/VPXDecoder.cpp
|
| a5d9071c3e9c6bbcb889b56fe1a7440d130fb0b4 |
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
|
| 1d857be60e1a94b39d2e78201eb28692f93140f6 |
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
|
| d79091075e470f5c59a5400027fd41f6c9ea848a |
15-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Add some explicit error log messages" into gingerbread
|
| e78d3bba024e979715383e2c2b4b086749508090 |
15-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
|
| 09a38311206a19b79ca302b9cad926608e938fd4 |
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.
|
| 3b93208243d6f4caab3f0b27372e95c9be8d9893 |
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
|
| 6f85dba3768089679ff5e35ad2f1841918d0adb2 |
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
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 3ee899e0466ecce107257beec04a2178939cf24e |
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
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 59d9e31c503e5c2f49448362a0d3a8f1150fb6c2 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 7bb20172891fdd27cc13208ac9e36b80309ab0e5 |
15-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Added command type to play recording sound."
|
| 3b7b358d1a45844ca427626554ff81f472fd1583 |
15-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Added command type to play recording sound.
Added CAMERA_CMD_PLAY_RECORDING_SOUND command type to play recording
sound through sendCommand. This is currently needed by time lapse
recording using still mode capture, which disables the shutter sound
but needs to play the recording sound.
Change-Id: I376aa40f45b6064fd862abc065456b06fc338020
nclude/camera/Camera.h
ervices/camera/libcameraservice/CameraService.cpp
|
| 89585df2c26508c84756d500b3a9f7bc5c693988 |
15-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Adding enable/disable option for sendCommand()"
|
| a1abc1a76741914c7bc43f1df9e32744f023ab75 |
14-Sep-2010 |
James Dong <jdong@google.com> |
Add some explicit error log messages
Change-Id: I8a69157b75a67f0d3c19f05775a8cb0629232299
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| b5ca4618a722a21f084fe8bfc1c2992749ccd3f0 |
12-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Adding enable/disable option for sendCommand()
- Added enum CAMERA_CMD_ENABLE_SHUTTER_SOUND which corresponds to
command type for enabling/disabling shutter sound.
- The implementation checks if it is legal to disable shutter sound.
If it is, then any process can disable the sound. If not, then only
the mediaserver process is allowed to do this. Currently time lapse
capture needs this functionality to disable shutter sound when still
mode is used to capture time lapse video.
Change-Id: Id147a3bcc6a345c2c6a6d52bf98fd8292386bb19
nclude/camera/Camera.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 67e9269eaeab41a6c9a18794ebb32cbd1414381c |
14-Sep-2010 |
James Dong <jdong@google.com> |
Fix audio input sample timestamp when audio driver loses audio samples
Change-Id: Ic0f1489f710929af50e7714867ae5153b3242dd8
edia/libstagefright/AudioSource.cpp
|
| 5cfcd31fc5fd50348e04547cc16eb92fe423cd7d |
14-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| e757f0fc727cd99d2aa5434e709651c32705e54d |
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.
|
| d32114950770a6e9361e0869a41e5a03a7acab42 |
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>
edia/mtp/MtpServer.cpp
|
| d20b4cfde2848052cf93ed13df14d75347ec64fd |
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
|
| df268bacee4fac7b07ed129d14707c981a9ed895 |
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
|
| e0aed6ddcb4e3c301b80aa26706b6052dab42c41 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| a68cdcb2d6cd22b59746c890c7a8154c31c5719f |
13-Sep-2010 |
The Android Automerger <android-build@android.com> |
Merge branch 'gingerbread' into gingerbread-release
|
| c59ad085c9737e8d56328732be6864de302acae9 |
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>
nclude/media/mediascanner.h
edia/libmedia/MediaScanner.cpp
|
| 5441abc147d97f722d35fe71e7fbf41ce48a4944 |
12-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am ec06144c: am 36edb202: Merge "Make DRM libraries optional"
Merge commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415'
* commit 'ec06144c9ddd5eb06ab77b885bc5312e74b38415':
Make DRM libraries optional
|
| f31edf5d3b62f64f7395e61650b3011d21d0e6c0 |
12-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 36edb202: Merge "Make DRM libraries optional"
Merge commit '36edb2028acf9f876a288a49a66bc749b28e64c1' into gingerbread-plus-aosp
* commit '36edb2028acf9f876a288a49a66bc749b28e64c1':
Make DRM libraries optional
|
| 9783ed8f85af3d7c72030098acfed7e1d6638349 |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| cc24f76ca5e8c987920d819c399c3eca11432f17 |
11-Sep-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
|
| 1a02fabca518806222212bdc708b36a37a7c3925 |
11-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Adding hasProfile."
|
| f53873d41edcbe7b2893dd0dd9f35c61850f0316 |
11-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am e3dabc4b: am beeb71df: fix build
Merge commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72'
* commit 'e3dabc4bc4ad977d8b126e644e4328e70bd58b72':
fix build
|
| 84915e0c99401517de09b13375abde3fb88cd196 |
11-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 03b3eda2: am 862438eb: fix build
Merge commit '03b3eda2f87bc2d837586303585321f073ef5c6a'
* commit '03b3eda2f87bc2d837586303585321f073ef5c6a':
fix build
|
| 033531f83043a658d4b43a0ee231446a4c89e66c |
11-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 3b3d2160: am 7547b8ea: fix build
Merge commit '3b3d2160b7c8a17f44476d34408296264d57f2cc'
* commit '3b3d2160b7c8a17f44476d34408296264d57f2cc':
fix build
|
| a0d472f114bb6a74005aaf61e91e3569ae061630 |
10-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Added specific resolution and time lapse profiles."
|
| 8bb5603cc735315c8691dc9b7a81b4ad4d6e253e |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| c0a84782589eececdfa7e723e8aa0e572d0d79f5 |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| c129f3a04175033a38d29b13e8c59c4c1cfb16f7 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am beeb71df: fix build
Merge commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2' into gingerbread-plus-aosp
* commit 'beeb71dfd4ffe635daba3745515bb392f7c5ada2':
fix build
|
| ce2cfc5319e814c16cc6aae8e27d02aa1069b346 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 862438eb: fix build
Merge commit '862438eb69297accde289230f4c4623b56a39458' into gingerbread-plus-aosp
* commit '862438eb69297accde289230f4c4623b56a39458':
fix build
|
| 5d3acf9ad4b192cecdd864b4808b6d69befa01e8 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 7547b8ea: fix build
Merge commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c' into gingerbread-plus-aosp
* commit '7547b8eac6a4011683a93f51fdabf5a978e1f18c':
fix build
|
| 0335b70c6cdbe96650d4bed817f9233cd8db1c6d |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
rm/common/Android.mk
rm/drmserver/Android.mk
rm/libdrmframework/Android.mk
rm/libdrmframework/plugins/passthru/Android.mk
|
| 940f410a636a9d78851034c658f805ab1091c1cb |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 275c732cd79a40617773636086b287901f8d4485 |
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
|
| 8df37bbe10e46f03bdc7d3b7e88eb3a59219a46b |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp
Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373'
* commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373':
Initial contribution from Sony Corporation.
|
| e2af4f70b5326d7c55533639844b3a7eaf12e34c |
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
|
| a1754133ee6640346b5fd6daa4666f5d2285379a |
10-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Merge "LVM release 1.09 delivery" into gingerbread
|
| a43fed707fcea14b3dd048ef9d9359fcb24b90bb |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
|
| a01b7943b59eb869911f6a43b906f44ddefdebed |
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.
|
| f3915937c4af4d5a10cb7c2429e4fd323b69a087 |
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.
|
| f50e91eae5ad9b537b4d0d6adbe3eac84d978a5b |
10-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Only enable CAMERA_MSG_PREVIEW_FRAME when necessary."
|
| 0667de7038238c31af77865eb6d83c5ae9ca1b1e |
04-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Only enable CAMERA_MSG_PREVIEW_FRAME when necessary.
Now camera driver uses ANativeWindow for display.
CameraService should not request preview callback from
camera hardware if applications have not requested it.
bug:2951018
Change-Id: I85f74ea4a61104feca018867bc9d6dfe3a9479f5
ervices/camera/libcameraservice/CameraService.cpp
|
| 3df6c0fc75b3278a93eff176471bd9c6365ab24b |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
rm/libdrmframework/Android.mk
|
| acb5621440968ddf62651a2e6c1ddb69cf675972 |
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
edia/libstagefright/TimedEventQueue.cpp
|
| ea916b1e27da465c5989a443040ca5e65e4592fe |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846
rm/libdrmframework/plugins/passthru/Android.mk
|
| a4f8842d67004f168b53fc684d4622679e19a3df |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
rm/drmserver/Android.mk
|
| 19997876b3af80adc2ae7395e6fab053268026fc |
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.
|
| ea162150921988808ee83195a913f015de5a3182 |
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,
|
| 1432a0075c0f638206a8e59e33cc81d5caea4bcf |
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.
|
| 5185b0138aaeffeecc93b958cb9cd9821f260faf |
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
edia/libeffects/lvm/lib/Bass/src/LVDBE_Private.h
edia/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_Process.c
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
|
| e3ae15e0ccee7b57a8e8f2cb283b041e97607755 |
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.
|
| de32b0f6b1364af8b7a1124831d268e178f82891 |
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,
|
| 31d2a4b01517a5e5d923d066269be49207b2c805 |
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
|
| 4c73f1f95838a9cc86ff7d3beb7388f98eee562a |
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
|
| 49110ce0ed95918c85eebe6e09e900b905b37e23 |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 84cd8adafe0bbfc1af775c9d9a69ec988cb05714 |
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.
|
| 772bcc27ba7c1fd42c72ecaca55d533328bd18e7 |
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
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/include/MP3Extractor.h
|
| 9b2cef27bbe953c0b5c37ada9bf18d706c396513 |
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
|
| d2518e0c0a5bffd30b0dccb04fe7bf5b77c354b1 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 368b56e07f5d55911bfdd81bf39c04da57bccfb4 |
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
|
| fbf7162465ee5b9e928d5676d439a475c93b0725 |
09-Sep-2010 |
James Dong <jdong@google.com> |
Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
|
| 3c3763d2ee1cd1fba7fe522fbaf0faca315d8c2a |
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
nclude/media/stagefright/MetaData.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
|
| 87e607994fa1703e1b975af41b02e539e7b7411f |
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
|
| e92e213499d7bc6d867886c00e7a1be081ab8fbd |
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
|
| 54c38fdcff502ab3502c55dd314a954dd60c0183 |
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
nclude/media/EffectEnvironmentalReverbApi.h
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
|
| 5de4999e6dd8a3f2740d20e30e8a3fccdcb76362 |
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
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 5d7d90a0dec80114e4e299aaca69e41df6ff296a |
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.
|
| 155e833a7a5fc3e193691324cf9326da1bc3289a |
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
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 4d3f97efda864ca571047edd5239fc8275ea37c4 |
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.
|
| 734c3c96787e550b4a28bdf895438a7e79f30152 |
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
|
| aa8d119ae39dc28cf1599575b97a4f96a7893a22 |
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.
|
| f9c0ae8474dc7180a561ed1e7a8ba3d0d31f6d38 |
04-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Merge "LVM release 1.08 delivery." into gingerbread
|
| 77682dbd1d86b9504e1fedcf2b44619dca4d0d19 |
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
|
| ddba3f0424340869f7819153cc8c1037caf62919 |
04-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Not all audio source has the drift time information" into gingerbread
|
| 2d3bf535004f7310fe04a4b5f46b6747cdb3c93f |
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
edia/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
|
| 49ce029a6b62681c576a51f963d734eccd4eaccd |
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.
|
| 1d816a9af5ed42aca84a46f51d77648aca4139b8 |
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.
|
| 24beeac58c36b780ae61d1fb7a3421ffe5510a1e |
03-Sep-2010 |
Jamie Gennis <jgennis@google.com> |
Merge "Add the new Stagefright ANativeWindow OMX codec API."
|
| 83750eaf5a3f38c243a9e7eb81d4b2421e3a0d88 |
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
nclude/media/IOMX.h
nclude/media/stagefright/HardwareAPI.h
edia/libmedia/IOMX.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 8ae49d87b98d57d6758b0c51b95e28a6581a79f1 |
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
nclude/media/stagefright/MetaData.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 511ea9823b1ab1d45eb86607cb291878c70b26ae |
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().
|
| 6f6bc92bc775bc6ddb6d85a45030b217ceb28976 |
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().
|
| 1a4c79eada496dc43918440608f15410eaecd28c |
03-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly buffer a certain amount of data on streaming sources before finishing prepare()." into gingerbread
|
| 8650e1960905097f6f1d6aa462ccb1c93c656834 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| caa68a57f0b358b8fbe17447ffa453b9120a8610 |
03-Sep-2010 |
James Dong <jdong@google.com> |
Not all audio source has the drift time information
Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
|
| 35b8b488e0822854d411976710ed55f3a1c72bf3 |
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
|
| 52c006e31d4fc710abfb98b66fdb79fb8cb096ac |
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
|
| b4d5320bda29cd9694461c9b61d0211f801ff0af |
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
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Writer.cpp
|
| 92be4e1735b54e2528fed455b87c813cdd73d8c2 |
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
|
| de428f1d27a2f5039b228aa6e011f8651539b43a |
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
|
| 1f90c4b3fda9dbd2824d67fd679f850572f114dc |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| fbc6db2e7af12b88703b4cbaa4c7b979bc9d028e |
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
|
| ea0fe650000b25fbc1a5feb43a0ac2b507adc062 |
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
|
| bd057752e8054ff516b9d2c17b70b666fc791559 |
03-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Calculate audio media drift time from AudioSource" into gingerbread
|
| e5fe2601b25e3220c3c4cfb79695ddb8a2f817ac |
02-Sep-2010 |
Eric Laurent <elaurent@google.com> |
am 937056c1: am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into gingerbread
Merge commit '937056c1a7ce71e6881305a31f76e62a76685f24'
* commit '937056c1a7ce71e6881305a31f76e62a76685f24':
Fix problem in AudioEffect::command() status.
|
| a52682416e89da1a5c086eee359f7c35cb126ea8 |
02-Sep-2010 |
Eric Laurent <elaurent@google.com> |
am 32ec1ad1: Merge "Fix problem in AudioEffect::command() status." into gingerbread
Merge commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56' into gingerbread-plus-aosp
* commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56':
Fix problem in AudioEffect::command() status.
|
| 34c8d61734bcc19f36a652faf52f855b29f3f62d |
02-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix problem in AudioEffect::command() status." into gingerbread
|
| e3e76c456baee122de6715ae280130abaddc906c |
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>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
edia/mtp/MtpServer.cpp
|
| aeae3de947fa0b1e670c8472b32288962f97b4f5 |
02-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Fix problem in AudioEffect::command() status.
The *pReplyData argument of the command() function was left unitialized by EffectHandle::command()
when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT.
Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
ervices/audioflinger/AudioFlinger.cpp
|
| d707fcb3e29707ca4a5935c294ef0b38eb5aba5f |
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
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
|
| 6faf0cd82346b23075d1f8b9f70f7af43f2c5f04 |
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.
|
| 955c5d0e21097a4baccc3174fa43e9cfe45cfa9b |
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.
|
| 031ecf372128a786a9ae84aee9c681af7a0c7db1 |
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.
|
| 4cd45f8664678c37bf0e13f76b1718bfbd7a1372 |
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.
|
| 9b93478fef2915a1d0cbb1fe17d2788ef8b5b230 |
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
|
| ab8920aace6e4381f10c992e5606f7eda71ea833 |
02-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Support for auxiliary video parameters."
|
| e91b46246305ba233067e06bce8d8a82e6c5b101 |
02-Sep-2010 |
James Dong <jdong@google.com> |
Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread
|
| c9e894872c298b25fe9d74e68aa1e7287a541ac3 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/APacketSource.h
edia/libstagefright/rtsp/ARTSPController.cpp
|
| 9f2d258645826c999a93a4206df157fec2e3b0f2 |
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.
nclude/media/IOMX.h
nclude/media/stagefright/HardwareAPI.h
edia/libmedia/IOMX.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 6e20bdf799a6f4efa6c42121a958634ea32ed5cc |
01-Sep-2010 |
James Dong <jdong@google.com> |
Make sure that if initialization fails, AudioSource still behaves well.
Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
edia/libstagefright/AudioSource.cpp
|
| 9dd4931cca8e4a2fcbcabf4eb7078648e1c029cd |
01-Sep-2010 |
Jamie Gennis <jgennis@google.com> |
Merge "Add the new Stagefright ANativeWindow OMX codec API."
|
| cfe88a20345dad981842b2c8092e4c704d3f98b4 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| 56f2c6e529bc62d55fc8baa7d1b52326307474d4 |
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.
|
| 002b34c3f56932fa472ee4a9fd47a8b021a27b1a |
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.
|
| bcbe5af62aad9d1ef64f799fcde58ac9a8adace8 |
01-Sep-2010 |
Andreas Huber <andih@google.com> |
Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
|
| 8852dbbdf3ceda01a96f3c8a814822e224239494 |
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.
|
| 559dc605bfe2deb73ad718e0d5c5dc55e27c45df |
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
nclude/media/IOMX.h
nclude/media/stagefright/HardwareAPI.h
edia/libmedia/IOMX.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| d8c48ad99d2e2a0b9df9aa4986ed0d31741e0d2f |
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.
|
| 82f7321b03eec1e40af9d681370f754ee0279582 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/mpeg2ts/ATSParser.cpp
|
| 389636ce967af15e72817e2133907a2cb2efd1ae |
01-Sep-2010 |
Andreas Huber <andih@google.com> |
Keep gtalk video chat specific code consistent with rtsp changes.
Change-Id: I5f3f46c2150e16b26674432e427f79c04a69cd8e
edia/libstagefright/rtsp/ARTPSession.cpp
|
| 84284e7a4e8d7f781f3a90605047aea1bb21dbf6 |
01-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Remove setPreviewDisplay in CameraService::Client::~Client()."
|
| 27ed8ad2db653f6ac07dcf8bcc05e2409c8bb024 |
29-Jul-2010 |
aimitakeshi <aimitakeshi@gmail.com> |
Initial contribution from Sony Corporation.
Add DRM Framework to support DRM content playback
together with StageFright.
- DRM Framework code is added
- include/drm
- drm
- api/current.xml is updated to include DRM Framework Java APIs
- cmds/servicemanager/service_manager.c is modified
to add drmManager and drmIOService.
Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb
rm/common/Android.mk
rm/common/DrmConstraints.cpp
rm/common/DrmConvertedStatus.cpp
rm/common/DrmEngineBase.cpp
rm/common/DrmInfo.cpp
rm/common/DrmInfoEvent.cpp
rm/common/DrmInfoRequest.cpp
rm/common/DrmInfoStatus.cpp
rm/common/DrmRights.cpp
rm/common/DrmSupportInfo.cpp
rm/common/IDrmIOService.cpp
rm/common/IDrmManagerService.cpp
rm/common/IDrmServiceListener.cpp
rm/common/ReadWriteUtils.cpp
rm/drmserver/Android.mk
rm/drmserver/DrmManager.cpp
rm/drmserver/DrmManagerService.cpp
rm/drmserver/StringTokenizer.cpp
rm/drmserver/main_drmserver.cpp
rm/libdrmframework/Android.mk
rm/libdrmframework/DrmManagerClient.cpp
rm/libdrmframework/DrmManagerClientImpl.cpp
rm/libdrmframework/include/DrmIOService.h
rm/libdrmframework/include/DrmManager.h
rm/libdrmframework/include/DrmManagerClientImpl.h
rm/libdrmframework/include/DrmManagerService.h
rm/libdrmframework/include/IDrmIOService.h
rm/libdrmframework/include/IDrmManagerService.h
rm/libdrmframework/include/IDrmServiceListener.h
rm/libdrmframework/include/PlugInManager.h
rm/libdrmframework/include/ReadWriteUtils.h
rm/libdrmframework/include/StringTokenizer.h
rm/libdrmframework/plugins/Android.mk
rm/libdrmframework/plugins/common/include/DrmEngineBase.h
rm/libdrmframework/plugins/common/include/IDrmEngine.h
rm/libdrmframework/plugins/passthru/Android.mk
rm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
rm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
nclude/drm/DrmConstraints.h
nclude/drm/DrmConvertedStatus.h
nclude/drm/DrmInfo.h
nclude/drm/DrmInfoEvent.h
nclude/drm/DrmInfoRequest.h
nclude/drm/DrmInfoStatus.h
nclude/drm/DrmManagerClient.h
nclude/drm/DrmRights.h
nclude/drm/DrmSupportInfo.h
nclude/drm/drm_framework_common.h
|
| 3abe8d29864d3e8a9f40be43e5faa10e57a4fac5 |
01-Sep-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove setPreviewDisplay in CameraService::Client::~Client().
mSurface is released in destructor and setPreviewWindow(0) is
called in Client::disconnect(). setPreviewDisplay is not needed
in destructor.
bug:2964479
Change-Id: I329901659a2af407816c34e02f37143b28183a89
ervices/camera/libcameraservice/CameraService.cpp
|
| 1040127473ee48c1c3b8c279ae05d38dbfb6e4c2 |
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.
|
| 2e0448f9be36784d07581d1c2ef7a0c0ecba0663 |
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.
|
| 8f45bd725549436eeacd12ee69349e2332ed8da5 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 3ef9f98aebb76018d2ee48ae4ac727a05efa63df |
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.
|
| dc344e56790d2a301d25c27a4c0ae47cdac2898b |
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.
|
| 06124758ff402512f3c7a5fb2b35d8d09a0d6c2e |
31-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
|
| 16c4e8c778d8518af4c0cbefadc5d5b1272c1762 |
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)
|
| 07e0c92953811c9c8062d419104a2d591ff38877 |
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)
|
| 69a4f8ba0705e8d22dd5c5ff4ce457240db86d04 |
31-Aug-2010 |
Andreas Huber <andih@google.com> |
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
|
| 23e6126e489c732e9a8216253a3eee1667b9dd9f |
31-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications"
|
| 4dba3e90f211eb5f5af19b10c5d3fc8c967b0086 |
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
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
|
| 85e28b42b0c04baf97cdb0ac3e0c42dd17ae642d |
31-Aug-2010 |
James Dong <jdong@google.com> |
am aa40b834: am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a'
* commit 'aa40b834985023642b30fa2e0563c414a994bd3a':
Add some encoding parameters for the "record" utility
|
| eaae2c3d6c6877e5260be9c07a02d2fd0089de59 |
31-Aug-2010 |
James Dong <jdong@google.com> |
am 6aacad66: Merge "Add some encoding parameters for the "record" utility" into gingerbread
Merge commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca' into gingerbread-plus-aosp
* commit '6aacad66eba2b51251f7e2dfb8c005b5242326ca':
Add some encoding parameters for the "record" utility
|
| 6b3a9d15c8a2282c03f1df7d72a55b6800d4ecec |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
|
| f74c8f9ee26c91b129fe9a1acc254471a9f30cb1 |
31-Aug-2010 |
James Dong <jdong@google.com> |
Add some encoding parameters for the "record" utility
- TODO: remove some of the hard coded values
Change-Id: Ib58bbb8af45fd102176ac49da0a71613a12fa5fc
mds/stagefright/record.cpp
|
| e7d3e90d8761f52a6acfdcd926f0392aca8ebb52 |
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
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| ad452ffadf0ced7449395585a55255c915734e17 |
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
nclude/media/stagefright/VideoSourceDownSampler.h
edia/libstagefright/Android.mk
edia/libstagefright/VideoSourceDownSampler.cpp
|
| 5d6aca5d86e86af3f8f597be573d4563d69ceb85 |
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
nclude/media/IMediaRecorder.h
nclude/media/MediaRecorderBase.h
nclude/media/mediarecorder.h
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
|
| 9c075bca0b75093ca0514a3c8f74d73c8e9e83fd |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/Android.mk
|
| 6865ddb29fc7e7a14104d73c65b71074502bb6c7 |
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.
|
| d0e5b406dd0f86b01b3f550fbb894a7492454da2 |
31-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Make sure we only reallocate buffers on a genuine port definition change."
|
| eebcf36cf2db2563af8ef479e01747321aa959e8 |
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.
|
| 5edae619a6ad7337a3d14b53f7665ff17ec3ee84 |
30-Aug-2010 |
Chia-chi Yeh <chiachi@android.com> |
fixedfft: Only includes cpu-features.h when __arm__ is defined.
Change-Id: Ifb6c03b38eff3c94a507ceb5043fcc48b364c25c
edia/libmedia/fixedfft.cpp
|
| 5e9d8a22e974627e1b3273cc3ca3277998d93ed4 |
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
edia/libstagefright/OMXCodec.cpp
|
| ca999e0f936fc83f321e31ae13f93348d3f7454c |
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.
|
| d81ef83a493a27887b795fdf9ece391155779914 |
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.
|
| 5d5f5dfcc16756fe80a7c46cff0949fce9d54fe9 |
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
|
| b186054757f4743eb9a6d6e81d262b9c7b36bec7 |
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
edia/libstagefright/rtsp/ARTPSession.cpp
|
| b62029edb6e0f97759ffb6d8f587267bee2dc31b |
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.
|
| f594c6449ec3eeac92cb983a3bb0e4ef4ccc3e19 |
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.
|
| e26cd86200df43bb75fb3ff884a64af4eb15bc36 |
31-Aug-2010 |
Andreas Huber <andih@google.com> |
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
|
| 7aef03379179c109c2547c33c410bfc93c8db576 |
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
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| ea798dd9f37b34acfa3cf8d945dbe7f7e90e7196 |
31-Aug-2010 |
Eric Laurent <elaurent@google.com> |
am 44217848: am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit '4421784895a58bb7bcf90236a9e443b372b5b80e'
* commit '4421784895a58bb7bcf90236a9e443b372b5b80e':
Fix issue 2952766.
|
| da701fe59d6676d45c1be49a1ed14045bdf92eec |
31-Aug-2010 |
Eric Laurent <elaurent@google.com> |
am ae6bdc23: Merge "Fix issue 2952766." into gingerbread
Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp
* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
Fix issue 2952766.
|
| 44eb0968d0d5042c03007d95544c1b405ff7e121 |
31-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2952766." into gingerbread
|
| f015774f9d5a8b7af547ccad92d98b5cfd4009fb |
30-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'
* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
Remove camera metering mode API.
|
| fabf86f788260b19ae59e472843164c3bf44e259 |
30-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 7ec7b997: Remove camera metering mode API.
Merge commit '7ec7b9970cc3a6311bf043e228991adf24c43523' into gingerbread-plus-aosp
* commit '7ec7b9970cc3a6311bf043e228991adf24c43523':
Remove camera metering mode API.
|
| 541d7655d9dc0322eb616e17b6767365bf64e3ed |
28-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Remove camera metering mode API.
Metering mode is not supported yet.
Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| dd0f7a7127fdb04863b4ad66d2b846ee94358314 |
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.
|
| d3a3eaf5d0c88e13b8dc7154fcae8b15dcacc932 |
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.
|
| 9d876aca5ede85e6d9ccb82f11fae2834955c6f9 |
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.
|
| c5c4286bebffa4c2a9539c8e09207c3130351531 |
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).
|
| e83fffc032654b819774e5d94d38842bb4190c22 |
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.
|
| 1c842b26ebbf64d15b6015b9a03d888829b946ef |
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
|
| a1ffe49c7d537bf2a16fc3eb32b0ecc6d72bdf8a |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
|
| d2ab607485542b3e273d945ce423399cea763b52 |
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.
|
| bf5606b983e203a916d4f687b81b6ebd047802ff |
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.
|
| c28160fcf5fb785106e00fa5854929be8b49a98a |
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).
|
| 384969931fd36e88872953fff25a881641e816b9 |
30-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "LVM release 1.07 delivery." into gingerbread
|
| e56121bc4cb29c91d736eab181b1f51c4f125e78 |
30-Aug-2010 |
Andreas Huber <andih@google.com> |
Finetune some rtsp timeout constants.
Change-Id: Ice731c5097c2a2dee8a7f0cd45b547cd34f532c6
edia/libstagefright/rtsp/MyHandler.h
|
| c01ec02269e3bf1fd57620149085407bf6750447 |
30-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "ALoopers can now be named (useful to distinguish threads)." into gingerbread
|
| cc567f511a159867dcde8da824cab7464e687535 |
28-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "client_id->clientId, bugfix for signaling of read abort on stop."
|
| 4caa5782afbf07da01532f7b8744157f0e92d01e |
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
nclude/media/stagefright/MediaSourceSplitter.h
edia/libstagefright/MediaSourceSplitter.cpp
|
| 9bdccaca6a7a09457670138bf6cdd9b3ba5e7087 |
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
|
| f00421ce0af03785a229552cb9738ac09b17a675 |
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
|
| 9fbd6ae6b6d9f3eb791a3385df6fed3524531bd4 |
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.
|
| 437ab8c4b66a6c9dc47faa257df90089ebef10a9 |
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.
|
| c1c88e27a6f07a530fca184f515c16d51e46d56f |
28-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 2952766.
The problem is that the audio policy manager does not handle the input devices
when forced use for telephony is changed.
The problem does not appear in a call over PSTN becasue only teh output devices drives the
routing of in call audio to/from the base band.
The fix consists in modifying AudioPolicyManagerBase::setForceUse() to check for active inputs
and update the input device if needed.
Change-Id: I0d36d1f5eef1cce527929180c29b025439902f10
ervices/audioflinger/AudioPolicyManagerBase.cpp
|
| c579249e771ea8f4b57491ead4cf6f36420c4263 |
28-Aug-2010 |
Mathias Agopian <mathias@google.com> |
am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread
Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8'
* commit 'd322d16323176ddd5fef3383798176f64d0078c8':
fix a race in SF buffer management
|
| a814c1fdc2acf0ed2ee3b175110f6039be7c4873 |
28-Aug-2010 |
Andreas Huber <andih@google.com> |
ALoopers can now be named (useful to distinguish threads).
Change-Id: Ieabaddb2e3a9e3a7a5bc36e55cd0721b60dbd50e
nclude/media/stagefright/foundation/ALooper.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/foundation/ALooper.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| b354e7916ee7b5fffb61c3ede30c3d3b0c26b475 |
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
|
| 824c9ff4a55e86faae4f8f158977329909cbfaf6 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 23f0d683c230aab3310ca244ff99e2130a770e93 |
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
|
| d9a81d43fd23f10091afa4e78bd2f5db87f74e7f |
27-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Added MediaSourceSplitter to split single source to multiple ones."
|
| 352c4683820c31eaad63e52a47d0d442bfe2c193 |
27-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Suppress the video recording start signal - bug 2950297" into gingerbread
|
| c7e5094ece8083bcaa8160564655df986126f4bd |
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
nclude/media/stagefright/MediaSourceSplitter.h
edia/libstagefright/MediaSourceSplitter.cpp
|
| 368b3ede8b8741bd61fd2fdbf71028e7c01e9750 |
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.
|
| 6adecf466b58ceb3adac535b83a7505801f0f093 |
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.
|
| f8860bf3592debe89916aa49b7994a7deeee0df1 |
27-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread
|
| 165dc4c486b8511402b3be508d5a577a774cdf59 |
27-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread
|
| 8d342970108926c4ea355c90d26a2a353ec0fd47 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/AAVCAssembler.cpp
edia/libstagefright/rtsp/AH263Assembler.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/APacketSource.h
edia/libstagefright/rtsp/ARTPAssembler.cpp
edia/libstagefright/rtsp/ARTPAssembler.h
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 95fd60f5f34ef63a9dbb12707c5c9cc771367565 |
27-Aug-2010 |
Mathias Agopian <mathias@google.com> |
am ae66946b: Merge "fix a race in SF buffer management" into gingerbread
Merge commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30' into gingerbread-plus-aosp
* commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30':
fix a race in SF buffer management
|
| d918324d44aa48b3b064ea9b87d0c520c38f15a9 |
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
edia/libeffects/lvm/lib/Bass/lib/LVDBE.h
edia/libeffects/lvm/lib/Bass/src/LVDBE_Coeffs.h
edia/libeffects/lvm/lib/Bass/src/LVDBE_Control.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Init.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Private.h
edia/libeffects/lvm/lib/Bass/src/LVDBE_Process.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Tables.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Tables.h
edia/libeffects/lvm/lib/Bundle/lib/LVM.h
edia/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Buffers.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Coeffs.h
edia/libeffects/lvm/lib/Bundle/src/LVM_Control.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Init.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Private.h
edia/libeffects/lvm/lib/Bundle/src/LVM_Process.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Tables.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Tables.h
edia/libeffects/lvm/lib/Common/lib/AGC.h
edia/libeffects/lvm/lib/Common/lib/BIQUAD.h
edia/libeffects/lvm/lib/Common/lib/CompLim.h
edia/libeffects/lvm/lib/Common/lib/Filter.h
edia/libeffects/lvm/lib/Common/lib/InstAlloc.h
edia/libeffects/lvm/lib/Common/lib/LVM_Common.h
edia/libeffects/lvm/lib/Common/lib/LVM_Macros.h
edia/libeffects/lvm/lib/Common/lib/LVM_Timer.h
edia/libeffects/lvm/lib/Common/lib/LVM_Types.h
edia/libeffects/lvm/lib/Common/lib/Mixer.h
edia/libeffects/lvm/lib/Common/lib/ScalarArithmetic.h
edia/libeffects/lvm/lib/Common/lib/VectorArithmetic.h
edia/libeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c
edia/libeffects/lvm/lib/Common/src/Abs_32.c
edia/libeffects/lvm/lib/Common/src/Add2_Sat_16x16.c
edia/libeffects/lvm/lib/Common/src/Add2_Sat_32x32.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/CompLim_private.h
edia/libeffects/lvm/lib/Common/src/Copy_16.c
edia/libeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.c
edia/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.c
edia/libeffects/lvm/lib/Common/src/DelayMix_16x16.c
edia/libeffects/lvm/lib/Common/src/DelayWrite_32.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/Filters.h
edia/libeffects/lvm/lib/Common/src/From2iToMS_16x16.c
edia/libeffects/lvm/lib/Common/src/From2iToMono_16.c
edia/libeffects/lvm/lib/Common/src/From2iToMono_32.c
edia/libeffects/lvm/lib/Common/src/InstAlloc.c
edia/libeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.c
edia/libeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.c
edia/libeffects/lvm/lib/Common/src/JoinTo2i_32x32.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c
edia/libeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer.h
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_Init.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_Private.h
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c
edia/libeffects/lvm/lib/Common/src/LVM_FO_HPF.c
edia/libeffects/lvm/lib/Common/src/LVM_FO_LPF.c
edia/libeffects/lvm/lib/Common/src/LVM_GetOmega.c
edia/libeffects/lvm/lib/Common/src/LVM_Mixer_FilterCoeffs.h
edia/libeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.c
edia/libeffects/lvm/lib/Common/src/LVM_Polynomial.c
edia/libeffects/lvm/lib/Common/src/LVM_Power10.c
edia/libeffects/lvm/lib/Common/src/LVM_Timer.c
edia/libeffects/lvm/lib/Common/src/LVM_Timer_Init.c
edia/libeffects/lvm/lib/Common/src/LVM_Timer_Private.h
edia/libeffects/lvm/lib/Common/src/LoadConst_16.c
edia/libeffects/lvm/lib/Common/src/LoadConst_32.c
edia/libeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.c
edia/libeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.c
edia/libeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.c
edia/libeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.c
edia/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/Mixer_private.h
edia/libeffects/lvm/lib/Common/src/MonoTo2I_16.c
edia/libeffects/lvm/lib/Common/src/MonoTo2I_32.c
edia/libeffects/lvm/lib/Common/src/Mult3s_32x16.c
edia/libeffects/lvm/lib/Common/src/NonLinComp_D16.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.c
edia/libeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.c
edia/libeffects/lvm/lib/Common/src/dB_to_Lin32.c
edia/libeffects/lvm/lib/Common/src/mult3s_16x16.c
edia/libeffects/lvm/lib/Eq/lib/LVEQNB.h
edia/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Coeffs.h
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Control.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Init.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Private.h
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Process.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.c
edia/libeffects/lvm/lib/Reverb/lib/LVREV.h
edia/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_Private.h
edia/libeffects/lvm/lib/Reverb/src/LVREV_Process.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_Tables.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_Tables.h
edia/libeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c
edia/libeffects/lvm/lib/StereoWidening/lib/LVCS.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Headphone_Coeffs.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Private.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Process.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.h
|
| 14cc6fcf8803ae7289a1e342532c26fe257b3d3f |
27-Aug-2010 |
Mathias Agopian <mathias@google.com> |
Merge "fix a race in SF buffer management" into gingerbread
|
| cc6adf524c1bb3bfaa5be464b50b8bcca899761c |
27-Aug-2010 |
Andreas Huber <andih@google.com> |
We accidentally always aborted after 10 secs, even if the connection was fine.
Change-Id: I3f2ae2f46ae62b84b1e253658d7182c04ee3dfae
edia/libstagefright/rtsp/MyHandler.h
|
| d7c43d3d1ec96e3e3a9ed1faf3ccb2edc949b390 |
27-Aug-2010 |
Mathias Agopian <mathias@google.com> |
fix a race in SF buffer management
also remove some unused code.
Change-Id: Iae2c3309b7a08055f3e13a5b866c5c084993e352
nclude/private/surfaceflinger/SharedBufferStack.h
|
| f1ae1963f5028a670573b50a9c1cfb504fc426b4 |
27-Aug-2010 |
James Dong <jdong@google.com> |
Suppress the video recording start signal
- bug 2950297
Change-Id: I0044d07178691feb904cf81e87c1b6d4b714dc1a
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AudioSource.cpp
|
| 7cb54d6f0e6c89f45e3db0bd9246f35836d67b8f |
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.
|
| bb28cd26054217303653f3271ea4702d769a89b7 |
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."
|
| 27fdb181daebec3dbe477080adad94f81ed667ad |
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
edia/libstagefright/OMXCodec.cpp
|
| f39928df7764de84eef31781ca0448fdc036b4d0 |
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.
|
| 1b07372a4004fec0ac9ab296741060ac348476ae |
26-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread
|
| 5291085d561f290b172e752da08fc3afab85c0b9 |
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
|
| 0792ce7e0924ebb0dbe7b7cfcd79d12cbdb03ed2 |
26-Aug-2010 |
Andreas Huber <andih@google.com> |
Support for RTP packets arriving interleaved with RTSP responses.
Change-Id: Ib32fba257da32a199134cf8943117cf3eaa07a25
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPConnection.h
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
edia/libstagefright/rtsp/MyHandler.h
|
| 64b531e9a119c2458e48c134fc4385ca074e0d12 |
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
|
| 640a72ecf2feb1ee5152d70234ff48d3be0e5ddf |
26-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread
|
| bd49bd32eba737b334bb1398fa97ee8c4584a2bf |
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.
|
| 5959988b63ace3fba2fc78b135a4f5ef25dcf860 |
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>
edia/mtp/MtpDataPacket.cpp
|
| 252aaac4a8830e4b172ffc916f42f8cd91ad1e72 |
26-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: work in progress on expanded property support"
|
| 90e4b45495f806f937fcdb52e18842237fccd5fb |
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.
|
| 8277cec96ffa55082962591bca1c55abbeec8c26 |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| f30274368327563021fb20faeb67b5661a0f373c |
26-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
|
| 53bfd693c45278bf71cb5e184ffd3e95d52e04d8 |
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.
|
| 6067b47c0d2cff7d26e088d97dc8d5190c5a4d00 |
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.
|
| 3bfb0a0c55b1b5a93d1decbc6454ae30cc47fb63 |
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.
|
| f0bfaa8f56ddcfbebc129ecb45335218c39506f0 |
26-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Added preset reverb." into gingerbread
|
| b821911513c9a15a2d0286c9447a1d29f2ce4b46 |
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.
|
| ac994dfb88d414aeedf5998aa1c6015c5b47ec01 |
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
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/include/ID3.h
|
| 81ce48911035569c934e6555c2c94c6c19aec968 |
25-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread
|
| d31cdebccaa64e4ce0012254aa4986fbea93a2a1 |
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.
|
| 4243f1a733ceac97118b30aa93a1949fd82aeb9a |
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.
|
| 3f71e8bb8f31763e7d6573364313ce3efee83c10 |
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
|
| 5a1c3529e4fa2f8a11054181294e0ce79fff8dd3 |
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
nclude/media/stagefright/DataSource.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/include/AMRExtractor.h
edia/libstagefright/include/MP3Extractor.h
edia/libstagefright/include/MPEG2TSExtractor.h
edia/libstagefright/include/MPEG4Extractor.h
edia/libstagefright/include/OggExtractor.h
edia/libstagefright/include/WAVExtractor.h
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/MatroskaExtractor.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 2a4b49bd3863024884a694b454e2e452752e6ea0 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| e7c0899a7b7549ea342af67e7ab525f81672cfa5 |
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.
|
| dd8b35d2f7911bb1e12010f143c5b8c1b621f2ed |
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.
|
| 625981ec8417528cbea67c86dcbe32a9e79a79be |
25-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Fix the simulator build.
Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202.
Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
edia/libmedia/fixedfft.cpp
|
| 17c53d433cd83d6b7d77e80635d6d58e2f6f5b2e |
25-Aug-2010 |
Mathias Agopian <mathias@google.com> |
am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Merge commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64'
* commit 'bc4389edfbb5777aec1a9af7863b2ca3ade2fa64':
fix [2931513] Add support for setting the orientation of an ANativeWindow
|
| 5ac7b5def64625fdc9cfaf1bbdd013f5ada241f3 |
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.
|
| 97344f1d8e8e95fd07d5deee2ae2492a7e4c24b0 |
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
nclude/media/EffectPresetReverbApi.h
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
|
| b00a1e3f7e415c72b6ff6d2073b5b78c0d39e0ee |
25-Aug-2010 |
Mathias Agopian <mathias@google.com> |
am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
Merge commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc' into gingerbread-plus-aosp
* commit '8395b4625b96f2133e2e4f595fdc69fbe222e4fc':
fix [2931513] Add support for setting the orientation of an ANativeWindow
|
| fce49325d807c278229a594c1cc866e21da0e155 |
25-Aug-2010 |
Mathias Agopian <mathias@google.com> |
Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread
|
| 92235649a45e1b84f43e3c906c57eea7886a426c |
20-Aug-2010 |
Mathias Agopian <mathias@google.com> |
fix [2931513] Add support for setting the orientation of an ANativeWindow
Also implement support for cropping.
Change-Id: Iba5888dd242bf2feaac9e9ce26e404c1f404c280
nclude/private/surfaceflinger/SharedBufferStack.h
|
| aae7b2274a1521a1a82bbe560e03a046d116bb40 |
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.
|
| 094370fa878b5e45d7a8914c51faa456ca9dbfe1 |
25-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
|
| 627c790c1f7c8fd44dc50abb03885aa5a075d418 |
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
|
| cce326fe43411855aca2f719e505b051bc4b61b3 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/APacketSource.h
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 40e9940fadf22daa64c1e766fa8a855c7b149c17 |
24-Aug-2010 |
James Dong <jdong@google.com> |
Make sure that timestamp does not go backward in MP4 file writer
Change-Id: I90745b9df7f19d61f3ab826bf9d2419fe788554e
edia/libstagefright/MPEG4Writer.cpp
|
| 3ddc7c3f56c6657809764d56d36948dda381d9fb |
24-Aug-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am bacc3aa8: am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7'
* commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Amend previous ndc commit
Add a method to let a properly permissioned app directly
Changed SyncOperation.toKey() to not rely on the implementation of
Squashed commit of the following:
Add more error checking for ndc
PackageManagerService: always install native binaries from .apk
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Fix a bug where we cleaned an apps external data when upgrading it. :(
Skip hostname verification when using insecure factory
Flush binder buffer after setting raw heap to avoid leaking a reference.
Fix issue #2834005: Android Settings.Secure bypass
Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Verify hostname where possible, and clarify where not.
|
| d9734dc5f25730944ec4e62bb028092e1841e4a3 |
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.
|
| a8c88e810ea1b8e90fd6c250d4c0a87eb628d4d8 |
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
|
| ef6c8c0324be75dfac3d6a4025ec3b3a7ca23826 |
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.
|
| 7ec0a1325486912ab1b2964cab635328f522dd40 |
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
|
| afb68fbf65fad41fdd8da333a61278588e735846 |
24-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "LVM release 1.05 delivery" into gingerbread
|
| 515c0a56b6fbcca18a08f0daac7be278dede46d0 |
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.
|
| ee7a5d9f5506b494ad45946690d1edc8afe8b4c4 |
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
|
| 10d3d28bdd0004dec5cc7963ec4a73f096fe93d2 |
24-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'
* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
Add camera fps range API.
|
| c6c32ffb032a255088488eaaa329b0809b360b13 |
24-Aug-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '97b5b7650236dd102fa48b51d9361289724a50e9' into gingerbread-plus-aosp
* commit '97b5b7650236dd102fa48b51d9361289724a50e9':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Amend previous ndc commit
Add a method to let a properly permissioned app directly
Changed SyncOperation.toKey() to not rely on the implementation of
Squashed commit of the following:
Add more error checking for ndc
PackageManagerService: always install native binaries from .apk
Add PhoneSubInfo.getCompleteVoiceMailNumber.
Fix a bug where we cleaned an apps external data when upgrading it. :(
Skip hostname verification when using insecure factory
Flush binder buffer after setting raw heap to avoid leaking a reference.
Fix issue #2834005: Android Settings.Secure bypass
Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Verify hostname where possible, and clarify where not.
|
| a1b232493d76bdf5e56fc5aae2a45691d6774369 |
24-Aug-2010 |
Jean-Baptiste Queru <jbq@google.com> |
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e
|
| 8f3e6aa2951358c0dea593a2448171a3f97cc0eb |
24-Aug-2010 |
Jamie Gennis <jgennis@google.com> |
Add the setPreviewWindow camera HAL API to the camera stub.
Change-Id: Ic669f9d5f5ae8f1fe5bd055f55aa4a18fa6d84cd
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraHardwareStub.h
|
| 4b79168835965cf0fc41ebe2a367e22b4cb20d08 |
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
amera/Camera.cpp
amera/ICamera.cpp
nclude/camera/Camera.h
nclude/camera/CameraHardwareInterface.h
nclude/camera/ICamera.h
nclude/media/IMediaRecorder.h
nclude/media/MediaRecorderBase.h
nclude/media/PVMediaRecorder.h
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 82252a9a732c7325166c36589c1dfa9f2cb8ac04 |
23-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Account for the _ADRENO constant being moved."
|
| 3e135cf939b4baf9902fe24fb0e50528e62c10bd |
23-Aug-2010 |
Jamie Gennis <jgennis@google.com> |
Account for the _ADRENO constant being moved.
Change-Id: I443e2028c06f8b03e864525365c5c38de79314fe
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| fec932fda5b69cc8b572063decc0f64faa36ff4a |
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
|
| f143cc1866737c2ac24f4b2d7e4b2e776be10d56 |
23-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| 5daeb129a2c2ba3d14ccd94af283b5f561c783ea |
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
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVPlayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/SoftwareRenderer.h
edia/libstagefright/omx/OMX.cpp
|
| 441fe026c7cfda8bb7e3ec91b251fc55df3d6493 |
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.
|
| 01f0908b3e8c759a9fcd565f6bc6cc6c4033678f |
23-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Better handling of rtsp connection and disconnection." into gingerbread
|
| 011df6ab59853b5e2f5654031d842fb1231198c0 |
23-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am caaf7fe3: am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread
Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c'
* commit 'caaf7fe3a407c764f643585d050c16f5fb56503c':
Handle the camera open failure better.
|
| deb7457f43b58ddcb6fbc425321989236cd42f5a |
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
|
| a178be53c93ff3da273ebfcc456503e7e7612bf0 |
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
|
| 1b543242102ef3c28145c6ad50ee8e8ce2fb26d3 |
23-Aug-2010 |
Andreas Huber <andih@google.com> |
Better handling of rtsp connection and disconnection.
Change-Id: Ib126af6c14c5a212a51a5ee3c4a0a7d1860ad167
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 8d9dda1ba28bbcd7730a9bec10ce70db4912688e |
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>
edia/libstagefright/OMXCodec.cpp
|
| ea659e51af658d77bef7b88a2fb542ec2d69e032 |
27-Jul-2010 |
pgudadhe <pgudadhe@nvidia.com> |
libstagefright: Enable tegra hw video decoders
Change-Id: Iff770de1369e57e7833a8cfa9a30955030d9974c
edia/libstagefright/OMXCodec.cpp
|
| 2dbffa8c6545255553239a5d65a3b21564078c4a |
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
|
| dedf414d3fe2e79ee0aad0f1c82ca16ebd886ff6 |
18-Aug-2010 |
James Dong <jdong@google.com> |
Runtime dump support for MediaWriter
Change-Id: I10b2c474de612ee4cef4b7c9eae2ee1dd8c2e895
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaWriter.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| 7be0434ce8d4139e9ca4b1f374153de0c75ac049 |
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.
|
| 482482401095d5fc98f89b4a3ce43d41c00fffd7 |
23-Aug-2010 |
Chia-chi Yeh <chiachi@android.com> |
Merge "Visualizer: replace the FFT implementation with a faster one." into gingerbread
|
| 263ebfd8a17266eedc84eb879edb6a6a3395f760 |
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
|
| 9934d0cf66861d331adcad28dc4713874e607a76 |
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.
|
| 5300b469833c7cc4d5c6970ad76d3f06ba90aa8f |
21-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 6694c71d: (-s ours) am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49'
* commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49':
Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
|
| 43a28f75fbf1017d1ffe5ba4a90d2c00fcafec26 |
21-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 9ba1ed6a: (-s ours) am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9'
* commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9':
Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
|
| 9b92412737095ab6a06f01a0c6daaebb79dffb55 |
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.
|
| 1b1c377e97558076ee1d427fdd8800ebce1ff300 |
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.
|
| 91d113e8daa9d71c4ea8afd595a3921e03787cbf |
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.
|
| 69e0b8c5556df1d4db1a730db1c13409a96749c7 |
21-Aug-2010 |
Eric Laurent <elaurent@google.com> |
am 3a899b85: am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread
Merge commit '3a899b85102f6d51585b3d46ced3038c8602f202'
* commit '3a899b85102f6d51585b3d46ced3038c8602f202':
Fix issue 2929440
|
| 36d8ab8fdf183a2a025e93ba78aaed92c55d6586 |
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.
|
| c59c6fd7f859b4010d788db89b8d4d76bbb70e57 |
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
edia/libeffects/lvm/lib/Android.mk
edia/libeffects/lvm/lib/Bass/src/LVDBE_Control.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Init.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Private.h
edia/libeffects/lvm/lib/Bass/src/LVDBE_Process.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Control.c
edia/libeffects/lvm/lib/Reverb/lib/LVREV.h
edia/libeffects/lvm/lib/Reverb/src/LVREV_ApplyNewSettings.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_ClearAudioBuffers.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_GetControlParameters.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_GetInstanceHandle.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_GetMemoryTable.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_Private.h
edia/libeffects/lvm/lib/Reverb/src/LVREV_Process.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_SetControlParameters.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_Tables.c
edia/libeffects/lvm/lib/Reverb/src/LVREV_Tables.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
edia/libeffects/lvm/wrapper/Reverb/EffectReverb.h
|
| be6fd201b9a04fe0f8fd409f10595ddb41832591 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| abf76b966e71302ea4e9126c396ce16bd6696f95 |
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
|
| 3eb2ff224a12b5670f4f62f07a47ffb2fde01548 |
20-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Only add 4 bytes offset for the output media buffer when SPS is not received for SW AVC encoder" into gingerbread
|
| a0ced19fa96f26a25de708588a34ebfd452f250e |
20-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Added downsample()"
|
| 846f79b30e249ebca7d95442907723a0d14601fa |
20-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '97a56269d06770712f9da7a2a29385012ec9714e' into gingerbread-plus-aosp
* commit '97a56269d06770712f9da7a2a29385012ec9714e':
Add camera fps range API.
|
| 817afcfe5679ab1251576c478c137488592cf7c2 |
20-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add camera fps range API." into gingerbread
|
| 04379fa9a001934373bf17358978c753c7e4e8b5 |
12-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add camera fps range API.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.
Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| c0d936ddacc4f7d883f3bd1dd8099586836c820f |
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
nclude/media/stagefright/YUVCanvas.h
edia/libstagefright/yuv/YUVCanvas.cpp
|
| 47c0e2355fb18f567471c1a76f1bbe2ebcb5a419 |
20-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "const correctness, validPixel test."
|
| 4937be23b485ce8edf180ff5e71ebf0884178f17 |
26-Jul-2010 |
pgudadhe <pgudadhe@nvidia.com> |
libstagefright: Enable tegra hw encoder
Change-Id: Ifed6b4dc4877e3fcab86ee81c9117a92b1d1ce8f
edia/libstagefright/OMXCodec.cpp
|
| d24afc43d340c4753f09631ad20c525cee943d3e |
20-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 271c1bfd: Merge "Handle the camera open failure better." into gingerbread
Merge commit '271c1bfd60eaa20c3f37e685864d992e0770ac00' into gingerbread-plus-aosp
* commit '271c1bfd60eaa20c3f37e685864d992e0770ac00':
Handle the camera open failure better.
|
| 225f65f50561a8cfe588c3caf0ba93a06abd27aa |
20-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Handle the camera open failure better." into gingerbread
|
| b7a67942823e8339eb298238f117aaa6d7b63111 |
18-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Handle the camera open failure better.
Check if camera hardware is NULL to avoid mediaserver crash.
Change-Id: Ibde0251f30bdb6b36a5d5380222d7be25ec9449c
nclude/camera/CameraHardwareInterface.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 76c6e8f97cd6030454ebf60db06818e05d449f06 |
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
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
|
| 4a6b74563ac0fe752fbdfd15f91772473f8a4711 |
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
nclude/media/stagefright/YUVImage.h
edia/libstagefright/yuv/YUVImage.cpp
|
| 4c171dcd6ea852fa44e6dc5b1823cce51d31af7b |
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
|
| 7384baaa82d3ae4375e3d76fc1cc4b7ca1653e18 |
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
|
| 4f86a980fee1880dca61b828599fa6d76755a485 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 690f546b0ee548dbfe997df36418e5302ec2d786 |
19-Aug-2010 |
James Dong <jdong@google.com> |
Return error from MPEG4Writer stop() if the check on codec specific data failed
Change-Id: Icbd08eec9b4201facbad56ff2040f0830cfb0115
edia/libstagefright/MPEG4Writer.cpp
|
| aa14af4897f556276b0835407ab867c8898ed2f5 |
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
|
| e0b77ce97ef84c47ae408e92f2afb7509a5051b6 |
19-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Make MediaWriter stop and pause return errors if necessary" into gingerbread
|
| 37187916a486504acaf83bea30147eb5fbf46ae5 |
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
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaWriter.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/ARTPWriter.h
|
| 897e572a4358f513279ea63ae9eca08077f4f823 |
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.
|
| ab62ba6fb493fe35e11400ddda68450047d167df |
19-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for MP4V-ES packetization format according to RFC3016." into gingerbread
|
| 62cb04d23642a2ea7c005f050494c8ef3c370dd3 |
19-Aug-2010 |
Andreas Huber <andih@google.com> |
Support for MP4V-ES packetization format according to RFC3016.
Change-Id: I5e182936c52f9eb80cdcf6132ead03705ee32d61
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.cpp
edia/libstagefright/rtsp/AMPEG4ElementaryAssembler.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/Android.mk
|
| 28b6c21da4df0db173bac0bfdae0de4337b9df7e |
19-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp
* commit 'eba1274978911ea188eead128645299669d02f60':
Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
|
| 462552d2a4ee56f785eec256169bf96efe845666 |
19-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit 'ccb915963e70c9b4e8fc47b5af97ab37b979195a' into gingerbread-plus-aosp
* commit 'ccb915963e70c9b4e8fc47b5af97ab37b979195a':
Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
|
| f1cca5ade334859bf23cf8aa5e73bad653681c8c |
19-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
|
| 3ac620a0ab90dd5e4a8bcd93ab596c848f29bbbf |
19-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
|
| 94249cb1f914c96c3d045d7ec7c2500442f5cc5f |
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.
|
| c0f7ec8134eca61752d23c10596dd211745642d9 |
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
|
| b91209edc6e9a32dfcecf2eb45ecdf5c524976fa |
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.
|
| 4478c01924a107991284a0265472b85f3dcab5b1 |
19-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Audio Effects: fixed "strength supported" parameter size." into gingerbread
|
| 85f12e9b9062402d6110df3f7099707912040edb |
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
nclude/media/stagefright/foundation/ABitReader.h
edia/libstagefright/Android.mk
edia/libstagefright/avc_utils.cpp
edia/libstagefright/foundation/ABitReader.cpp
edia/libstagefright/foundation/Android.mk
edia/libstagefright/include/avc_utils.h
edia/libstagefright/mpeg2ts/ABitReader.cpp
edia/libstagefright/mpeg2ts/ABitReader.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/rtsp/APacketSource.cpp
|
| e44607eacd044362d3debf5d95abc93ca36a9274 |
04-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.
Change-Id: I41d4f62f9f1641e9e9258aa2ebaeda13ba846c02
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 34c91a321c297c1a7518ec4f10ae5993904034dd |
30-Jul-2010 |
Nipun Kwatra <nkwatra@google.com> |
Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
Also added a struct 'Size' containing a width and a height field.
Modified parse_size to optionally set an end pointer pointing to the
character after the found size.
Change-Id: I0c95ebf1ad4684721b32165f363db7d4d15a1b19
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| b9b08ff55456fe845cb4c64500e9cb53682e202f |
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.
|
| 34c9ad88d3d827cca0c7b5f2fb1b0d4a1a20a2d1 |
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
|
| 58ac7a3e15fc9ab5432aa94037c268fef7bcb667 |
19-Aug-2010 |
Eric Laurent <elaurent@google.com> |
am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread
Merge commit '0b9a12bf8101830fa9bde4015d0043df14cab6db' into gingerbread-plus-aosp
* commit '0b9a12bf8101830fa9bde4015d0043df14cab6db':
Fix issue 2929440
|
| cf351eeb8b6977e1130b808c6b57b8a7040c81c9 |
19-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2929440" into gingerbread
|
| 25cbe0ecd6df8be7e40537c5d85c82f105038479 |
19-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 2929440
Fixed regression introduced by change a54d7d3d7dd691334189aab20d23c65710092869 in audioflinger mixer thread:
When the output stream is suspended, the sleep time between two writes must match the actual duration
of one output stream buffer otherwise the playback rate is not respected.
Change-Id: Ic5bebe890290d1f44aeff9dd3c142d18e26fff2a
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| dbd2b7e4ebfe7a586b1db4459cf6aa032a7f8719 |
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
nclude/media/Visualizer.h
edia/libmedia/Android.mk
edia/libmedia/Visualizer.cpp
edia/libmedia/fixedfft.cpp
|
| 7fa8a0ec14781a50695cf8c9dd2a85a5e8a3c3f0 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| cfe76c8f6eff8aa770b25d18fc7aa89122e3d25d |
18-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am a2527055: am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9'
* commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9':
Document that autoFocus must be called in auto and macro mode.
|
| 987b95fc9696f2e01a868455d40f0b61e38ba5bf |
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.
|
| ddcfcda09511c6641c4db81bc334788ee472ea28 |
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.
|
| 06c7bdfe982cfc5cd937b9d0ba7306951205666d |
18-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
Merge commit 'c86960236d5b2095c87bf46de2400a905acabee2' into gingerbread-plus-aosp
* commit 'c86960236d5b2095c87bf46de2400a905acabee2':
Document that autoFocus must be called in auto and macro mode.
|
| f6ac3b1a199efcdadae4c97bf2e7b7ecd753921e |
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.
|
| ab201bc7192ffc4bbf9e35dd0677225103c4e255 |
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.
|
| de1e37aad04640ef76f3c017b65adca087c7be0f |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpStringBuffer.cpp
|
| 186c38766c030b15135e7e8484d2d6b83464513a |
18-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread
|
| ef7af7fec702db2fde72b16dedf9064585e6db77 |
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
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/ASessionDescription.h
edia/libstagefright/rtsp/MyHandler.h
|
| d6831054e0c6995749ccc09e8241a478ccadb9c8 |
18-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "Make the OggExtractor less verbose." into gingerbread
|
| a65ccbff6e8eb301c0d325b2ec080aeda8df2024 |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| e2e6ffa7f15b8ee33448e255edc231a9d01923b2 |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/include/AACDecoder.h
|
| f211e5ab69b8f554b5e268699988640c2ec22255 |
18-Aug-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 09f67250: resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Merge commit '09f672509b78344258f1b0d9f021d2ec99942515'
* commit '09f672509b78344258f1b0d9f021d2ec99942515':
Fix compilation errors in libmedia, libstagefright.
|
| 4a3935898893f955403021fe41cf2bfa3a32dde2 |
18-Aug-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp
Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
|
| f1a97e53a58f47afa17a9b0d3a5cc9abf7e5ed19 |
17-Aug-2010 |
Rene Bolldorf <xsecute@googlemail.com> |
Fix compilation errors in libmedia, libstagefright.
(invalid conversion from 'const char*' to 'char*')
Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
edia/libmedia/MediaScanner.cpp
edia/libstagefright/HTTPDataSource.cpp
|
| 85b6e1681e32162676d81f4c762bdb19927beeac |
17-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Document that autoFocus must be called in auto and macro mode.
Change-Id: Ia52f8bc8a75a7473edff50326a4a0467f4295e6a
nclude/camera/CameraParameters.h
|
| 8206beb4953e42a727417286cdf9d52c35c2889d |
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
|
| 790f640ac3b573efd574d346d1bb338d9724ed48 |
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
|
| 3e8843e8db702c8c9c97df2b4a31b66ea12961e6 |
16-Aug-2010 |
Andreas Huber <andih@google.com> |
Make the OggExtractor less verbose.
Change-Id: Ieea5f3fa98d93ca6ad8fa7dcd23054e1cd0b6338
edia/libstagefright/OggExtractor.cpp
|
| e246a940426d418b99cf62c547c7a2093811f2fb |
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
|
| c059860c73678a202bfa33062723e8f82fb779d9 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| f92224efaee3397647754c3c9f40086137165099 |
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
|
| e259531ce59ab1f31de5a23124b22536f6a5a767 |
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
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Writer.cpp
|
| a1a6cba3664a04d214b372526658ba227e4d5366 |
14-Aug-2010 |
Eric Laurent <elaurent@google.com> |
am f28608cd: am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
Merge commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31'
* commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31':
Fix issue 2909189: System property ro.audio.silent no longer mutes system.
|
| b7ca29605de716eacd47b69d967315405584f9df |
13-Aug-2010 |
Eric Laurent <elaurent@google.com> |
am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
Merge commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a' into gingerbread-plus-aosp
* commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a':
Fix issue 2909189: System property ro.audio.silent no longer mutes system.
|
| 3053dd2785648c65f558d7e6d3a74a1599409059 |
13-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
|
| 1e66e00113a063ed9af618d376961bcc036157de |
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:
|
| a4b2e09e9a6339a21d1308be344090e86329340a |
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:
|
| 07bf58d9d62a9807443d27d8e1bde09126db7676 |
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.
|
| e7c3e39777d085f37a5b9ebb768134f8456635fe |
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.
|
| abfedebe61a010bcce16a0d920c132dfe4ad5c31 |
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
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| b9299d167f48f2562540cab8b0cf5959a7645503 |
13-Aug-2010 |
Mike Dodd <mdodd@google.com> |
Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
|
| 8d255f31e84e0f22233401678fe28e962c71892f |
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.
|
| c662ac2b8e983467272ea748ace9d51e0fef8aa7 |
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.
|
| 60d77eb19ddcb283b947e5dfd34b9a8e9ee6686f |
13-Aug-2010 |
Andreas Huber <andih@google.com> |
Fix software avc encoder crash at EOS.
Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
|
| 1aa4fed23595d45b0ad0af86c9e839196172abe5 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 53ed0002dee0575e6c74f7e70d5ec0ccbd51d815 |
12-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 77a473fb: am ccaa0028: Merge "Improve camera documentation." into gingerbread
Merge commit '77a473fbcea0214832255af91e0a65d853757aae'
* commit '77a473fbcea0214832255af91e0a65d853757aae':
Improve camera documentation.
|
| 15a7920c8923fef98302e654aa14aeb1ab9f035d |
12-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
am ccaa0028: Merge "Improve camera documentation." into gingerbread
Merge commit 'ccaa002848e9ef1ff232eee5babc9273599924af' into gingerbread-plus-aosp
* commit 'ccaa002848e9ef1ff232eee5babc9273599924af':
Improve camera documentation.
|
| c6e88fddc0c37eaa7d1b514b48ca61e4a4b615d3 |
05-Aug-2010 |
Wu-cheng Li <wuchengli@google.com> |
Improve camera documentation.
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
nclude/camera/CameraParameters.h
|
| cc760e477378117ef34fb2833d0b6521925b38ad |
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.
|
| db3a7e67a82b48b9b7e2bfa639fc117f75682a76 |
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.
|
| c37ae8636ed61bab5c3a1f4c4b54b41431d8016b |
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
|
| 71601ba465f4da9782caa75b0fe4543743b85e59 |
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.
|
| f8a96ee3c7d1a2c7029bdee7dede479aab01c480 |
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.
|
| 59994ef42022d7971c7b6f5b990f43d52275f876 |
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
|
| d1753e3dc21df38cb0fbe73b43ceda3ea555d102 |
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
|
| 9089ba65b7592c1719d8bcec2efbfe6744322767 |
12-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "APacketSource is too verbose." into gingerbread
|
| a6238a1e5b603ca2ccf3b2297c9bc8a141cf8559 |
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
edia/libstagefright/rtsp/AH263Assembler.cpp
edia/libstagefright/rtsp/ARTPWriter.cpp
|
| 5328abe1e36a39b1d4617a74ac82c201b8c14c43 |
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
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/include/AVCEncoder.h
edia/libstagefright/include/M4vH263Encoder.h
|
| ee6d226931477dc9c2c9e49aae5f2470f7181c61 |
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
|
| 586163779b241d4323e2940a53be8c4190054eba |
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
|
| f91a97a4f5eac23495c2f008916f45bf4d71b129 |
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
|
| 7a7b0723e5775e42e291b2b133716fafca4e19a5 |
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
|
| bef4b56250b7c9bd4cc34c5fad49fec7b57d4526 |
12-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Handle large audio lost" into gingerbread
|
| 7704377e3f3daf5a7940ac759ff96e5e166f7cb3 |
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
|
| 2dac90da3ea5120b52844a6ee38c300301de5756 |
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
|
| debd76c4a934c98a88850f0a50a30d3f01394eb7 |
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
|
| 910a17f43ba2eb586ec6cca5ab0e9b5155c5df94 |
12-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Fix all fd leaks in authoring engine" into gingerbread
|
| 6dc387a8c3f031f9f17d1138295368946563f7a5 |
12-Aug-2010 |
Andreas Huber <andih@google.com> |
APacketSource is too verbose.
Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
edia/libstagefright/rtsp/APacketSource.cpp
|
| 25d83125cee222993673d3ba261ae1186bcad8c2 |
12-Aug-2010 |
James Dong <jdong@google.com> |
Fix all fd leaks in authoring engine
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
edia/libmedia/IMediaRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| a37923e9a57d489e7bed2129369219039fa5f12c |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 047be32ec88dd04a9aca23fa59773fe2eaccb8f8 |
11-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Call startPreview after stopping for mUseStillCameraForTimeLapse=true case."
|
| 030b888ef6a586a1f0fafe0adc4312f775878d2b |
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.
|
| 1dc1938c477249c0c1adc59043da64386eea4c2d |
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.
|
| 4d074e81e8a8b3b057d31adcb64a088acad6d15c |
11-Aug-2010 |
Andreas Huber <andih@google.com> |
Merge "This code in CameraSource really should hold the lock." into gingerbread
|
| 56223b96c2f6de5998496fac9d6703f06adc1dca |
11-Aug-2010 |
Andreas Huber <andih@google.com> |
This code in CameraSource really should hold the lock.
Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a
edia/libstagefright/CameraSource.cpp
|
| 571d49c1c316f5e07b74ed7b5df6bdec7cbc1a14 |
11-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 2909189: System property ro.audio.silent no longer mutes system.
Fixed regression introduced by commit 2a6b80bc65c4782b5a7168b300e1dc5ec9f617ee:
master mute was not working if no effect chains were present on session 0.
Change-Id: I66d107e045d159cb94d29c7476fa1e12d92f2ae7
ervices/audioflinger/AudioFlinger.cpp
|
| 47204e1806da9f849464d0cef936851d7e561607 |
11-Aug-2010 |
James Dong <jdong@google.com> |
Handle large audio lost
Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AudioSource.cpp
|
| 900c1297683ab50ca8a2d73f937bd09d9e9b100a |
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
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| ad2df1d0776066dc7c2e203390c336451238684a |
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.
|
| 9c5945d0fdd6783d8bd393e4444140e76eced518 |
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.
|
| eaf0e0786c4c21d6c63d8f1f4515cb2a5311493b |
10-Aug-2010 |
Andreas Huber <andih@google.com> |
Remove some obsolete code.
Change-Id: Ic4d21afe3721173d48db44b8ee4f836deee017ad
edia/libstagefright/AwesomePlayer.cpp
|
| f9080cc30532d19d818caa5feb696c410ac4f771 |
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
|
| bf31eb91a9ac94a863a36e2cc5926aa110c86193 |
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
|
| 701019013dfd15745abf245449c3e17d78bd9570 |
10-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Add input buffer size check for software video encoders" into gingerbread
|
| 5d8e9cd46d21d8cddebe82831b99927363fa896a |
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.
|
| 2f50bedd684c5808e4112d511ead07b69dfb88a1 |
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.
|
| 8aacc475f8ad4392740ff5be505d58ea713d4110 |
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
|
| f30bccd5b5cd78a0c6d5479ba81b7aeea541f802 |
10-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "use usleep instead of sleep."
|
| dd0661387809b31e6630e81be05497e8e239232a |
10-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Fix wrong delete operator from previous change."
|
| bf9b2052d207f8f2a23470f1c4dfe464f430f387 |
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>
edia/mtp/MtpServer.cpp
|
| 7dbfa5a98c9f396ea63d0f322c3fa11df91d17a2 |
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
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| e13cf0973b927a59d7358ccce29371a22039923e |
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.
|
| 0222c0b942167ce008b625b90d20e1c7911a79d5 |
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.
|
| ab68c7f0c835a0b6906e65d683c452cf352e30f7 |
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
|
| f8ca90452ff3e252f20de38f1c3eee524c808c3e |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPConnection.h
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
|
| 6ca767182fc51ce17fc34c4931d710f1a53512ab |
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
|
| db004e1c9ff995381e204135583c06758ba8f2a3 |
10-Aug-2010 |
James Dong <jdong@google.com> |
Add input buffer size check for software video encoders
Change-Id: I03953a1245060ed6656a965e1a8a61386126c441
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| 4a5c11b6e891bcfef400f5d372c226c2a3208465 |
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
|
| 51dfe6d646ddcc5fc252aa4c19c9936d32af8ad7 |
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
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
|
| 2097f5347b77861fe2559f8d76d7d455dc857f53 |
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
edia/libstagefright/HTTPStream.cpp
|
| 782aef17c9921a3bf401a0432878df5031f2328b |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpTypes.h
|
| d7943b4cd2fa597581d1e29325adccc62dbf2939 |
10-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: turn off verbose logging
Change-Id: Ifd449c4e8c4aec6e5623869e86f8cbedd303972c
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpDebug.h
|
| 1080f793fc7c88ea665a9796015832a1339e88fc |
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
|
| 0cde1a77ce02df9f0ab08d836b491bf8e809bf35 |
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.
|
| bc417c0531332635df9525df4683274a08fb987f |
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.
|
| 5fb2aeefe780860b845bdb7dc088ccb7f0928476 |
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
|
| 70324dce016db79767140fdd982bfddd1401da95 |
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.
|
| bcc4fdd9de1b0f6b645c663f98bda838bd41242d |
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.
|
| def871da284aa51f129943a86d44ba9ee9d68d28 |
09-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Support multiple PPS and SPS in avcC box" into gingerbread
|
| 3266b2c04867f687e1e1b7b86088d6eb83077fd0 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 2bb8c0e7c4e4093f4161ff5e98cef51c87193859 |
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>
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
|
| e758febfb429e610c5a68fde55cd2b3bae589eaa |
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
|
| a1825afa98dcb8fe2e44750072eaa04f7638623f |
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>
edia/mtp/MtpDebug.cpp
edia/mtp/MtpDebug.h
|
| f83caa2ef9574652b5f43c637a7899a3cbf95aa1 |
09-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix some typos
Change-Id: Ib31708c3a925e3c0ab8eea6922ab09e02b740936
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpServer.cpp
edia/mtp/mtp.h
|
| 42d66f25af9cb8089a93c6796876a6bc16e36cea |
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
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/Android.mk
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/codecs/g711/Android.mk
edia/libstagefright/codecs/g711/dec/Android.mk
edia/libstagefright/codecs/g711/dec/G711Decoder.cpp
edia/libstagefright/include/G711Decoder.h
edia/libstagefright/include/WAVExtractor.h
|
| 8569f0d3bf4c6787707e348a7cf73b9c4199cb32 |
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
edia/libmedia/AudioEffect.cpp
ervices/audioflinger/AudioFlinger.cpp
|
| 1c9aed474a170c5177cafeb27bd658ccf7cda7fd |
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.
|
| fb6dcdf8ebe5b2995f53a750473396a40fd2db8d |
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.
|
| 7e361b86f8a02482f1e659134a030eb7212f2c37 |
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.
|
| 10e9f7c8e564b4bab036c56d1d59d9518c452305 |
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.
|
| 8bf59e735760af0b6a85747fd90bf8cf1e5388d7 |
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
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/include/SampleTable.h
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 2500c2d6ff55c26452ccba925a9f8b86b926f43e |
07-Aug-2010 |
Andreas Huber <andih@google.com> |
Properly skip the 'skip' chunk in mpeg4 files.
Change-Id: I6795347f91f24d5379e8dc80a24ae016a9629c9c
related-to-bug: 2901311
edia/libstagefright/MPEG4Extractor.cpp
|
| ca2fa61ef03cac008ea86e6fe16b2e5f9f1a2be3 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 250a4cf8127a9ba572bae90de1e44437e0b78a94 |
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
|
| 22d12e77f159751d50d3548f1aef18107c9c4089 |
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
|
| af799e10a29e2ffbe09f9cead0c583221e8b2d0d |
06-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Use the target color format from the camera source if possible" into gingerbread
|
| 00c6c1a9cc34bd6bd95a113afdda59417a392e1e |
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
|
| 299766cdbf93fba14634e364b177b7f4d5811453 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| c16acb7a9467831caf2c7c268a3fe57ec4bc69aa |
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.
|
| f084e5fbd35d5142a428c3de998d6001016fec56 |
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.
|
| b6b546e72818988865d508e380d4445da71c4503 |
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.
|
| 72cb2ee37595928ba8be034e555709de6a4105fb |
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.
|
| 214c163fbf6845b25743374702db852b2c55a884 |
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.
|
| 982a93173bc84f005172152d823cbb59dfcbeb12 |
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.
|
| aa68b49a53a874a1813e65752663f19d18149e2c |
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.
|
| 873cf4e615310c3f7dca0a332959e2f7ed5696ca |
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
|
| c5f0c714dc4225cd2ec305d5ddd297964a3dd3dc |
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
edia/libstagefright/MPEG4Writer.cpp
|
| cada6584807864254fc6914bc0fe1510b2e2bd77 |
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.
|
| fdd4dfc70f351af3a722c7c7bef4c8fb57ed3bb5 |
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.
|
| cf168132b4e4ac8d9c29d02d8dfed89c33d06e9a |
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
|
| ecaccb9f82dd07b29aa32ce36e8d15862dfdf547 |
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
edia/libstagefright/OggExtractor.cpp
|
| ff53123821a3ec2e71fdb1a971ea2cbae3119826 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTPSource.h
|
| 01a8595a3512c81064a372bb519e1d448cbdac42 |
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.
|
| 9cf3ce33d626543bd749241d0280f3900d5b8ed3 |
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
|
| 49433f2875ec986a0758978528ca9c9f361282f8 |
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.
|
| f196d3ed76f38b131a89390bec12ff0152fb3727 |
05-Aug-2010 |
Marco Nelissen <marcone@google.com> |
Merge "Fix divide by zero." into gingerbread
|
| e8c07d18201ac6d3a5458a2e15e5129159a1429e |
05-Aug-2010 |
Marco Nelissen <marcone@google.com> |
Fix divide by zero.
Change-Id: I3113234aa5936965424dde5b24e448df1be0b603
edia/libstagefright/OggExtractor.cpp
|
| 154898f4e6e3f898eacfd699a45f611b0c1b7c9a |
04-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Adding parseSizesList, getSupportedPreviewSizes to CameraParameters."
|
| cdc6af713aab07da903fecd8f67e15750b070c67 |
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.
|
| 979c6c9720d8861375570b81222e55c43bb2838d |
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
|
| 347d3c1dabd7ae9c998a024c685de2001e0ff369 |
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.
|
| 2b3b9b2237468db96d9bb49dccd2b2a1eb8ae2db |
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
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/include/AVCDecoder.h
|
| 33a8457868eb00b94b37b53321a80d9307202a9d |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/rtsp/APacketSource.cpp
|
| 0cc18781fb331f4f90070ed5c76db068d3ce3c64 |
04-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.
Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.
Change-Id: I435317427c1ee9623caef435f93e95d4476b7285
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| e91a2dfd00b1a707cb4c5eac7ee2c8de4edeb36c |
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.
|
| 39ddf8e0f18766f7ba1e3246b774aa6ebd93eea8 |
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
nclude/media/mediarecorder.h
nclude/media/stagefright/MetaData.h
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/AAMRAssembler.cpp
edia/libstagefright/rtsp/AAMRAssembler.h
edia/libstagefright/rtsp/AAVCAssembler.cpp
edia/libstagefright/rtsp/AAVCAssembler.h
edia/libstagefright/rtsp/AH263Assembler.cpp
edia/libstagefright/rtsp/AH263Assembler.h
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/APacketSource.h
edia/libstagefright/rtsp/ARTPAssembler.h
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPConnection.h
edia/libstagefright/rtsp/ARTPSession.cpp
edia/libstagefright/rtsp/ARTPSession.h
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTPSource.h
edia/libstagefright/rtsp/ARTPWriter.cpp
edia/libstagefright/rtsp/ARTPWriter.h
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/rtsp/UDPPusher.cpp
edia/libstagefright/rtsp/UDPPusher.h
edia/libstagefright/rtsp/rtp_test.cpp
|
| e41f9ba4869a96f004c731d8d17939ae607143b9 |
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
|
| 216e5df78e958a3349ba4785fb79c688e1ad39a5 |
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
|
| b9ad87ca9a18e28436e8634e95d9715b32b07faf |
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.
|
| 610959a52fe22a88e50d158f5f5f492fee4f1921 |
04-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2876124." into gingerbread
|
| 3b26844e60f8487388e7e62709faf0dada86e7e1 |
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
edia/libmedia/mediaplayer.cpp
|
| c0330ab7213be992099c83aa27c603707363a58d |
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
|
| a7c61b8be205ce8db81ebbd15cd42abd649cbf4d |
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
|
| 48f6ce0e17297c575dcbb25671a7bee80ba13061 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 438344fba74ddd6b931ac733fa48643f27b63de3 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| b7a661266b69bec40ec116d6890c6559b01eae42 |
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
|
| 26ab7ab7f543a03b65735a41de8496c54d3e490e |
03-Aug-2010 |
James Dong <jdong@google.com> |
Merge "File writer has a designated writer thread now" into gingerbread
|
| 471bb46ae345ac0ba346ed465334d987b810d656 |
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
|
| a5740924c0a71871f2697139effd43b137750597 |
03-Aug-2010 |
James Dong <jdong@google.com> |
Merge "Add lost frame handling in AudioSource" into gingerbread
|
| 1c9747a4653aec1395c2bd6896c9b87cb5447837 |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| f95ce6452d87316b8f5df6692537bd039377f349 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| fd150a8e03cdd8462eafd68f4a4231aa52f0e5a1 |
02-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
including limits.h to fix simulator build.
Change-Id: I473a62ab8282e4e89e48ee6d7e99aec6ed37076a
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| a7d4b0be8ad61e61cfa55fbfca93b73fab0b9ca1 |
02-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Implementing getSupportedPictureSizes"
|
| 40e2f3f9b41f44bdb59f7708a421b87f169a6ede |
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
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 343af4ef512869695456a91519e73ed3c3d82101 |
02-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Implement GetNumObjects
Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 9c04c4cc038f924d9cb98798e1c07fe6017e85d0 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
|
| 99b4de92430fe42f9d1493c8a4c3d27de89d3549 |
30-Jul-2010 |
Nipun Kwatra <nkwatra@google.com> |
Adding getSupportedPictureSizes which returns a Vector of supported Sizes.
Also added a struct 'Size' containing a width and a height field.
Modified parse_size to optionally set an end pointer pointing to the
character after the found size.
Change-Id: I51a56bbf2cb7c91d7b80a28e6bd6a559f40a1333
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 484c146281e39a04e32f4f13775210ab2a248c57 |
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
|
| 5501b48b787cafb1c2782f3df08bd3620cf1b31f |
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
|
| 901335c2f0ce73a78277d90eb77807dcd1d65c95 |
30-Jul-2010 |
James Dong <jdong@google.com> |
Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
|
| 46292fb347d72a314d985e34e5e3743d846cb9b6 |
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
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AudioSource.cpp
|
| 30e3eb619f02cf36e6d1d31be528d6be552bb3e2 |
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
|
| 6e5ea76da60c253dee7f07ecf3503ad43a0aff92 |
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
|
| 489d78dcde35ef7ecaed5fac5b777fabfcd0525b |
30-Jul-2010 |
James Dong <jdong@google.com> |
Merge "Lower the lower bound for max file duration check" into gingerbread
|
| 5aff464f67322cd13dc8ed165806971cfff2e4d5 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| e4fc55de48241c5fb4c4b9d652fd2d4cd0b71138 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 3768ac8b7a7713c2dd1b7cdc70ddf760003d5e53 |
30-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 6a5ed6aa: am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread
Merge commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7'
* commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7':
fix inaccurate copyrights
|
| 6b54348cfb7b8575c1221f79a1bd512136675df0 |
30-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread
Merge commit '154a320069a316491c25b716f2aeea8c51a758e8' into gingerbread-plus-aosp
* commit '154a320069a316491c25b716f2aeea8c51a758e8':
fix inaccurate copyrights
|
| 9da2070b6d6d20550de7da61478c325f0928d020 |
30-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of 27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
|
| d904b49e5ac83cb3000a01eb97771731aa1fbe43 |
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.
|
| db0e4136c3d09c9df4ddf8258ee5c98c053ffba4 |
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.
|
| 3be9523784cc4038f601e510faee595117cdacb3 |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
|
| bc286dce1af6670824fba4167e0750b631168d72 |
30-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 0c51c98f: am 4506c62a: fix inaccurate copyrights
Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf'
* commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf':
fix inaccurate copyrights
|
| 0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06 |
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
|
| efe6039f71e9bac2138003b3287e94a7ab7e5c55 |
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
|
| 68335fdd6e9c1d622384612605d6952503cb7fd0 |
30-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
amera/Camera.cpp
nclude/camera/Camera.h
nclude/media/IMediaRecorder.h
nclude/media/PVMediaRecorder.h
edia/libmedia/IMediaRecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
|
| 01cff464978aa0f749f42650180b45ea56cb17de |
30-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix inaccurate copyrights
Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
amera/Camera.cpp
nclude/camera/Camera.h
nclude/media/IMediaRecorder.h
nclude/media/PVMediaRecorder.h
edia/libmedia/IMediaRecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| c4e47d1e81c4e4403663cb911e98dbf3ada9942c |
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
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libstagefright/Android.mk
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| db205a1d75c1e9a7d0dbd8fa011335249ad6f4ac |
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
nclude/media/stagefright/YUVCanvas.h
nclude/media/stagefright/YUVImage.h
edia/libstagefright/yuv/Android.mk
edia/libstagefright/yuv/YUVCanvas.cpp
edia/libstagefright/yuv/YUVImage.cpp
|
| ac36fde15b7bc14ba27cdb21a0aeb5d7356c47f4 |
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:
|
| 0895d83cb62d269468e64a00e9e89fa7697f2f84 |
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:
|
| 5caff27f4683d5e444f327a5beec15d9b8c7f252 |
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:
|
| 3cc219dfc67b866e10828f0c17641668d47c1cd8 |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/include/AACDecoder.h
|
| e679114b6c7e087a59c2b2c3b55603c43da4ef38 |
29-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am ba676a00: am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd'
* commit 'ba676a00c1b9ba59b30fe805b83d03d1768fffbd':
Fixed underrun in audioflinger mixer.
|
| 24fd262e7c16d391ce1c5a8835a83677d099445f |
29-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am a54d7d3d: Fixed underrun in audioflinger mixer.
Merge commit 'a54d7d3d7dd691334189aab20d23c65710092869' into gingerbread-plus-aosp
* commit 'a54d7d3d7dd691334189aab20d23c65710092869':
Fixed underrun in audioflinger mixer.
|
| 60e182437228312cc28469a5b0dfde77ac848e1a |
29-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Fixed underrun in audioflinger mixer.
When all audio tracks have been disabled and the mixer is running idle before the output stream is placed in standby,
the mixer sometimes fails to write to the output stream on time to avoid underrun.
This is because the sleep period used to wait before the next write to output stream is too close to the actual buffer duration.
In fact this sleep time is not critical as if we write too early to the output stream, the kernel driver will wait for free buffers
from the audio DSP DMA and we will sleep anyways.
The fix consists in dividing the calculated wait period by 2 to increase the margin.
Change-Id: I5730887dc2ccce2a511bc858494a6f7da6b392a0
ervices/audioflinger/AudioFlinger.cpp
|
| cc759794489c2c39aaef229fba4ace32e394bb81 |
29-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am 45dc4f82: am 493941b8: Allow creation of an audio effect on a session with no audio tracks.
Merge commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28'
* commit '45dc4f82a00e52b12389b22a7cfbbee5609e8e28':
Allow creation of an audio effect on a session with no audio tracks.
|
| 248ae8439dbdd14672dbfc02b63193098392c995 |
29-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am 493941b8: Allow creation of an audio effect on a session with no audio tracks.
Merge commit '493941b8d8a12ee843d9823c0177f8005a7be54f' into gingerbread-plus-aosp
* commit '493941b8d8a12ee843d9823c0177f8005a7be54f':
Allow creation of an audio effect on a session with no audio tracks.
|
| 39e94f8f723d445447fdee0822291e664b631f60 |
28-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Allow creation of an audio effect on a session with no audio tracks.
This is necessary to allow creating and enabling an effect attached to a particular player
session before the playback is started. As a matter of fact, the implementation of the mediaplayer
does not create the AudioTrack before playback starts.
Change-Id: I1266e8885f9d756acc949303321aaac0fbf83e34
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 6fd53c964e4d5cbcdc71bbac612b6bef7695298b |
29-Jul-2010 |
Mathias Agopian <mathias@google.com> |
am 9362ea76: am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '9362ea760f565389f5accce7e17476d05510ed59'
* commit '9362ea760f565389f5accce7e17476d05510ed59':
fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
|
| dedadf414873a5ddff87ba5da447e4169a0cfb3b |
29-Jul-2010 |
Mathias Agopian <mathias@google.com> |
am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
Merge commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09' into gingerbread-plus-aosp
* commit '9f2a91bc2b01c2cc60f73a0bae673225fdddec09':
fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
|
| 1b58c743e6748272e98cd04d3c0f63e371a44329 |
29-Jul-2010 |
Mathias Agopian <mathias@google.com> |
Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once." into gingerbread
|
| 2c59bd383b4665fce878940c472af48f2597866d |
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()
|
| 3e81ba8a7ead9b670f8f553ebcb2b51de74f51ad |
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()
|
| ff4a7fa411401910e6e5ac88aeb6e0080a8cc8b1 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 6a372681547650d21e3b6264799cdbb4af881d09 |
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
|
| 40f0e35c1dfef812084a68f5ccb4083b572718aa |
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
|
| 3722abe1a6ae53034b9dee6b12e8513804622fd5 |
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
|
| 8644c14618d30d9e57a69df40ed939986ebf02c4 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| e8b0071c1656e64bd941debd5dad2ac8b63bbafc |
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
|
| 995cef30f64d4b579a76e15c0b622cd79c461dd8 |
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
|
| f01528f435e6b1f02d118fcd8305a148c27a89f1 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| ed0de3c123aaa86147993721d4794648a65aab75 |
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.
|
| e99819aa8cc397d02255b59b91c6e6850afee3a7 |
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.
|
| 25f4395b932fa9859a6e91ba77c5d20d009da64a |
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
nclude/media/AudioEffect.h
nclude/media/EffectApi.h
nclude/media/IEffect.h
nclude/media/IEffectClient.h
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/testlibs/EffectReverb.h
edia/libeffects/visualizer/EffectVisualizer.cpp
edia/libmedia/AudioEffect.cpp
edia/libmedia/IEffect.cpp
edia/libmedia/IEffectClient.cpp
edia/libmedia/Visualizer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| be1ad8d186d0db6e0a3c8885c95a354cbbfc52af |
28-Jul-2010 |
Mathias Agopian <mathias@google.com> |
fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot dequeue all allocated buffers at once.
this situation happened when the last buffer needed to be resized
(or allocated, the first time). the assumption was that the buffer
was in use by SF itself as the current buffer (obviously, this
assumption made no sense when the buffer had never been allocated, btw).
the system would wait until some other buffer became the "front" buffer.
we fix this problem by entirely removing the requirement that the
buffer being resized cannot be the front buffer. instead, we just
allocate a new buffer and replace the front buffer by the new one.
the downside is that this uses more memory (an extra buffer) for a
brief amount of time while the old buffer is being reallocated and
before it has actually been replaced.
Change-Id: I022e4621209474ceb1c671b23deb4188eaaa7285
nclude/private/surfaceflinger/SharedBufferStack.h
|
| da90dff17b6ce79d0a7d8ab2dbe2aa69cd1c11aa |
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>
edia/mtp/MtpDevice.cpp
|
| f43c641bf3f8bcb5748f4ae504d434896edc94f5 |
27-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Turn off excessive logging
Change-Id: Ib0dd8cb99efa324d0b4e742bffeb913d6122ace2
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpCursor.cpp
edia/mtp/MtpDebug.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDeviceInfo.cpp
edia/mtp/MtpProperty.cpp
|
| 9e77e155b05e419a34e0fd116ee50f0fc092e67a |
27-Jul-2010 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of d306cc81 to master
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
|
| 184f8deb44ab3b21ddaaf845f39721ba1d18ab5d |
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
|
| 23e1de74359f4bb1763aef0adfebe073122b032c |
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
nclude/media/EffectBassBoostApi.h
nclude/media/EffectEnvironmentalReverbApi.h
nclude/media/EffectEqualizerApi.h
nclude/media/EffectPresetReverbApi.h
nclude/media/EffectVirtualizerApi.h
nclude/media/EffectVisualizerApi.h
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/visualizer/Android.mk
|
| a9d01c6de17ca72d67a88673d5c9ee22047c862a |
27-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor"
|
| 421736c058acde628f5692bf30f58d81fb4ed40c |
27-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Don't request thumbnails for folder objects in MtpCursor"
|
| be19df10b6f3df507a8d8598cda1d13a84cd0b09 |
27-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Add hard coded support to recognize a couple MTP music players for testing purposes."
|
| 0cf89f2e622aa53f31fa5762ca4bc805bb509ed3 |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| 2b6c4a26499693ae3638e3df6d4255b13e34ee29 |
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>
edia/mtp/MtpCursor.cpp
edia/mtp/MtpCursor.h
|
| 80a82ea7eb05c0b807a3b0a76e1b7137ea059189 |
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>
edia/mtp/MtpClient.cpp
|
| 49c16aaec0d314bcf320e088e4bc68d0585c040a |
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.
|
| dc619be998a8e727008677ea222bc1e032453785 |
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.
|
| f12da407f72875d78d7927a4ef82fb46b6c78203 |
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.
|
| 38ef1a1a098c4e9154de99b772bb6f48c8998241 |
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.
|
| 29a322f63759edab81c50630d9f20769a06c827e |
26-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am bd01583d: resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Merge commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4'
* commit 'bd01583d6e936e93141d6b77aec9d8c99684d7a4':
move native services under services/
|
| 9cde3ce3bd58a3276a927c11ece3e3d27db74a9b |
26-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76
|
| 8b4179f44917ec4845ade406a49a713cd568fe8a |
26-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fixed bug in vlm effect bunde wrapper effect init function." into gingerbread
|
| 09d5ca3766d4bab91cdaad7206716a5747ebad77 |
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
edia/libeffects/lvm/lib/Bass/src/LVDBE_Control.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Buffers.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Control.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Init.c
edia/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Control.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Private.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
|
| 010ae0dd9eab40a49a840388230d8bb2f97c530e |
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
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
|
| 6a970b49033688f0422fc613568d30148b6b301a |
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.
|
| 4566a03cf66db85c16a39d9bff93992fc99b8fe4 |
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.
|
| 163fbcf84010b98e0374110454d85b804bc8d13b |
23-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Audio effects: lvm bundle wrapper update after first integration tests.
Change-Id: I20cb55282833bd6e3a160e0dae1cc1fcb6b1ca30
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
|
| e4e0a6994d39c4a7cba09c5fff442b2dca1df8f8 |
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
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 55cb2b8319e6b36e88658de121c534e95cd240b4 |
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.
|
| 00fba4994e33d1b8384ff8bc2221c2de933f387e |
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.
|
| ccaa41429d2afc47f0fb828a0146a1b1936188fe |
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
edia/mediaserver/Android.mk
ervices/audioflinger/A2dpAudioInterface.cpp
ervices/audioflinger/A2dpAudioInterface.h
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioDumpInterface.cpp
ervices/audioflinger/AudioDumpInterface.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioHardwareGeneric.cpp
ervices/audioflinger/AudioHardwareGeneric.h
ervices/audioflinger/AudioHardwareInterface.cpp
ervices/audioflinger/AudioHardwareStub.cpp
ervices/audioflinger/AudioHardwareStub.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioPolicyManagerBase.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/audioflinger/AudioResamplerCubic.h
ervices/audioflinger/AudioResamplerSinc.cpp
ervices/audioflinger/AudioResamplerSinc.h
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraHardwareStub.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
ervices/camera/libcameraservice/CannedJpeg.h
ervices/camera/libcameraservice/FakeCamera.cpp
ervices/camera/libcameraservice/FakeCamera.h
ervices/camera/tests/CameraServiceTest/Android.mk
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| 542db5d438988360d491a5add1040a2df9aa90c9 |
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
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MediaSource.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
|
| f661058d77d1484e5911d1962f8e1e8466240687 |
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.
|
| 3922fe0860f1662f9066f553314b6955702d4956 |
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.
|
| 348a8eab84f4bba76c04ca83b2f5418467aa1a48 |
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
mds/stagefright/stagefright.cpp
nclude/media/stagefright/foundation/ALooper.h
edia/libstagefright/foundation/ALooper.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| 2c81e430f8fb1493084a3b32cd649a368b4201e5 |
21-Jul-2010 |
Andreas Huber <andih@google.com> |
am f0d87989: am ff0ab64c: Merge "Add a seek test to the stagefright commandline tool." into gingerbread
Merge commit 'f0d87989931757cdc50524d282fc151ef88eeafe'
* commit 'f0d87989931757cdc50524d282fc151ef88eeafe':
Add a seek test to the stagefright commandline tool.
|
| 962dfecc668a45e97861584d59b3fbbf05632995 |
21-Jul-2010 |
Andreas Huber <andih@google.com> |
am ff0ab64c: Merge "Add a seek test to the stagefright commandline tool." into gingerbread
Merge commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e' into gingerbread-plus-aosp
* commit 'ff0ab64ca49c7a03835d414cd493d5dc37c2eb5e':
Add a seek test to the stagefright commandline tool.
|
| d3bc2528fca033f3d34969a095beec0bc3f79ffd |
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.
|
| 66d6f1fcd9cb80a603b833e93779eb0dfb5e67ee |
21-Jul-2010 |
Andreas Huber <andih@google.com> |
Add a seek test to the stagefright commandline tool.
Change-Id: Ibf3517afa288fc4c7e2184c11bc7a63594f321df
mds/stagefright/stagefright.cpp
|
| 4f2074980eefeabe2a37ea5d6dc5904a87107fc4 |
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.
|
| ef3f986ebeee48af0e8cbfa651260974bbd1ed4d |
21-Jul-2010 |
Andreas Huber <andih@google.com> |
Merge "Support finer seek control on MediaSources." into gingerbread
|
| 71ff94cb52874e42dede3c6bc4b86757b72cf0b1 |
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.
|
| 552f4053c194770a5c9b37825f222031548dc5a8 |
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.
|
| abd1f4f870925d6776dbe4b930b759a1ab6595ca |
21-Jul-2010 |
Andreas Huber <andih@google.com> |
Support finer seek control on MediaSources.
related-to-bug: 2858448
Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/JPEGSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaSource.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwb/AMRWBDecoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
edia/libstagefright/codecs/on2/dec/VPXDecoder.cpp
edia/libstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
edia/libstagefright/include/AVCDecoder.h
edia/libstagefright/include/M4vH263Decoder.h
edia/libstagefright/include/SampleTable.h
edia/libstagefright/include/VPXDecoder.h
edia/libstagefright/matroska/MatroskaExtractor.cpp
|
| 2beeb50b1bba9e92f6cacfeca37fe9fa9d36ead1 |
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
nclude/media/AudioTrack.h
nclude/media/IMediaPlayer.h
nclude/media/mediaplayer.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 932e0a11d74d5e236ccef9ee314442385c3d4e9d |
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
|
| 65e334b9448689e12400bae6a739f0513f72d428 |
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
|
| 3108231d90e8aa324923fd8864ca2477948c5d25 |
20-Jul-2010 |
James Dong <jdong@google.com> |
Merge "Progress status notification" into gingerbread
|
| d403f73c6db493a067d529e932d699ce461ae1d8 |
20-Jul-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Restart preview after each takePicture is done."
|
| 8184a5734690b30f4de0f6b6c16daf1e089f67df |
20-Jul-2010 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of dd206093 to master
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
|
| 0aacf105eea098a0b47761a4a9a5c4d820611f2d |
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
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 7a42770f47225483a885b168d05e81b6a81189c0 |
20-Jul-2010 |
Nipun Kwatra <nkwatra@google.com> |
Use software encoder for time lapse capture.
Change-Id: I7f60eb1af95590c84b0cd98134f5a5a8963338dd
edia/libmediaplayerservice/StagefrightRecorder.cpp
|
| 45239b5fa6bf75d76bd5e603b443bd68502345f5 |
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
|
| 24ecd378305a3bf6fde74c8773bca09d0fd06c58 |
20-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Audio policy manager changes for audio effects" into gingerbread
|
| 385695764189477e963a749a5f107f6eaeb9c5f2 |
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."
|
| fbfe57ba4403ad759a0ebd895914ff506a01b699 |
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.
|
| d79079227fa9a9b06894120b1661808b643dae5c |
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.
|
| de070137f11d346fba77605bd76a44c040a618fc |
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
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioPolicyService.h
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioPolicyService.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioPolicyManagerBase.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
|
| ee3d00420b64909b219d95a613d8e735ec337839 |
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.
|
| 3c3ddfa39635a2d39f4ee7c966fb9403fe1ec9d8 |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
|
| 2b4aeed8d69f5f10dede9da5c38123ff9f78f942 |
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.
|
| 95c2580db188dee19cab05d29351c7ca5973cf3b |
20-Jul-2010 |
Andreas Huber <andih@google.com> |
Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
|
| 5d98aaf0027d803fcfd4a1f2c374dfd34fb2cbad |
20-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP host fixes:"
|
| 437e945013318de54746422c8b44306e6d5319ca |
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>
edia/mtp/MtpClient.cpp
edia/mtp/MtpDataPacket.cpp
|
| faed5cd124a54b8db3429f4c26b3220bbec4c8bb |
16-Jul-2010 |
James Dong <jdong@google.com> |
Progress status notification
- Keep track of per-track progress
Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
nclude/media/stagefright/MPEG4Writer.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
|
| 59208db843985cb0626a71029ea2a08050702a61 |
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
edia/mtp/Android.mk
|
| 941f1132dd76a959f17aaefd1ac2c0c6cc27a444 |
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>
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
|
| 5cdceca217319bf6a22caf1acadc38c8dc259316 |
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>
edia/mtp/MtpDataPacket.h
edia/mtp/MtpPacket.h
edia/mtp/MtpProperty.cpp
|
| be9a95ce176e94c54f08454dc19e500546578154 |
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>
edia/mtp/Android.mk
edia/mtp/MtpEventPacket.cpp
|
| 65e7e6facda89927cb26594b3b65ae81b3235ebc |
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
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/CameraSourceTimeLapse.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/Android.mk
edia/libstagefright/CameraSource.cpp
edia/libstagefright/CameraSourceTimeLapse.cpp
|
| 6cad99fefc7275f30886962e4193a336a2144b7b |
19-Jul-2010 |
James Dong <jdong@google.com> |
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| 6113efbd1e5f7495b80bf64f7ee90a571e3cf6a6 |
19-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Only send events to host if we have an open session."
|
| 73ecd23cc2ebadb8e1fae1cc21ac559524c6b2bb |
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>
edia/mtp/MtpServer.cpp
|
| 618678e74cc7a013b84d8f5b53d19dd2c5463a85 |
19-Jul-2010 |
Andy McFadden <fadden@android.com> |
Merge "Fix sim-eng build."
|
| 2c994dbcae12a7515d01c70aa058b0a9ac1e4c20 |
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
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/visualizer/Android.mk
|
| bbf6dcd2aa8eb877e6412aaade25a077f62a6284 |
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.
|
| 296ac39f69df0b398685ab19e9bb257fdb7aa75d |
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.
|
| f997cabca292d70d078ae828e21c28e6df62995f |
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
edia/libeffects/visualizer/EffectVisualizer.cpp
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| f913c25c713cbe0fe16dd1cc17bdfaba6b77070f |
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)
|
| 26a1138f3a467f2bfe832ff59f50f3cc1f35e834 |
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)
|
| 46bf665ea3687f06069ebd1a0acd01ed7b5ac9cb |
18-Jul-2010 |
James Dong <jdong@google.com> |
Fix simulator build (1st attempt)
Change-Id: I65a824c17929170b7b2bc75a13e756e92d8fe50a
edia/libstagefright/codecs/m4v_h263/enc/src/mp4def.h
|
| 8a4cd2790739694c04b6a821fe767d45e178bcd0 |
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.
|
| 74ef7ef6adc224256a78a7df5ad0435f6be89aa8 |
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.
|
| 2c8e5cab3faa6d360e222b7a6c40a80083d021ac |
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
edia/libeffects/Android.mk
edia/libeffects/AudioBiquadFilter.cpp
edia/libeffects/AudioBiquadFilter.h
edia/libeffects/AudioCoefInterpolator.cpp
edia/libeffects/AudioCoefInterpolator.h
edia/libeffects/AudioCommon.h
edia/libeffects/AudioEqualizer.cpp
edia/libeffects/AudioEqualizer.h
edia/libeffects/AudioFormatAdapter.h
edia/libeffects/AudioHighShelfFilterCoef.inl
edia/libeffects/AudioLowShelfFilterCoef.inl
edia/libeffects/AudioPeakingFilter.cpp
edia/libeffects/AudioPeakingFilter.h
edia/libeffects/AudioPeakingFilterCoef.inl
edia/libeffects/AudioShelvingFilter.cpp
edia/libeffects/AudioShelvingFilter.h
edia/libeffects/EffectEqualizer.cpp
edia/libeffects/EffectReverb.c
edia/libeffects/EffectReverb.h
edia/libeffects/EffectVisualizer.cpp
edia/libeffects/EffectsFactory.c
edia/libeffects/EffectsFactory.h
edia/libeffects/EffectsMath.c
edia/libeffects/EffectsMath.h
edia/libeffects/factory/Android.mk
edia/libeffects/factory/EffectsFactory.c
edia/libeffects/factory/EffectsFactory.h
edia/libeffects/lvm/lib/Android.mk
edia/libeffects/lvm/lib/Bass/lib/LVDBE.h
edia/libeffects/lvm/lib/Bass/src/LVDBE_Coeffs.h
edia/libeffects/lvm/lib/Bass/src/LVDBE_Control.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Init.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Private.h
edia/libeffects/lvm/lib/Bass/src/LVDBE_Process.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Tables.c
edia/libeffects/lvm/lib/Bass/src/LVDBE_Tables.h
edia/libeffects/lvm/lib/Bundle/lib/LVM.h
edia/libeffects/lvm/lib/Bundle/src/LVM_API_Specials.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Buffers.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Coeffs.h
edia/libeffects/lvm/lib/Bundle/src/LVM_Control.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Init.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Private.h
edia/libeffects/lvm/lib/Bundle/src/LVM_Process.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Tables.c
edia/libeffects/lvm/lib/Bundle/src/LVM_Tables.h
edia/libeffects/lvm/lib/Common/lib/AGC.h
edia/libeffects/lvm/lib/Common/lib/BIQUAD.h
edia/libeffects/lvm/lib/Common/lib/CompLim.h
edia/libeffects/lvm/lib/Common/lib/Filter.h
edia/libeffects/lvm/lib/Common/lib/InstAlloc.h
edia/libeffects/lvm/lib/Common/lib/LVM_Common.h
edia/libeffects/lvm/lib/Common/lib/LVM_Macros.h
edia/libeffects/lvm/lib/Common/lib/LVM_Timer.h
edia/libeffects/lvm/lib/Common/lib/LVM_Types.h
edia/libeffects/lvm/lib/Common/lib/Mixer.h
edia/libeffects/lvm/lib/Common/lib/ScalarArithmetic.h
edia/libeffects/lvm/lib/Common/lib/VectorArithmetic.h
edia/libeffects/lvm/lib/Common/src/AGC_MIX_VOL_2St1Mon_D32_WRA.c
edia/libeffects/lvm/lib/Common/src/Abs_32.c
edia/libeffects/lvm/lib/Common/src/Add2_Sat_16x16.c
edia/libeffects/lvm/lib/Common/src/Add2_Sat_32x32.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F16C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F32C30_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D16F32Cll_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BP_1I_D32F32C30_TRC_WRA_02.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Init.c
edia/libeffects/lvm/lib/Common/src/BP_1I_D32F32Cll_TRC_WRA_02_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F16C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F32C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_1I_D16F32Css_TRC_WRA_01_init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C13_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C14_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/BQ_2I_D16F32Css_TRC_WRA_01_init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D32F32C30_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/BQ_2I_D32F32Cll_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/CompLim_private.h
edia/libeffects/lvm/lib/Common/src/Copy_16.c
edia/libeffects/lvm/lib/Common/src/Core_MixHard_2St_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/Core_MixInSoft_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/Core_MixSoft_1St_D32C31_WRA.c
edia/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/DC_2I_D16_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/DelayAllPass_Sat_32x16To32.c
edia/libeffects/lvm/lib/Common/src/DelayMix_16x16.c
edia/libeffects/lvm/lib/Common/src/DelayWrite_32.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D16F16C15_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D16F16Css_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/FO_1I_D32F32C31_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/FO_1I_D32F32Cll_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/FO_2I_D16F32C15_LShx_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/FO_2I_D16F32Css_LShx_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/Filters.h
edia/libeffects/lvm/lib/Common/src/From2iToMS_16x16.c
edia/libeffects/lvm/lib/Common/src/From2iToMono_16.c
edia/libeffects/lvm/lib/Common/src/From2iToMono_32.c
edia/libeffects/lvm/lib/Common/src/InstAlloc.c
edia/libeffects/lvm/lib/Common/src/Int16LShiftToInt32_16x32.c
edia/libeffects/lvm/lib/Common/src/Int32RShiftToInt16_Sat_32x16.c
edia/libeffects/lvm/lib/Common/src/JoinTo2i_32x32.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_1St_2i_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixHard_2St_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixInSoft_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_2i_D16C31_WRA.c
edia/libeffects/lvm/lib/Common/src/LVC_Core_MixSoft_1St_D16C31_WRA.c
edia/libeffects/lvm/lib/Common/src/LVC_MixInSoft_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_2i_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_MixSoft_1St_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_MixSoft_2St_D16C31_SAT.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer.h
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_GetCurrent.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_GetTarget.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_Init.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_Private.h
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTarget.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_SetTimeConstant.c
edia/libeffects/lvm/lib/Common/src/LVC_Mixer_VarSlope_SetTimeConstant.c
edia/libeffects/lvm/lib/Common/src/LVM_FO_HPF.c
edia/libeffects/lvm/lib/Common/src/LVM_FO_LPF.c
edia/libeffects/lvm/lib/Common/src/LVM_GetOmega.c
edia/libeffects/lvm/lib/Common/src/LVM_Mixer_FilterCoeffs.h
edia/libeffects/lvm/lib/Common/src/LVM_Mixer_TimeConstant.c
edia/libeffects/lvm/lib/Common/src/LVM_Polynomial.c
edia/libeffects/lvm/lib/Common/src/LVM_Power10.c
edia/libeffects/lvm/lib/Common/src/LVM_Timer.c
edia/libeffects/lvm/lib/Common/src/LVM_Timer_Init.c
edia/libeffects/lvm/lib/Common/src/LVM_Timer_Private.h
edia/libeffects/lvm/lib/Common/src/LoadConst_16.c
edia/libeffects/lvm/lib/Common/src/LoadConst_32.c
edia/libeffects/lvm/lib/Common/src/MSTo2i_Sat_16x16.c
edia/libeffects/lvm/lib/Common/src/Mac3s_Sat_16x16.c
edia/libeffects/lvm/lib/Common/src/Mac3s_Sat_32x16.c
edia/libeffects/lvm/lib/Common/src/MixInSoft_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/MixSoft_1St_D32C31_WRA.c
edia/libeffects/lvm/lib/Common/src/MixSoft_2St_D32C31_SAT.c
edia/libeffects/lvm/lib/Common/src/Mixer_private.h
edia/libeffects/lvm/lib/Common/src/MonoTo2I_16.c
edia/libeffects/lvm/lib/Common/src/MonoTo2I_32.c
edia/libeffects/lvm/lib/Common/src/Mult3s_32x16.c
edia/libeffects/lvm/lib/Common/src/NonLinComp_D16.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32C14G11_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32C30G11_TRC_WRA_01.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CllGss_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Init.c
edia/libeffects/lvm/lib/Common/src/PK_2I_D32F32CssGss_TRC_WRA_01_Private.h
edia/libeffects/lvm/lib/Common/src/Shift_Sat_v16xv16.c
edia/libeffects/lvm/lib/Common/src/Shift_Sat_v32xv32.c
edia/libeffects/lvm/lib/Common/src/dB_to_Lin32.c
edia/libeffects/lvm/lib/Common/src/mult3s_16x16.c
edia/libeffects/lvm/lib/Eq/lib/LVEQNB.h
edia/libeffects/lvm/lib/Eq/src/LVEQNB_CalcCoef.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Coeffs.h
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Control.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Init.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Private.h
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Process.c
edia/libeffects/lvm/lib/Eq/src/LVEQNB_Tables.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/lib/LVPSA.h
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Control.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Init.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Memory.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Private.h
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Process.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD.h
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Init.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_QPD_Process.c
edia/libeffects/lvm/lib/SpectrumAnalyzer/src/LVPSA_Tables.c
edia/libeffects/lvm/lib/StereoWidening/lib/LVCS.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_BypassMix.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Control.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Equaliser.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Headphone_Coeffs.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Init.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Private.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Process.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_ReverbGenerator.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_StereoEnhancer.h
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.c
edia/libeffects/lvm/lib/StereoWidening/src/LVCS_Tables.h
edia/libeffects/lvm/wrapper/Android.mk
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
edia/libeffects/lvm/wrapper/Bundle/EffectBundle.h
edia/libeffects/testlibs/Android.mk_
edia/libeffects/testlibs/AudioBiquadFilter.cpp
edia/libeffects/testlibs/AudioBiquadFilter.h
edia/libeffects/testlibs/AudioCoefInterpolator.cpp
edia/libeffects/testlibs/AudioCoefInterpolator.h
edia/libeffects/testlibs/AudioCommon.h
edia/libeffects/testlibs/AudioEqualizer.cpp
edia/libeffects/testlibs/AudioEqualizer.h
edia/libeffects/testlibs/AudioFormatAdapter.h
edia/libeffects/testlibs/AudioHighShelfFilterCoef.inl
edia/libeffects/testlibs/AudioLowShelfFilterCoef.inl
edia/libeffects/testlibs/AudioPeakingFilter.cpp
edia/libeffects/testlibs/AudioPeakingFilter.h
edia/libeffects/testlibs/AudioPeakingFilterCoef.inl
edia/libeffects/testlibs/AudioShelvingFilter.cpp
edia/libeffects/testlibs/AudioShelvingFilter.h
edia/libeffects/testlibs/EffectEqualizer.cpp
edia/libeffects/testlibs/EffectReverb.c
edia/libeffects/testlibs/EffectReverb.h
edia/libeffects/testlibs/EffectsMath.c
edia/libeffects/testlibs/EffectsMath.h
edia/libeffects/visualizer/Android.mk
edia/libeffects/visualizer/EffectVisualizer.cpp
|
| 521bcb0ff5054e5be40f5194026da3463504ae3b |
16-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am f16b3f10: am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit 'f16b3f104f60738447db60bcf2c44c7610e17199'
* commit 'f16b3f104f60738447db60bcf2c44c7610e17199':
Several improvements in audio effects volume control.
|
| c8f6b8569ac99f8b7e53b9687358642306fe3ee0 |
16-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am b0374a0e: Merge "Several improvements in audio effects volume control." into gingerbread
Merge commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384' into gingerbread-plus-aosp
* commit 'b0374a0e22756d956f8ebf2b19b1139e9e5e3384':
Several improvements in audio effects volume control.
|
| ada2ac8e09b6d3f2b3c3155a852ba0fffae1b592 |
16-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Several improvements in audio effects volume control." into gingerbread
|
| a6163d6948d9a89670720eea8d30b59c5b70fe37 |
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
|
| 63e27dd45904714f1e0395fb2fb7af6007311bbe |
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
|
| 59f566c4ec3dfc097ad8163523e522280b27e5c3 |
13-Jul-2010 |
James Dong <jdong@google.com> |
Initial check-in for software m4v_h263 encoder
Change-Id: I4b49fa5c3a5e6e21cfd2419441d98dd784046367
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/m4v_h263/enc/Android.mk
edia/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
edia/libstagefright/codecs/m4v_h263/enc/include/cvei.h
edia/libstagefright/codecs/m4v_h263/enc/include/mp4enc_api.h
edia/libstagefright/codecs/m4v_h263/enc/src/bitstream_io.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/bitstream_io.h
edia/libstagefright/codecs/m4v_h263/enc/src/combined_encode.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/datapart_encode.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/dct.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/dct.h
edia/libstagefright/codecs/m4v_h263/enc/src/dct_inline.h
edia/libstagefright/codecs/m4v_h263/enc/src/fastcodemb.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/fastcodemb.h
edia/libstagefright/codecs/m4v_h263/enc/src/fastidct.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/fastquant.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/fastquant_inline.h
edia/libstagefright/codecs/m4v_h263/enc/src/findhalfpel.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/m4venc_oscl.h
edia/libstagefright/codecs/m4v_h263/enc/src/me_utils.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/motion_comp.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/motion_est.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/mp4def.h
edia/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/mp4enc_lib.h
edia/libstagefright/codecs/m4v_h263/enc/src/mp4lib_int.h
edia/libstagefright/codecs/m4v_h263/enc/src/rate_control.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/rate_control.h
edia/libstagefright/codecs/m4v_h263/enc/src/sad.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/sad_halfpel.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/sad_halfpel_inline.h
edia/libstagefright/codecs/m4v_h263/enc/src/sad_inline.h
edia/libstagefright/codecs/m4v_h263/enc/src/sad_mb_offset.h
edia/libstagefright/codecs/m4v_h263/enc/src/vlc_enc_tab.h
edia/libstagefright/codecs/m4v_h263/enc/src/vlc_encode.cpp
edia/libstagefright/codecs/m4v_h263/enc/src/vlc_encode.h
edia/libstagefright/codecs/m4v_h263/enc/src/vlc_encode_inline.h
edia/libstagefright/codecs/m4v_h263/enc/src/vop.cpp
edia/libstagefright/include/M4vH263Encoder.h
|
| cab112421da6e8eac19ffddbbe3d76067cffee78 |
15-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Several improvements in audio effects volume control.
- Fixed crash when deleting an effect chained before an effect having volume control
- Changed EFFECT_FLAG_VOLUME_CTRL to implicitely include EFFECT_FLAG_VOLUME_IND
(not need to set both in effect descriptor).
- Volume control changes from one effect to another if needed according to effect enable state
- EFFECT_CMD_SET_VOLUME is only sent when their is an actual change in volume
Change-Id: Ieebaf09157e2627366023569d95516646e03e26c
nclude/media/EffectApi.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
|
| 852cdfcc694782f419022661855f078ffa8f576e |
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
|
| 53fbfed0c81ac82606f27e25bbc61b44dde927a1 |
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>
edia/mtp/Android.mk
|
| 4e2ffa400b82559cab2c5717c8dcdff393d334a9 |
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>
edia/libmedia/MediaScanner.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/MyHandler.h
|
| cbcc684555a8774b21ba04c09b2f5cee8c88453a |
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
|
| b2975065465192dd46bc3eadabc00b9d855eb4e6 |
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
|
| e957045dcfdc7e08a5d76463b125d2a9e92bc0e8 |
15-Jul-2010 |
James Dong <jdong@google.com> |
Merge "Support user-supplied timescales for authoring" into gingerbread
|
| 8065e2056073808716db32136d7acfd50eeab924 |
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>
edia/mtp/MtpEventPacket.cpp
edia/mtp/MtpServer.cpp
edia/mtp/f_mtp.h
|
| c0b9c87b2581af430e143822918935d15ac69911 |
15-Jul-2010 |
Mathias Agopian <mathias@google.com> |
am c74034b6: am 24651682: added BinderService<> template to help creating native binder services
Merge commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c'
* commit 'c74034b6bf0940dc80c4d4efa1e677ad0d2dfd6c':
added BinderService<> template to help creating native binder services
|
| 8c4acff42ee9d8ee8ed75f0b69c0a5bb99645270 |
15-Jul-2010 |
Mathias Agopian <mathias@google.com> |
am 24651682: added BinderService<> template to help creating native binder services
Merge commit '24651682edaf71e8a826f23a7ea09bc97c8072c4' into gingerbread-plus-aosp
* commit '24651682edaf71e8a826f23a7ea09bc97c8072c4':
added BinderService<> template to help creating native binder services
|
| 094c96da874d84eae46f76cc036fa7b7993eb999 |
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/
|
| 46d2cc5755ea30771bbd6b34a1a7fae513c94ca2 |
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/
|
| 5462fc9a38fa8c9dff434cd53fa5fb1782ae3042 |
15-Jul-2010 |
Mathias Agopian <mathias@google.com> |
added BinderService<> template to help creating native binder services
Change-Id: Id980899d2647b56479f8a27c89eaa949f9209dfe
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
|
| 65ab47156e1c7dfcd8cc4266253a5ff30219e7f0 |
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
edia/mediaserver/Android.mk
ervices/audioflinger/A2dpAudioInterface.cpp
ervices/audioflinger/A2dpAudioInterface.h
ervices/audioflinger/Android.mk
ervices/audioflinger/AudioBufferProvider.h
ervices/audioflinger/AudioDumpInterface.cpp
ervices/audioflinger/AudioDumpInterface.h
ervices/audioflinger/AudioFlinger.cpp
ervices/audioflinger/AudioFlinger.h
ervices/audioflinger/AudioHardwareGeneric.cpp
ervices/audioflinger/AudioHardwareGeneric.h
ervices/audioflinger/AudioHardwareInterface.cpp
ervices/audioflinger/AudioHardwareStub.cpp
ervices/audioflinger/AudioHardwareStub.h
ervices/audioflinger/AudioMixer.cpp
ervices/audioflinger/AudioMixer.h
ervices/audioflinger/AudioPolicyManagerBase.cpp
ervices/audioflinger/AudioPolicyService.cpp
ervices/audioflinger/AudioPolicyService.h
ervices/audioflinger/AudioResampler.cpp
ervices/audioflinger/AudioResampler.h
ervices/audioflinger/AudioResamplerCubic.cpp
ervices/audioflinger/AudioResamplerCubic.h
ervices/audioflinger/AudioResamplerSinc.cpp
ervices/audioflinger/AudioResamplerSinc.h
ervices/camera/libcameraservice/Android.mk
ervices/camera/libcameraservice/CameraHardwareStub.cpp
ervices/camera/libcameraservice/CameraHardwareStub.h
ervices/camera/libcameraservice/CameraService.cpp
ervices/camera/libcameraservice/CameraService.h
ervices/camera/libcameraservice/CannedJpeg.h
ervices/camera/libcameraservice/FakeCamera.cpp
ervices/camera/libcameraservice/FakeCamera.h
ervices/camera/tests/CameraServiceTest/Android.mk
ervices/camera/tests/CameraServiceTest/CameraServiceTest.cpp
|
| 8f5f2fcee5c12d08df71d17017410c50951fc2e3 |
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
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 8972e1a30cd9b57a238a2ef617ed340d8043eb44 |
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
|
| f521a09357182b81b69f91466533f10bdf909bf0 |
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
|
| 98fe12aba55e8b8bb14b23c4c3cdba9a99a9753c |
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
nclude/media/EffectEqualizerApi.h
edia/libeffects/Android.mk
|
| 1ba17bb023afda0d49d9bbc29e2777b91776d287 |
14-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Add support for sending events to the host when objects are added and removed"
|
| 873871f3e75831bcda6c3f75bb4d53355ca5c53a |
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>
edia/mtp/Android.mk
edia/mtp/MtpEventPacket.cpp
edia/mtp/MtpEventPacket.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpTypes.h
edia/mtp/f_mtp.h
|
| ac460be1e02f324656d5850ca6d8cf1165edbaaf |
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
|
| d205cba01a3bdab8a81c5079e2c21d1948e5fa2f |
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
|
| d54329e48d2ee6bc6b24d148770eec562e10e739 |
13-Jul-2010 |
James Dong <jdong@google.com> |
Fix simulator build
- missing header file <string.h>
- need to define -D__arm__
Change-Id: I18d2f1908684150784cf728234b5aedbc02447d1
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/avc/enc/src/avcenc_api.h
|
| f84b289306fc5b2399c62c62507dc80b159ae952 |
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.
|
| d3d18df30d06fa0b5b9f25c7eeda6b23db2cb533 |
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.
|
| 4d6ab0ccb63a4a283a2207358564bb6549c3ddb7 |
13-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Modifications in audio effect engine state management." into gingerbread
|
| e44b1efb293f878d4af8e824a6b3d070167bf2d6 |
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
nclude/media/EffectApi.h
edia/libeffects/EffectEqualizer.cpp
edia/libeffects/EffectReverb.c
edia/libeffects/EffectReverb.h
edia/libeffects/EffectVisualizer.cpp
|
| f6266bb1912255e92e590fcb6aedb719898545da |
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
|
| 4999e983c8f2f0060c14f2d7c5488e7f553985b4 |
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
|
| 29a84457aed4c45bc900998b5e11c03023264208 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/avc/enc/AVCEncoder.cpp
edia/libstagefright/codecs/avc/enc/Android.mk
edia/libstagefright/codecs/avc/enc/src/avcenc_api.cpp
edia/libstagefright/codecs/avc/enc/src/avcenc_api.h
edia/libstagefright/codecs/avc/enc/src/avcenc_int.h
edia/libstagefright/codecs/avc/enc/src/avcenc_lib.h
edia/libstagefright/codecs/avc/enc/src/bitstream_io.cpp
edia/libstagefright/codecs/avc/enc/src/block.cpp
edia/libstagefright/codecs/avc/enc/src/findhalfpel.cpp
edia/libstagefright/codecs/avc/enc/src/header.cpp
edia/libstagefright/codecs/avc/enc/src/init.cpp
edia/libstagefright/codecs/avc/enc/src/intra_est.cpp
edia/libstagefright/codecs/avc/enc/src/motion_comp.cpp
edia/libstagefright/codecs/avc/enc/src/motion_est.cpp
edia/libstagefright/codecs/avc/enc/src/rate_control.cpp
edia/libstagefright/codecs/avc/enc/src/residual.cpp
edia/libstagefright/codecs/avc/enc/src/sad.cpp
edia/libstagefright/codecs/avc/enc/src/sad_halfpel.cpp
edia/libstagefright/codecs/avc/enc/src/sad_halfpel_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_inline.h
edia/libstagefright/codecs/avc/enc/src/sad_mb_offset.h
edia/libstagefright/codecs/avc/enc/src/slice.cpp
edia/libstagefright/codecs/avc/enc/src/vlc_encode.cpp
edia/libstagefright/include/AVCEncoder.h
|
| 4714b0766ecf48f09f39b4781a5c4deafc092d49 |
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>
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 66e6c1c85c33194b1a6fc5077bd78b53a5fe9d03 |
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.
|
| b2761bde67a46a0375e6b606f3ece1af83834e43 |
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.
|
| a480a6f7f204fa1712e1484a6ba9e6c8772fa110 |
09-Jul-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
|
| 42a050ff9636b79e4b91297cc41028ffd62240d5 |
09-Jul-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix swap of sessionId and output in audio effect API.
Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
edia/libmedia/AudioEffect.cpp
|
| 31e179a6f1c154f5b8c80c0fb9451703c6839c9c |
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
|
| 0a8358c171306cbe2f67339ee75eee80ab59a439 |
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
|
| 004a77836d1963847acd20ea684e2ffe48aa3f19 |
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
|
| 7f53a190463274096155704276f3002c1620a364 |
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>
edia/mtp/Android.mk
edia/mtp/MtpDatabase.h
edia/mtp/MtpMediaScanner.cpp
edia/mtp/MtpMediaScanner.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpSqliteDatabase.cpp
edia/mtp/MtpSqliteDatabase.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/MtpTypes.h
edia/mtp/SqliteDatabase.cpp
edia/mtp/SqliteDatabase.h
edia/mtp/SqliteStatement.cpp
edia/mtp/SqliteStatement.h
edia/mtp/mtptest.cpp
edia/mtp/scantest.cpp
|
| fe02beaa83dab8d9bbf6aa0f2aefa530d4228824 |
09-Jul-2010 |
James Dong <jdong@google.com> |
Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684
Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/include/AACDecoder.h
|
| 40ad2941b4dcc7410bbcc7a2a138983933915f98 |
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
|
| b914122eb9cb54bbeae4ec03bfebb194aecdccbd |
08-Jul-2010 |
James Dong <jdong@google.com> |
Add runtime dumpsys support for media recorder client
Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
nclude/media/MediaRecorderBase.h
nclude/media/PVMediaRecorder.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/OMXCodec.cpp
|
| 723a540125f48aaf8a00b0cc5ed98fbbc01e5f14 |
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.
|
| bdbdf94e0e6bd3bcfc1fc6f5a421ac4a43930d1b |
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.
|
| cb28102ad3976339ec445afbcb4130f2991b38d7 |
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
nclude/media/EffectBassBoostApi.h
nclude/media/EffectEnvironmentalReverbApi.h
nclude/media/EffectPresetReverbApi.h
nclude/media/EffectReverbApi.h
nclude/media/EffectVirtualizerApi.h
edia/libeffects/EffectReverb.c
edia/libeffects/EffectReverb.h
|
| 1865a5ddcfe7b0e8dc211419aea1094b1491a5fd |
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>
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpSqliteDatabase.cpp
edia/mtp/mtptest.cpp
|
| dda7e2b7378755637f188cca7c5ae854427a28f7 |
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>
edia/mtp/Android.mk
edia/mtp/MtpDatabase.cpp
edia/mtp/MtpDatabase.h
edia/mtp/MtpMediaScanner.cpp
edia/mtp/MtpMediaScanner.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpSqliteDatabase.cpp
edia/mtp/MtpSqliteDatabase.h
edia/mtp/MtpTypes.h
|
| 6506bd2be256cdebc69324714c5b26c767981046 |
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.
|
| 14eb28444b40d76d490a184a27acbc0de95534b3 |
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.
|
| 6c5c25fae5aa68a52c6fa75649dd559a9ca98932 |
08-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Added Visualizer effect." into gingerbread
|
| bf21177ccede8f01c0da0bd53392a289a5a84462 |
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
|
| c61334edce8bd000543fa2c8172b305a887b9124 |
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
|
| 8cafde196d36ab207f35fed89b9c1b9d468abb58 |
07-Jul-2010 |
James Dong <jdong@google.com> |
Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
|
| 5bb4809a27ae962be32c67b705671cdada03be00 |
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.
|
| b8d05358721d4a3d6b57d1fed42c431e5311ef1c |
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.
|
| 5d2de4da54504836e4b772b3010ac28c19f667f0 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 145bfe5eb3e08c9689c28f6bf3287a979438b04b |
02-Jul-2010 |
James Dong <jdong@google.com> |
Allow application to set two more encoding paramters: video profile and level
Change-Id: I673e681cefe184d5c556c612c54600a24a2143e5
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/OMXCodec.cpp
|
| da7581b7b61b84f15e8d671c86fd117c322b009e |
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
nclude/media/AudioEffect.h
nclude/media/EffectVisualizerApi.h
nclude/media/IMediaPlayerService.h
nclude/media/Visualizer.h
nclude/media/mediaplayer.h
edia/libeffects/Android.mk
edia/libeffects/EffectVisualizer.cpp
edia/libmedia/Android.mk
edia/libmedia/AudioEffect.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/Visualizer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| f1ca5833464c0f6859f2a38b6af02cbe527c3335 |
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.
|
| 0696f6824b16388f88930f58d1431133725af2f4 |
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.
|
| c8705cf098f44eb3a6a8346eb386881983e1c2a3 |
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.
|
| 91952e5221d2151e10738d7228575c4afe444f5e |
07-Jul-2010 |
Andreas Huber <andih@google.com> |
Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread
|
| 93865edb8263daffc35bf5bf1d6af2ea50350bed |
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.
|
| 11cc270ac5fd522c9e6491a7933516a96da4f62e |
07-Jul-2010 |
Andreas Huber <andih@google.com> |
ALooperRoster no longer holds strong references to handlers and loopers.
Change-Id: I038d69b0a34eda1bfc5216d92c837a5ddf4fb802
nclude/media/stagefright/foundation/ALooperRoster.h
edia/libstagefright/foundation/ALooperRoster.cpp
|
| 2bd69f0df09cc67abdeeea2786e826914ee5ead0 |
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.
|
| 66c5ab792b75c6ebda099090e134c83465163062 |
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.
|
| f0128187491b4d65b9c2620d46f5af807f63d728 |
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
edia/libstagefright/omx/OMX.cpp
|
| 3ecb233c9c121af3e68ece11705043b1dbef505b |
07-Jul-2010 |
Andreas Huber <andih@google.com> |
Merge "An AHandler can now find its associated ALooper." into gingerbread
|
| e2b20987c2652a984d10520ef3542d50d91119c5 |
03-Jul-2010 |
Andreas Huber <andih@google.com> |
An AHandler can now find its associated ALooper.
Change-Id: Ic7087b8dcbc0d9abda272df0cb01b04b006f82ad
nclude/media/stagefright/foundation/AHandler.h
nclude/media/stagefright/foundation/ALooperRoster.h
edia/libstagefright/foundation/AHandler.cpp
edia/libstagefright/foundation/ALooperRoster.cpp
edia/libstagefright/foundation/Android.mk
|
| de71986fd162a1c19b7baded5f849aed2f1c1ef7 |
02-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Fix ownership and file permissions for transferred files and folders"
|
| 8e2a280ab7f98bf00ff2651f1f93c8f8bd46c08d |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/mtptest.cpp
|
| 139b1fe546725ae400bed3ed6bcecdbb7210a36a |
02-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Make MtpDatabase class abstract so we can have multiple implementations"
|
| 0250361b110267a139cc0865ff7d2f13b4d63bdf |
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>
edia/mtp/Android.mk
edia/mtp/MtpDatabase.cpp
edia/mtp/MtpDatabase.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpSqliteDatabase.cpp
edia/mtp/MtpSqliteDatabase.h
edia/mtp/SqliteDatabase.h
edia/mtp/scantest.cpp
|
| a041596d1c4c85a2face27ead436721f8435e53a |
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.
|
| 48f2d5807d922e1f799954b82a72e4bcd18ec74f |
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.
|
| 34bbea84b8374f5d0ebe72b0be4418ace984fac0 |
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
|
| 1ef2a2b04c1e2488694c511bc954604da21b12d0 |
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.
|
| e126468d6ea7040d9ff1fbdcf4c8a335d81c50a8 |
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.
|
| 42d7f83904b8a91ce33e87a44de109572679ac1f |
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
nclude/media/stagefright/foundation/ALooper.h
edia/libstagefright/foundation/ALooper.cpp
|
| cbb56d14dad2785baf7a723b43aa6f1da32dc51f |
02-Jul-2010 |
Andreas Huber <andih@google.com> |
Merge "Added AMessage::debugString() for debugging purposes." into gingerbread
|
| bbc2b8289458cfde931b133bad0c9d1026674ee7 |
01-Jul-2010 |
Andreas Huber <andih@google.com> |
Added AMessage::debugString() for debugging purposes.
Change-Id: Id43ffd2c56d659dc29f37e277f8c7b38f11c1591
nclude/media/stagefright/foundation/AMessage.h
edia/libstagefright/foundation/AMessage.cpp
|
| fc20aab463f527ab3b0664986f0381a86b375884 |
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
nclude/media/stagefright/CameraSource.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
|
| 633d8eadef0cd975c88e99ba7323f6414db09e3b |
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()
|
| 114071da403ffb00d25234ff98ec32b24b50fcc1 |
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()
|
| 65e7dee628b79e205460a933f3b87ea6cda09002 |
01-Jul-2010 |
James Dong <jdong@google.com> |
Merge "Refactor Stagefright::StartMPEG4Recording()" into gingerbread
|
| 26fa578b0aca9978b7a3acbf543fba553a3e8a04 |
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.
|
| c143929b9f40112bb75eefbeafd6a56515868c9d |
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.
|
| 934da11c4cc598d3dd3b53726c362bcdcc0fd37f |
30-Jun-2010 |
James Dong <jdong@google.com> |
Refactor Stagefright::StartMPEG4Recording()
- Also, better error handling
Change-Id: Ic18d08dc6489adf92c6a588efa4baca66429b175
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| d409bb704444ffbe634f6d4032ba731beb2a665b |
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.
|
| 19c9a1e2bb6ead5e1e895aea8be573fe0f8cc7bb |
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
mds/stagefright/Android.mk
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MediaWriter.h
edia/libstagefright/MPEG4Writer.cpp
|
| cff0ef94eccba9ce2f72380a238793f1702474b7 |
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>
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
|
| b0c62ef4ca6f30f3332e014f4fa7dc6c273c3e4d |
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.
|
| 3eaa4e92dbebb5b27cb89f329f31fac6fb6fe1f0 |
22-Jun-2010 |
Chih-Chung Chang <chihchung@google.com> |
Add multiple camera support for in MediaProfiles.
Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| 30cb2dd954f60047987b11020703c3bef1f8749f |
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>
edia/mtp/Android.mk
|
| 5b13ef945a016dc6113ccab3592ccc17eb60c3a7 |
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.
|
| 1559565c1cbad112b49d2c3f18aeffc2f68fd7cc |
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.
|
| 21ef7d0e70c5ad599bc2602cb484f8cd647055ca |
30-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Implement GetObjectPropDesc
Change-Id: I283651257254fc9cd9d93eab4605c5e33d3db93e
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 05a53a389852a9e52b816c087465f4e0c5009613 |
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>
edia/mtp/Android.mk
edia/mtp/MtpTypes.h
|
| b14e588bec4d5e39e61b020b5b575f2ce555d316 |
30-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: replace printfs with logcat
Change-Id: I2c30921098e2dc049dc5fc1e0a548ead33c363e0
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpClient.cpp
edia/mtp/MtpCursor.cpp
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDatabase.cpp
edia/mtp/MtpDebug.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
edia/mtp/MtpDeviceInfo.cpp
edia/mtp/MtpMediaScanner.cpp
edia/mtp/MtpObjectInfo.cpp
edia/mtp/MtpPacket.cpp
edia/mtp/MtpProperty.cpp
edia/mtp/MtpRequestPacket.cpp
edia/mtp/MtpResponsePacket.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorageInfo.cpp
edia/mtp/MtpStringBuffer.cpp
edia/mtp/MtpUtils.cpp
edia/mtp/SqliteDatabase.cpp
edia/mtp/SqliteStatement.cpp
edia/mtp/mtptest.cpp
|
| 1c8ed2e906576fd8d7fa03f577bdec518cbe13d7 |
30-Jun-2010 |
Andreas Huber <andih@google.com> |
Support for vanilla YUV420sp => RGB565 color conversion.
Change-Id: I22e5b554909e169eaf153d1f25b636f6f04a1871
nclude/media/stagefright/ColorConverter.h
edia/libstagefright/colorconversion/ColorConverter.cpp
|
| 703f87c890591e3a20ba0da237233c36a7c47bc7 |
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
|
| 3206a9cff4e893435906f3334d0e1a3c2032bd36 |
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
|
| d329e21495eda9dbc531fdd0c26c77f1593ac3f4 |
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
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
|
| 83290f0f0abbc410b45f2eef53a6f61cef54b968 |
29-Jun-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 799a5a61: am 2533a6ad: set up fast-forward from froyo-release to gingerbread
Merge commit '799a5a61d5813be83c4d0814b04c374adfe3a989'
* commit '799a5a61d5813be83c4d0814b04c374adfe3a989': (22 commits)
Properly note the current active restore set's token
Do not log AT command traffic by default.
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
TimedEventQueue is apparently important for glitch-free media playback, and so
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
When filling the cache, we always time out waiting for a condition that won't occur.
Respond to changes in throttle policy.
Fix Tethering of multiple downstream ifaces.
Update Framework to support multiple dhpc ranges
Dumb late-night typo.
Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
Clean up changing AP configuration
Grant permissions to apps on sd when enabling/disabling packages.
Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
Switch default install location to unspecified.
Fix problem with calling onConfigurationChanged() too much.
Preserve widgets on upgrade.
Need to keep new package's cert when using original-package.
Pick up default install location
Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
...
|
| f75e52a850f07936229ef43fb793dbb44303d170 |
29-Jun-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 2533a6ad: set up fast-forward from froyo-release to gingerbread
Merge commit '2533a6ad3f378db5f160546d10345730f68d676c' into gingerbread-plus-aosp
* commit '2533a6ad3f378db5f160546d10345730f68d676c': (22 commits)
Properly note the current active restore set's token
Do not log AT command traffic by default.
Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
TimedEventQueue is apparently important for glitch-free media playback, and so
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
When filling the cache, we always time out waiting for a condition that won't occur.
Respond to changes in throttle policy.
Fix Tethering of multiple downstream ifaces.
Update Framework to support multiple dhpc ranges
Dumb late-night typo.
Use ViewRoot.addConfigCallback instead of a BroadcastReceiver.
Clean up changing AP configuration
Grant permissions to apps on sd when enabling/disabling packages.
Fix issue #2512507: Shortcuts and Widgets lost on upgrading from Eclair to FRE70D
Switch default install location to unspecified.
Fix problem with calling onConfigurationChanged() too much.
Preserve widgets on upgrade.
Need to keep new package's cert when using original-package.
Pick up default install location
Fix 2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils.
...
|
| e1e7b764b78f29b93bfe6123483e82381e4ed65d |
29-Jun-2010 |
The Android Open Source Project <initial-contribution@android.com> |
set up fast-forward from froyo-release to gingerbread
Change-Id: I22fc9465f5d8a0144b31803f431602fe3bda516a
|
| ae723818b80e22b44a90c5e093d4556a38966d57 |
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.
|
| 9833433306da46adc65b2d7597b93bb4ace6f87a |
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.
|
| ae1f0036bd9cc52353fb3a8ad4556792e1e8047a |
29-Jun-2010 |
Andreas Huber <andih@google.com> |
Add qcom's new OMX components to the list.
Change-Id: Ic8d261aaa5b15c1be7e6d57aee6be51cecb10bb1
edia/libstagefright/OMXCodec.cpp
|
| eb4bbb5e464487337778d782e41ab1cc13994f51 |
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)
|
| 71b10ebb1818fbd02199b3238a5df4ca99fd59ab |
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)
|
| 215381ea729086b8359b7f59bdc2bd7cf55a0c45 |
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
edia/libstagefright/MPEG4Writer.cpp
|
| 1c645f22ab7e56a04659c09ffa2ca2de20650ddc |
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
|
| 5ca9632960ef25374ca2df4c90213c19e5db18b0 |
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
|
| 37047fceba836f341d0108beed0991b0f8dfc543 |
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
nclude/media/IMediaRecorder.h
nclude/media/IMediaRecorderClient.h
nclude/media/MediaRecorderBase.h
nclude/media/PVMediaRecorder.h
nclude/media/mediarecorder.h
nclude/media/stagefright/MediaWriter.h
edia/libmedia/Android.mk
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/IMediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| 1eff1b9a7fcf7044cd076c7d66f05bd1154999b7 |
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
|
| ee4c4065757673b652f8e4c8acb9c9ce93c9e4df |
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
|
| 93d6b102a13afa23bfa80d74c399d93d542e6ad6 |
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
nclude/media/mediarecorder.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| a93b488457b8d7dd17a1d80c82a9accafcdd8bad |
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
|
| fd6440c0aca0659ce2c5220ecded707dfd4db1bc |
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
|
| ae170d33ec0bd23498f11efa33b9abd974dfe123 |
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
|
| 31c000831ea8c116c00de1ecb40e6b336b937f68 |
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).
|
| 3e8ec1e8ec638a1bbee354f2df88bba60b1014ba |
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()
|
| 0070c924a2050b6683d6d170602201cc5f83a1a6 |
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
|
| 658bd258af206ebc662301979482ba4bfd88481a |
25-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Various fixes and improvements in audio effects implementation" into gingerbread
|
| ffe9c25ce85e1af55d58ec025adc6367d70db7e8 |
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
nclude/media/AudioCommon.h
nclude/media/AudioEffect.h
nclude/media/AudioSystem.h
nclude/media/EffectApi.h
nclude/media/EffectFactoryApi.h
nclude/media/EffectsFactoryApi.h
nclude/media/IAudioFlinger.h
edia/libeffects/Android.mk
edia/libeffects/AudioCoefInterpolator.cpp
edia/libeffects/AudioCommon.h
edia/libeffects/AudioFormatAdapter.h
edia/libeffects/AudioShelvingFilter.cpp
edia/libeffects/EffectEqualizer.cpp
edia/libeffects/EffectReverb.c
edia/libeffects/EffectReverb.h
edia/libeffects/EffectsFactory.c
edia/libeffects/EffectsFactory.h
edia/libmedia/AudioEffect.cpp
edia/libmedia/IAudioFlinger.cpp
|
| 8b4f23cc52da0052bec013fa68866ca69c78fe6d |
25-Jun-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from froyo-plus-aosp
Change-Id: Ibaa84571e3b5a7ea29e55d41f773aa5f301086de
|
| 1f80fe4a1fb18dbf797720b5c3b4c1b437406faf |
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
|
| 9235bc896538e906e162aa5f9e11f8af04c29664 |
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
edia/libstagefright/include/NuCachedSource2.h
|
| 2dec2b5be2056c6d9428897dc672185872d30d17 |
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
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaWriter.h
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| d4b91aac78e565a135f8ef1bfda7e6317debaf35 |
25-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbread
|
| d3d4e5069e1af0437c4f5a7b4ba344bda5b937af |
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
nclude/media/stagefright/AudioSource.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AudioSource.cpp
|
| 5fdc39eb380e84d5de7071f195b3fbe96d475b44 |
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.
|
| a5522c94a437d9449fba9d8167409f5e357075b6 |
24-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread
|
| 71b1a4e975dfb65660a0119b9d6bf6db77eca09e |
24-Jun-2010 |
Andreas Huber <andih@google.com> |
Properly identify malformed (too short) chunks in mpeg4 files.
Change-Id: Id2efb1bba195c4ad6f132cd706cc813135ead8a4
edia/libstagefright/MPEG4Extractor.cpp
|
| 20398afa58f825db32fa250a3fd27f0d1f719c97 |
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
|
| 47c778f4a5fa639b2082fcc74080d33ac847b232 |
24-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Fixed the software AAC encoder" into gingerbread
|
| 67089ba8dd8074361f50b4353a63ead97d86e92f |
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.
|
| 7bf4fab9e5590d345b93b559f35b2fb0f6b17ca8 |
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
|
| 065d1aff96818df54456053f1574aec8a234d0de |
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
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/include/AACEncoder.h
|
| 608d77b1cf4fb9f63dc861e4e1fa3e80a732f626 |
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
mds/stagefright/Android.mk
nclude/media/MediaPlayerInterface.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/VorbisMetadataRetriever.cpp
edia/libmediaplayerservice/VorbisMetadataRetriever.h
edia/libmediaplayerservice/VorbisPlayer.cpp
edia/libmediaplayerservice/VorbisPlayer.h
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/id3/Android.mk
edia/libstagefright/omx/tests/Android.mk
|
| 94c57e91b1a5495fe66f64891fd77ce42ab68f58 |
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
|
| 2439a8d6d99864ba0c2d94f428e6c9ee258cdd45 |
24-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbread
|
| 1acfe8649f8169caf2ff098c2dc2de880d9a3760 |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| ed914577e770697e23884886787e333588eb4c61 |
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
|
| d255a4e04d06796441ae234e8f3a8277578b3446 |
23-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
|
| c08d805c8d7ba0da56988382f7e9b70b98468636 |
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.
|
| 1a97e853e8f9fa3f4f47304d0e2e9118887e6051 |
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.
|
| 4ae22516962e6d6727fc3e9ce646441708ed60a9 |
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().
|
| 1629399bb578fc176613ccaf134d1be6e3047638 |
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
edia/libmedia/MediaScanner.cpp
edia/libstagefright/omx/OMXMaster.cpp
|
| 3e0339f9ec42c2c31deb632254e9cc8a06d3db91 |
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
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
edia/libstagefright/include/MP3Decoder.h
|
| 735e25176efebe9cb54e5d426ae3ba02bf9ccd45 |
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
|
| d96e3d9a1e6b30f2bafdd9a3dc079008243c6079 |
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.
|
| 3d422c194b685b7c2755adeac7b99c54bebd8824 |
23-Jun-2010 |
Andreas Huber <andih@google.com> |
am 235073a5: am 8a42f881: Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
Merge commit '235073a549ec664caea93e0ccded95e4a6819b6b'
* commit '235073a549ec664caea93e0ccded95e4a6819b6b':
Make sure sine: is supported again in stagefright commandline tool.
|
| aa941f086e7df62a60350879412efc69b52bcd12 |
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)
|
| dadd0d1e7d5fbb88fd3420438c590a0bb4c18af5 |
23-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
|
| 41b2d090b23889c56bf0a889a8c9c2fb934015e8 |
23-Jun-2010 |
Chia-chi Yeh <chiachi@android.com> |
Merge "media: add AudioRecord::getMinFrameCount()." into gingerbread
|
| a514bdb58b5de4986679f72b7204b4764f7a2778 |
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
nclude/media/IMediaPlayerService.h
nclude/media/mediaplayer.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 15304d601cbf83be6519ca53e1a26b97d50d0192 |
22-Jun-2010 |
Chia-chi Yeh <chiachi@android.com> |
media: add AudioRecord::getMinFrameCount().
Change-Id: I952071ab10aa49aa96b727d157b68470d69fff3d
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| c6588763ddc20541688e426a24b1b070527c051f |
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>
edia/mtp/MtpServer.cpp
edia/mtp/f_mtp.h
|
| 78c1e5ecb7a1c6474485c94276fb6c2bffebd2dc |
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>
edia/mtp/MtpStorage.cpp
edia/mtp/mtptest.cpp
|
| 58ae9c530247668f8af36e30d228c716c226b3d4 |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 40f388ef8bad7a9ab16db8f90904656cd39c793d |
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
|
| 5603f749d5903898b5018cf907f194830bf4ff2b |
22-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Make sure sine: is supported again in stagefright commandline tool." into gingerbread
|
| 0cd1e0bf7a0db4dcc111ee0732cbe2ec6e02b5af |
22-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Audio/video sync during recording (second part)" into gingerbread
|
| a5273ebd1746368662a597643d6701a5046d5c7b |
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
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| f60cafe0e6aad8f9ce54660fa88b651ae4e749e6 |
19-Jun-2010 |
James Dong <jdong@google.com> |
Audio/video sync during recording (second part)
Change-Id: Iba0b35f57fdeac7ee1da16899406bf4b957a2c8c
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
|
| 8a08d9d62eeca9b0e8d75daef02706be798a97b5 |
21-Jun-2010 |
Andreas Huber <andih@google.com> |
Make sure sine: is supported again in stagefright commandline tool.
Change-Id: I703f1a8b7556543ef71b141dc8e38d8b82d8c6dc
mds/stagefright/stagefright.cpp
|
| 9e6f25df13d5242d83fda224f8cc0b2bf22a727c |
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().
|
| c7fa90a661dd9f6107af6a1d9e6dcaa1cb9a34e3 |
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().
|
| 33005a932c60a0780fe9b7307d5988df3d9f6c26 |
16-Jun-2010 |
Chia-chi Yeh <chiachi@android.com> |
media: add AudioTrack::getMinFrameCount().
Change-Id: If15162583d1d16d89f59be0793106afe77417f35
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| e40c0333c6c4f7b618f5160bad5cd55aef0ea521 |
18-Jun-2010 |
James Dong <jdong@google.com> |
am eaeec4b7: am 2bc48186: am 39e876ad: (-s ours) 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 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab'
* commit 'eaeec4b718a31595a4d50d01b917d7eb7b1376ab':
When filling the cache, we always time out waiting for a condition that won't occur.
|
| e6de2667d6bf4bb7b926da6784cc7eb886b93e83 |
18-Jun-2010 |
James Dong <jdong@google.com> |
am 39e876ad: (-s ours) 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 gingerbread
* commit '39e876ad743f203fe005333947c61383772b0d14':
When filling the cache, we always time out waiting for a condition that won't occur.
|
| 206ebe295b0b900b58c760e4df6b5d2c8ad4d4f8 |
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
|
| d26b133beec4df8608db3958045650e661ae8666 |
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
|
| 51da506d87b071ea01bc8f4707a2045869394e83 |
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.
|
| bb045607843cc02e9567877e226a5fd803f654bf |
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
|
| 51a540afbfac32464503247ad7595b08f01e7cd0 |
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
|
| 99c2a076b4a46762a22bbb4dfbd51d107e0532d9 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| 92ad66e53a061d5c3e7a29c66b46e63454aa0d19 |
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
|
| 8fb4e091bc62b15bec2c05adcb50429bb76f1b28 |
17-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
|
| bc809bab8786592be01821f363419d53ccbd3543 |
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
edia/libstagefright/TimedEventQueue.cpp
|
| fac961021ad1c70c5d77469349fc8dfbc62f5296 |
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
edia/libstagefright/Prefetcher.cpp
|
| e32283b15bbd60179424bdc740a4e4932da4c61e |
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
|
| d82ac9c464a83f36e87cc95b26f6030402dda256 |
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
edia/libstagefright/Prefetcher.cpp
|
| 17e8ad9c4b8fbdebec4559702b82114fb6543b67 |
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
edia/libstagefright/TimedEventQueue.cpp
|
| 3621daac5cd14fafa44c153179e2025e31e1a793 |
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
|
| bc801f9b6450a110470071ff3db05edb8ec501d7 |
15-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Use stat.st_mode instead of dirent.d_type to determine file type."
|
| 6212cd2e12e31e046ac4483254fe029c4e070e99 |
15-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MediaScanner: Fix handling of files with dirent.d_type == DT_UNKNOWN"
|
| 6084a2964e346a036b58b1f4565ccbdefd518234 |
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>
edia/mtp/MtpMediaScanner.cpp
|
| ef04e8f230e7ef5dece1cc4e73cd109c69905418 |
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>
edia/libmedia/MediaScanner.cpp
|
| 7c8bbd2c10d42924dea8853530c3b6d0281c5d03 |
15-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP device: Read manufacturer name and serial number from system properties."
|
| c42aa12f73edf79bc9cb0dbf6b74a7f1af11c683 |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorage.cpp
|
| be6ec71af2d12e2a55f2f0b1b77d3fa5d593a1c7 |
15-Jun-2010 |
James Dong <jdong@google.com> |
Remove hard-coded number of audio channels in AudioSource
Change-Id: I5f362252c25e2251bbfa9818b711ee23b4975248
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AudioSource.cpp
|
| 78d26445a7dfe8f49d7005185f28b01cffe80adf |
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
edia/libstagefright/include/OMX.h
edia/libstagefright/omx/OMX.cpp
|
| 57b1dfad103cb0361a2a32cae1fad56a66080fa0 |
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?
|
| 8aa8fe5ea704b05d8f0ab3d7bf18de18151f1b50 |
14-Jun-2010 |
James Dong <jdong@google.com> |
Fixed a typo - maybe we should do comparison ignoring the case?
Change-Id: I498f8242e6ba3e3e8b8c7b714ed49bff51a3010b
edia/libstagefright/OMXCodec.cpp
|
| a177ae14b8cd9c1172cd166094cbffb2485325c2 |
14-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix uninitialized pointer bug.
Change-Id: Ia07ebd48aeb483e66957f5a174992d200494a744
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/MtpDatabase.cpp
|
| 366c84d307e128a00a5ba0234cad7759a0b3d57c |
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.
|
| 582c2c3ddabbb3950d19c7ba1124c69856f7eac3 |
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.
|
| 1616fa4a567bae928dfd28ebf1ec45cd701f27f1 |
14-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
|
| 5f7a969ae673c49b78db42f6fcd0d2da4c377540 |
14-Jun-2010 |
Jeff Brown <jeffbrown@google.com> |
resolved conflicts for merge of 9e660c82 to master
Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43
|
| 0450c5ebb6125a1a58c4588af9ad3611bd65b1d1 |
14-Jun-2010 |
Jeff Brown <jeffbrown@google.com> |
am 46b9ac0a: Native input dispatch rewrite work in progress.
Merge commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2' into gingerbread
* commit '46b9ac0ae2162309774a7478cd9d4e578747bfc2':
Native input dispatch rewrite work in progress.
|
| 628eff9967c4efd04204656d9756df9e32cf523c |
23-Apr-2010 |
Jeff Brown <jeffbrown@google.com> |
Native input dispatch rewrite work in progress.
The old dispatch mechanism has been left in place and continues to
be used by default for now. To enable native input dispatch,
edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy.
Includes part of the new input event NDK API. Some details TBD.
To wire up input dispatch, as the ViewRoot adds a window to the
window session it receives an InputChannel object as an output
argument. The InputChannel encapsulates the file descriptors for a
shared memory region and two pipe end-points. The ViewRoot then
provides the InputChannel to the InputQueue. Behind the
scenes, InputQueue simply attaches handlers to the native PollLoop object
that underlies the MessageQueue. This way MessageQueue doesn't need
to know anything about input dispatch per-se, it just exposes (in native
code) a PollLoop that other components can use to monitor file descriptor
state changes.
There can be zero or more targets for any given input event. Each
input target is specified by its input channel and some parameters
including flags, an X/Y coordinate offset, and the dispatch timeout.
An input target can request either synchronous dispatch (for foreground apps)
or asynchronous dispatch (fire-and-forget for wallpapers and "outside"
targets). Currently, finding the appropriate input targets for an event
requires a call back into the WindowManagerServer from native code.
In the future this will be refactored to avoid most of these callbacks
except as required to handle pending focus transitions.
End-to-end event dispatch mostly works!
To do: event injection, rate limiting, ANRs, testing, optimization, etc.
Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
nclude/private/README
|
| f49a97b33b325426cd319f0dc960024ff68cce82 |
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...
|
| a1ad27130107b4377cc94b310a1e6c51d4b17cde |
12-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Must hold lock here..." into gingerbread
|
| 2f8aeb406368995ba760937b3c3465ea7b562fa2 |
12-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Add host support for deleting objects."
|
| 6afc41d095ccb159f6c4705bed903b6c048b922a |
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>
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| 88d18f41b100ef540d5e5090c04d56afa2a06cc1 |
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
|
| 623a0de03d72c17b4cf0701280c6cb1df365ea6c |
11-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Initial checkin for pause and resume control" into kraken
|
| d17875a226491e3de60fa32d764a4cc92de7f949 |
11-Jun-2010 |
Andreas Huber <andih@google.com> |
Must hold lock here...
Change-Id: I179a5582c9246f78c988f85e2f969f32d547ac89
edia/libstagefright/NuCachedSource2.cpp
|
| a7d1a2dd776bf356c228785a94ba8e0ff6a2ec7f |
10-Jun-2010 |
James Dong <jdong@google.com> |
Initial checkin for pause and resume control
Change-Id: Ibdcf7bea5fb66baa81878704ba4091dfcfe382ee
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaWriter.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/AudioSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
|
| 0c9e60c772ae007a68cbfa46e0d2fb429376cfd2 |
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.
|
| b55cf746536962d262c3b627e32a37464927b67b |
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
|
| 7b752795080568c422ea581a645ad1333c075042 |
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.
|
| 79f77ef3b0a37660ba8c5bcb2dfbfda3860f2135 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuHTTPDataSource.h
|
| 6f5aae1bcba130d5b8092a19fca3627aa565df56 |
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
edia/libstagefright/NuCachedSource2.cpp
|
| 801a1186eb1d2ce195b15222701865932e08f3dc |
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
nclude/media/AudioEffect.h
edia/libmedia/Android.mk
edia/libmedia/AudioEffect.cpp
|
| cbf57a940aa448233370e5b4dcb311f4fa188cda |
11-Jun-2010 |
Chih-Chung Chang <chihchung@google.com> |
am dac5e001: am b8bb78f5: Change camera interface to support multiple cameras.
Merge commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9'
* commit 'dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9':
Change camera interface to support multiple cameras.
|
| ddbdb35d176266b5ab64c30178f5cb76c5b1b4b4 |
10-Jun-2010 |
Chih-Chung Chang <chihchung@google.com> |
Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
amera/Camera.cpp
amera/ICameraService.cpp
nclude/camera/Camera.h
nclude/camera/CameraHardwareInterface.h
nclude/camera/ICameraService.h
|
| b394a76e5d8d3ec417078cfda26f78dcd5ba595d |
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.
|
| bd6751316fa0685678d617d52b12c683fc137a69 |
11-Jun-2010 |
Andreas Huber <andih@google.com> |
am 32d8b25f: am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken
|
| 4ac2e697b6ce55ed74fedf28de93f183f202c060 |
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
|
| 3e6304b18a1df30ebdb6ef8582336ad7a982e1af |
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
|
| 0a5baa9b411fe086013d2a5e9126ed63fbad046c |
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
nclude/media/mediaplayer.h
nclude/media/stagefright/CachingDataSource.h
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/Prefetcher.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/Prefetcher.h
|
| 28b6844dec4297b16777fd45fd77ff33aa495de2 |
11-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Simplify the code in the stagefright commandline utility." into kraken
|
| baef63d1ac0ec6f489f5e50d2a599ff96c1f44ba |
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
|
| 61ea6c1bc242841663cb6f3601f89fd929882d0b |
11-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Initial check-in of new caching/prefetching data source implementation." into kraken
|
| 3e072b354d1e1e3ee62d58492f0739139df8aff1 |
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>
edia/mtp/MtpCursor.cpp
edia/mtp/MtpCursor.h
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
|
| fee87d7b4e60d7541aa2cb0d31f5bdf4ca9e6475 |
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
|
| bca5a95ed7019605228d16c7cf583880c74a516d |
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
|
| 80737bac407a36e99267f65fe162b8e282822af4 |
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
|
| 6a350a967766a197c161e69185c48f642cbaa460 |
10-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Initial check in of a new http data source implementation." into kraken
|
| 1c70247536457f7b7fa84daa3482bd3d3b44e225 |
10-Jun-2010 |
Andreas Huber <andih@google.com> |
Simplify the code in the stagefright commandline utility.
Change-Id: Ia222b25ef12af34f6434421fd96b67eca800d1ab
mds/stagefright/Android.mk
mds/stagefright/stagefright.cpp
|
| 1370cbe385c4295471910aacbef51a8a65ce533d |
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
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/include/LiveSource.h
|
| d35bd5fb4e09c2cd8608497c279cbb2ef9c3a029 |
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
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 5994b4798b01f3dd340577c9ea9657f09093a770 |
10-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial check-in of new caching/prefetching data source implementation.
Change-Id: I97a6e3f03c69c9b1219f1f06bd109c0102f2c504
nclude/media/stagefright/foundation/AHandlerReflector.h
edia/libstagefright/NuCachedSource2.cpp
edia/libstagefright/include/NuCachedSource2.h
|
| f0821faac01c41cb3eb0ec057443f1507e7afcb5 |
10-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial check in of a new http data source implementation.
Change-Id: I17c358288ffe9ef690d702c58723c766d0a0cf21
edia/libstagefright/NuHTTPDataSource.cpp
edia/libstagefright/include/NuHTTPDataSource.h
|
| 0ef2bf5df731114fce7307dc881b69d198b6d933 |
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
edia/mtp/MtpCursor.cpp
edia/mtp/MtpObjectInfo.cpp
|
| 9f58d24b9ab509733368bdf7f0a446855706092e |
10-Jun-2010 |
James Dong <jdong@google.com> |
am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken
|
| 52ac6ea00252a153cb3aad9db1e3eaa559c3555a |
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
|
| decc91d5bc6e02acd52ca5bb6f87627285bb97c4 |
10-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Remove the lock/unlock workaround from CameraService" into kraken
|
| 98c7c319907f4ed3915461ca62b1027590d351e5 |
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
edia/libstagefright/OMXCodec.cpp
|
| 9d7f58a7da8502a4174a17ac49fcba6efa35a457 |
10-Jun-2010 |
James Dong <jdong@google.com> |
Remove the lock/unlock workaround from CameraService
bug - 2677772
Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
|
| aefe119af92cf0b6ec785e2831c48b068775193e |
09-Jun-2010 |
Mathias Agopian <mathias@google.com> |
am 34e5d967: am 55f8209d: Merge "allow re-targetting of surfaces" into kraken
|
| 36ef8cf54e2bf2f96b8c7f47cd534c00ccb7b64f |
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
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 7bd3e384115fdcff79c9a7fd868a12f73ab6ad71 |
08-Jun-2010 |
James Dong <jdong@google.com> |
am d49c9818: am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken
|
| ddcc4a66d848deef6fb4689e64e30cd9bd2684fe |
08-Jun-2010 |
James Dong <jdong@google.com> |
Remove some hard-coded encoding parameters
Change-Id: I7a8ccd5d57891a6a585c8da2ee53acb094955913
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/OMXCodec.cpp
|
| 88a1303d406f8d87f4d0c54e319f66474c382062 |
08-Jun-2010 |
James Dong <jdong@google.com> |
am 15c0c098: am dae9fd31: Initial check-in for collecting stats from authoring engine at runtime
|
| 365a963142093a1cd8efdcea76b5f65096a5b115 |
04-Jun-2010 |
James Dong <jdong@google.com> |
Initial check-in for collecting stats from authoring engine at runtime
Change-Id: I93a9d8bd260efc5e7fc135b726e3f1307c6df794
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/CameraSource.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| 5334b838b178b5d6c82c41e190001a704e40d0e7 |
08-Jun-2010 |
James Dong <jdong@google.com> |
am ef2ad683: am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken
|
| d81f03285f91fa11fe83a11b8f783fa506347038 |
08-Jun-2010 |
Andreas Huber <andih@google.com> |
am ae9348bc: am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken
|
| cc2fc006594cccbf1a58a2933c1d18cf0f2e021f |
08-Jun-2010 |
James Dong <jdong@google.com> |
Merge "Second part of speeding up video recording frame rate" into kraken
|
| d07139e2e817a9b3ae9c87ba4e1e8d65d3e549da |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 6a2736ba7bc19947a6c0bff4dca50595baa78b37 |
08-Jun-2010 |
Kenny Root <kroot@google.com> |
Include stdlib to fix sim build
Change-Id: I7732461a9351f53f9ddadcfb26485f2e553e056b
edia/mtp/mtp.h
|
| cf7b9c7aae758ac0b99833915053c63c2ac46e09 |
08-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial checkin of preliminary rtsp support for stagefright.
Change-Id: I0722aa888098c0c1361c97a4c1b123d910afc207
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/ARTSPController.h
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/rtsp/AAVCAssembler.cpp
edia/libstagefright/rtsp/AAVCAssembler.h
edia/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
edia/libstagefright/rtsp/AMPEG4AudioAssembler.h
edia/libstagefright/rtsp/APacketSource.cpp
edia/libstagefright/rtsp/APacketSource.h
edia/libstagefright/rtsp/ARTPAssembler.cpp
edia/libstagefright/rtsp/ARTPAssembler.h
edia/libstagefright/rtsp/ARTPConnection.cpp
edia/libstagefright/rtsp/ARTPConnection.h
edia/libstagefright/rtsp/ARTPSource.cpp
edia/libstagefright/rtsp/ARTPSource.h
edia/libstagefright/rtsp/ARTSPConnection.cpp
edia/libstagefright/rtsp/ARTSPConnection.h
edia/libstagefright/rtsp/ARTSPController.cpp
edia/libstagefright/rtsp/ASessionDescription.cpp
edia/libstagefright/rtsp/ASessionDescription.h
edia/libstagefright/rtsp/Android.mk
edia/libstagefright/rtsp/MyHandler.h
edia/libstagefright/rtsp/MyTransmitter.h
edia/libstagefright/rtsp/VideoSource.h
|
| 3c982296642ebc76095aa5843419c00e1835c883 |
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
|
| e71d10e7ad55ccbcb0756c007caef1c959090384 |
07-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial checkin of preliminary support for "http live" streaming in stagefright.
Change-Id: I20399f63d63af86a3ba22641c0e43385a108fb3f
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/httplive/Android.mk
edia/libstagefright/httplive/LiveSource.cpp
edia/libstagefright/httplive/M3UParser.cpp
edia/libstagefright/include/LiveSource.h
edia/libstagefright/include/M3UParser.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 800ff059909565e8ad249e2b8e39e3cf0299fab0 |
07-Jun-2010 |
Andreas Huber <andih@google.com> |
am f7d1c542: am a557b24a: Initial checkin of mpeg2 transport stream parser for stagefright.
|
| cda17c606b0fe3ccda4dc68a6d43882410ea2462 |
07-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial checkin of mpeg2 transport stream parser for stagefright.
Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/include/MPEG2TSExtractor.h
edia/libstagefright/mpeg2ts/ABitReader.cpp
edia/libstagefright/mpeg2ts/ABitReader.h
edia/libstagefright/mpeg2ts/ATSParser.cpp
edia/libstagefright/mpeg2ts/ATSParser.h
edia/libstagefright/mpeg2ts/Android.mk
edia/libstagefright/mpeg2ts/AnotherPacketSource.cpp
edia/libstagefright/mpeg2ts/AnotherPacketSource.h
edia/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
|
| 2ac79b6af2477f71c75e2e623906de323a4c18ca |
07-Jun-2010 |
Andreas Huber <andih@google.com> |
am cd4961d9: am 455d4100: Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
|
| c46e8b9fdce32bafb0b84cdb16affbdd35c2e3ba |
07-Jun-2010 |
Andreas Huber <andih@google.com> |
Merge "Initial checkin of "foundation" library for future stagefright development." into kraken
|
| 952a80cf85a0e3cba02ab46dbb7007ed666a9a06 |
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
|
| 72961230a5890071bcca436eb5630172ce84ec41 |
07-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial checkin of "foundation" library for future stagefright development.
Change-Id: I11714dcaa647d0437a13e4c5b953b35e712da8f3
nclude/media/stagefright/foundation/AAtomizer.h
nclude/media/stagefright/foundation/ABase.h
nclude/media/stagefright/foundation/ABuffer.h
nclude/media/stagefright/foundation/ADebug.h
nclude/media/stagefright/foundation/AHandler.h
nclude/media/stagefright/foundation/ALooper.h
nclude/media/stagefright/foundation/ALooperRoster.h
nclude/media/stagefright/foundation/AMessage.h
nclude/media/stagefright/foundation/AString.h
nclude/media/stagefright/foundation/base64.h
nclude/media/stagefright/foundation/hexdump.h
edia/libstagefright/foundation/AAtomizer.cpp
edia/libstagefright/foundation/ABuffer.cpp
edia/libstagefright/foundation/ADebug.cpp
edia/libstagefright/foundation/ALooper.cpp
edia/libstagefright/foundation/ALooperRoster.cpp
edia/libstagefright/foundation/AMessage.cpp
edia/libstagefright/foundation/AString.cpp
edia/libstagefright/foundation/Android.mk
edia/libstagefright/foundation/base64.cpp
edia/libstagefright/foundation/hexdump.cpp
|
| c00d6f3ffc0eace26954e1863568820bd21794c0 |
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
|
| a6c490b8b2d96ebaab632286029463f932ae3b6b |
06-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: host support for retrieving device property descriptors
Signed-off-by: Mike Lockwood <lockwood@android.com>
edia/mtp/Android.mk
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
edia/mtp/MtpDeviceInfo.cpp
edia/mtp/MtpObjectInfo.cpp
edia/mtp/MtpProperty.cpp
edia/mtp/MtpProperty.h
edia/mtp/MtpStorageInfo.cpp
edia/mtp/MtpTypes.h
|
| 7dfffd78637f99ce396e7ce2008b05b2d5aec131 |
05-Jun-2010 |
Mathias Agopian <mathias@google.com> |
am fd89b1c8: am 7623da43: split surface management from surface\'s buffers management
|
| cbbf27f76b4798cbd91feb70d7555dac0cbf85cb |
02-Jun-2010 |
Mathias Agopian <mathias@google.com> |
split surface management from surface's buffers management
Change-Id: If3c5655d1231f8f0c49ba68f972b1b20c93b3f87
nclude/private/surfaceflinger/SharedBufferStack.h
|
| ab372f6738b7de287f9a9fa7e3ecb70a46ada359 |
04-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Add support for host cancellation of file transfers."
|
| 916076c6d84dac9b104fbdf94af5dcd7bce669fd |
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>
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
|
| 5652c43f56c1879df7a0b02fea621e5d39ae2c2d |
04-Jun-2010 |
Wu-cheng Li <wuchengli@google.com> |
am ab5e67c6: am cefb01ab: Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken
|
| a21b4e224e8622c0e3280c33b8ebd24fcc515580 |
04-Jun-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add KEY_SUPPORTED_METERING_MODES and fix some typos." into kraken
|
| d38bee5858f5387afc28dcb97139b760ac8a1c63 |
04-Jun-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add KEY_SUPPORTED_METERING_MODES and fix some typos.
bug:2737111
Change-Id: I108ae7057786921bf99385ad66dbc1f02d6a1448
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| fc499ca2babff1315d0188ddfbe0268fe5d5e8ae |
04-Jun-2010 |
Eric Laurent <elaurent@google.com> |
am 030a1553: am 2ea200c5: Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
|
| dea96b8d54daf9ef76beb7e72e69c9f1c923c1d8 |
04-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Issue 2667801: [Audio Effect Framework] AudioFlinger, AudioMixer AudioTrack modifications." into kraken
|
| 72b577e1da38b9cd5d6f70a1012db4448395188c |
04-Jun-2010 |
Doug Kwan <dougkwan@google.com> |
Merge "Add missing library to linker command line."
|
| c8ca7dafbeef10218371bdfa13a76525c593343a |
04-Jun-2010 |
Doug Kwan <dougkwan@google.com> |
Add missing library to linker command line.
Change-Id: Ia9ddf6e6bb5e72c32372a2f460806b6cbb7ec660
edia/mtp/Android.mk
|
| 2f2c3a448ed7ca7d0a19ca134993586caa918d05 |
04-Jun-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 2f98f99c: am 5f5df382: Merge "Add camera metering mode API." into kraken
|
| cd3514492c2d49aeb88eedae40b54dcdd3fcbd9a |
04-Jun-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add camera metering mode API." into kraken
|
| 503f034df11972458cb980d2f4b70894b211b02f |
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
edia/mtp/Android.mk
|
| e937a6c22bec098ecc0b108fb8cb0fc77b4aa8e0 |
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
|
| c1640f49abb1efc31a5fb985cfde73913cebbe8b |
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.
|
| ebe43b342205674c559edf68dfa2b51bbf71189b |
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.
|
| ddc43521f9e15b15edc6f7dce0965483f6a0f820 |
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
edia/libstagefright/Prefetcher.cpp
|
| 653252be963c07c99109d20f942d1f30c52a9360 |
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
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
|
| 42c7a3ef66ba4972e3068501bf292d541b03a871 |
03-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "Prototype Content Provider support for MTP/PTP devices."
|
| be916aa1267e2e6b1c148f51d11bcbbc79cb864c |
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
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/EffectApi.h
nclude/media/EffectFactoryApi.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioTrack.h
nclude/private/media/AudioEffectShared.h
nclude/private/media/AudioTrackShared.h
edia/libeffects/EffectEqualizer.cpp
edia/libeffects/EffectReverb.c
edia/libeffects/EffectReverb.h
edia/libeffects/EffectsFactory.c
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioTrack.cpp
|
| 2b8aba228e6ebd45fe29714baa477f3ea2320095 |
03-Jun-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add camera metering mode API.
bug:2737111
Change-Id: Ie986fee56ebeaaed2d2efb757701dfe3ffdec8d8
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 5ed68d29a140e14c8d46980fa844548eb33b1e87 |
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>
edia/mtp/Android.mk
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
edia/mtp/MtpCursor.cpp
edia/mtp/MtpCursor.h
edia/mtp/MtpDevice.cpp
edia/mtp/MtpDevice.h
edia/mtp/MtpTypes.h
edia/mtp/ptptest.cpp
|
| 62affddfac747b61a71c8e16164eaa7dbffa648e |
02-Jun-2010 |
Andreas Huber <andih@google.com> |
am 7bd9a6a5: am eaeae4ab: A debugging DataSource artifically limiting the available bandwidth.
|
| 7efc8163800be72a7cc3e072c4de1d099077072b |
02-Jun-2010 |
Mathias Agopian <mathias@google.com> |
am 5220af87: am 770492cb: more clean-up in preparation of bigger changes
|
| c282e3eee921453fc9188705b4879d6289b71f9c |
01-Jun-2010 |
Andreas Huber <andih@google.com> |
A debugging DataSource artifically limiting the available bandwidth.
Change-Id: I4ca75337a52599d211ea066fd94e649748df052d
edia/libstagefright/Android.mk
edia/libstagefright/ThrottledSource.cpp
edia/libstagefright/include/ThrottledSource.h
|
| ba0fab325cd8379378a2c8ad14dd1c44bf2760f3 |
28-May-2010 |
Mathias Agopian <mathias@google.com> |
more clean-up in preparation of bigger changes
the most important change here is the renaming of
ISurfaceFlingerClient to ISurfaceComposerClient
Change-Id: I94e18b0417f50e06f21377446639c61f65f959b3
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 77995c32095cc192823de3eedf0d5a404fbca72e |
28-May-2010 |
James Dong <jdong@google.com> |
am 46e70361: am 46441198: Merge "Avoid copying for input recording frames in CameraSource" into kraken
|
| aed27b016043c9f2cb33cf851f20698130be110c |
28-May-2010 |
James Dong <jdong@google.com> |
Merge "Avoid copying for input recording frames in CameraSource" into kraken
|
| 7278cf32f1aa6a322f6dff1f8b7dacf7b6dddba6 |
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
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
|
| 0adf054745a7c05d74e16fab5f94a21a55d58627 |
28-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 3ed1da35: am 198975bb: Merge "Add video frame parameter." into kraken
|
| 49dedddca375f0b3a7070f7fae33966c230d4d8e |
28-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add video frame parameter." into kraken
|
| 0b0279e0d20a8beb69aa2af5f4cb278841710dfb |
28-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add video frame parameter.
The image format of preview frames and video frames may be different.
We need another parameter for video frame format.
bug:2720893
Change-Id: I966a31b0ce8cab25cdde65db65a18c8cbe9c7bd6
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 22e4368f432e9addfeae2ff299200b02106abe4b |
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
|
| 1b52bd2874aef6c9cbc141f1cff5205830515f7d |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| b1cc947fcb88364ff02a08b1451aa44df560c815 |
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
|
| 8a74f1bc3f64943cafdc7c6c7e1900b4a3e9e4b1 |
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
|
| af4583e1478511b47b8464696cd9217b92343e23 |
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.
|
| a7414ea2c7dfea7d2428ce543bd6331d6c56aead |
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
edia/libstagefright/CameraSource.cpp
|
| a47e14e20e2c97955ac116b4f229316fe9c88e53 |
27-May-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO."
|
| 3415c34b3a3224d042761d646ef0bdd7e8af0a1b |
27-May-2010 |
James Dong <jdong@google.com> |
am 9407fb80: am 1090a29d: Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
|
| 5b39604a55f1624ced347da7b790c4206d2d999f |
27-May-2010 |
James Dong <jdong@google.com> |
Merge "Avoid repeatedly allocating and freeing memory in CameraSource" into kraken
|
| cbe48a0678729eb863b259b4744e6ad12faf0475 |
20-May-2010 |
James Dong <jdong@google.com> |
Avoid repeatedly allocating and freeing memory in CameraSource
Change-Id: Ia3760820da0559e4e908dedae1f1df05f9a6a242
nclude/media/stagefright/CameraSource.h
edia/libstagefright/CameraSource.cpp
|
| bd703cbcb006e4da7a4536e47faaf17d49de578a |
26-May-2010 |
Andreas Huber <andih@google.com> |
am 1c12511f: am a08d8523: Merge "Convert a number of assertions into runtime errors (OggExtractor)" into kraken
|
| 69ec58ee5216ad4eabc7775762c2468c42b632fb |
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
edia/libstagefright/AudioPlayer.cpp
|
| 5a4001ddb2536d65d966970fc0579bf6bd11b5a0 |
26-May-2010 |
Andreas Huber <andih@google.com> |
Convert a number of assertions into runtime errors (OggExtractor)
Change-Id: I8fcaec927d7b72e9d61cb7283e54523711980268
edia/libstagefright/OggExtractor.cpp
|
| c8ed34f573a1a0391e3a235fa009a2bc7dc8b526 |
26-May-2010 |
Andreas Huber <andih@google.com> |
am e08d5ccf: am a581a776: Merge "Squashed commit of the following:" into kraken
|
| d3d7fd46a5ba6364a9f65738edfa7aa6b11d9658 |
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
|
| ae7966d7dc41206ae67a30aeea42bb23390b8e75 |
26-May-2010 |
Mathias Agopian <mathias@google.com> |
am eaac2761: am 64f7549b: Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken
|
| 1a9b892400dae0f63b4fd502770154a06e23b01b |
26-May-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:" into kraken
|
| 2dadcda205d995f7094b7569b076921872505143 |
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
edia/libmedia/AudioSystem.cpp
|
| 2941c27e381ebda1cecff9fca2a67bba999e46e4 |
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
|
| cfe92f710d17f71b1cef70bd7f6ec5879309b24f |
26-May-2010 |
Mathias Agopian <mathias@google.com> |
Merge "fix [2712278] The preview buffer left some black borders in left and bottom edges" into kraken
|
| 3f6b0cdd8cd57e2cca56a5dd4cfa726b9185d2e8 |
26-May-2010 |
Mathias Agopian <mathias@google.com> |
fix [2712278] The preview buffer left some black borders in left and bottom edges
we were incorrectly flagging push_buffer surfaces as invalid
Change-Id: I4dfd4ffbbe8a71f7e23e835db8d71966416c29bb
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 66429841d61504ba173a0b4296ee567a89b64411 |
25-May-2010 |
Andreas Huber <andih@google.com> |
am 779b9b82: am f7617d36: Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
|
| 6c3a699ef1c885e39d9b697fae7304455e8d9f83 |
25-May-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for thumbnail extraction in the Matroska extractor." into kraken
|
| 5279d1d8c19e5fdbb177805db0da8e8aadac3079 |
25-May-2010 |
Andreas Huber <andih@google.com> |
Support for thumbnail extraction in the Matroska extractor.
Change-Id: I56f13fc4868baffe0bb8c2484d2753c766a73960
related-to-bug: 2483739
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/MatroskaExtractor.h
|
| 4691e130b768981f41e01b78241cc0a592716cc9 |
25-May-2010 |
Eric Laurent <elaurent@google.com> |
am e205dd34: am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
|
| 8b5a7566b0ad7be6b165eae8d6af3a0bbded77e0 |
25-May-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken
|
| 17217ab46e12fbdaad9e1d7460c48937f76fa0e2 |
25-May-2010 |
Eric Laurent <elaurent@google.com> |
Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f
Change-Id: Ibf6aebfec60cd7f807c3e49f0dbb5ab8e86bcdc1
edia/libeffects/EffectEqualizer.cpp
edia/libeffects/EffectsFactory.c
|
| 1d78a86dc5e13f8e705ac0cc9842a4ce82c0d333 |
25-May-2010 |
Andreas Huber <andih@google.com> |
am 1a777cd4: am c6c62e12: Support for ogg(vorbis) metadata in stagefright including album art.
|
| 4595be952e3b1d6776a023e3f447c057797f1505 |
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
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 6fea5650d157dd3ee65219926b131a97335c9731 |
25-May-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: adjust ptptest app for changes in libusbhost API."
|
| fb570477389cf6157358df21945f22bc16d169f4 |
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>
edia/mtp/ptptest.cpp
|
| d71a1be83ff31cdb6599c351f9832cefc8d447ba |
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
nclude/media/IEffect.h
nclude/media/IEffectClient.h
edia/libmedia/Android.mk
edia/libmedia/IEffect.cpp
edia/libmedia/IEffectClient.cpp
|
| 66da161d93d56ffe474cd472c5113aaa4dd09490 |
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
|
| 9bca89d50d0c51d8e3f3e74d610b7d9a2dc98ed3 |
25-May-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2667796: [Audio Effect Framework] Effect factory and libraries." into kraken
|
| e66c592eff6d5b9583f115ec143de2e07c45091b |
25-May-2010 |
Mathias Agopian <mathias@google.com> |
am 61a58708: am 2e948ca1: Merge "added the notion of fixed-size buffers" into kraken
|
| 79f224932824adf26b17ab04e9d55255efb3a179 |
25-May-2010 |
Mathias Agopian <mathias@google.com> |
am 27d2f0ca: am acdc44bb: Merge "fix a bug when reallocating a window\'s buffers is needed" into kraken
|
| fb6ae6666644c9a37a5d34dd03eb637333cf946b |
22-May-2010 |
Mathias Agopian <mathias@google.com> |
added the notion of fixed-size buffers
the new native_window_set_buffers_geometry allows
to specify a size and format for all buffers to be
dequeued. the buffer will be scalled to the window's
size.
Change-Id: I2c378b85c88d29cdd827a5f319d5c704d79ba381
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 4d1265cd007b9754d0645bc4fb95701140a45648 |
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
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/on2/Android.mk
edia/libstagefright/codecs/on2/dec/Android.mk
edia/libstagefright/codecs/on2/dec/VPXDecoder.cpp
edia/libstagefright/include/VPXDecoder.h
|
| 68f929b84acf0c985b9ae3157322c022798e5eb2 |
21-May-2010 |
Mathias Agopian <mathias@google.com> |
fix a bug when reallocating a window's buffers is needed
we need to mark the buffers that need to be reallocated,
NOT the buffer's indices.
Change-Id: I809e2e1b03b56c4d2ab983c25523dae99aa1da74
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 469e90988b37e13033414f68e2bae740f7c8ba1f |
24-May-2010 |
James Dong <jdong@google.com> |
am f09cab8c: am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken
|
| 1cb8fa1e670786bf83ccde7571c5ac1fc087d4f1 |
24-May-2010 |
James Dong <jdong@google.com> |
Merge "Properly handle start code in H264/AVC encoder output" into kraken
|
| 8c32d377ad033fcb3b087d36e3b27a78d62233f9 |
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...
|
| 3d8055ac96170de7a8c49b9ffbe83ed447ccddce |
24-May-2010 |
Andreas Huber <andih@google.com> |
Interestingly, a call to fseek with a NULL file handle now blocks forever...
Change-Id: Ic80c579abcf2bdb73f7fd1da713649b7c7f25f56
edia/libstagefright/FileSource.cpp
|
| 815879a79c2c2220d080bcd3ef19176c2430cc99 |
24-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
am bcf50325: am bd329ddb: Improve GPS EXIF parameters comments.
|
| 6b19faca7040ba4ef67637801926ead2559c22e9 |
21-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Improve GPS EXIF parameters comments.
Change-Id: I33f7487821b283fe746baa09a71a703ae763d66d
nclude/camera/CameraParameters.h
|
| aabb6331775704dfde762da16a2f02f5d248547a |
21-May-2010 |
Mathias Agopian <mathias@google.com> |
am 6099e141: am 25f0bdae: added native_window_set_buffer_count()
|
| 082a4d89ae4bd156052346bbac7031ed7d741c9d |
21-May-2010 |
Mathias Agopian <mathias@google.com> |
added native_window_set_buffer_count()
this method can be used to change the number of buffers
associated to a native window. the default is two.
Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 33d2c038d8a511c06481737241dce0cfd3ff41c4 |
21-May-2010 |
Mathias Agopian <mathias@google.com> |
am 9840fe25: am 4f5f2786: Merge "fix the threading issue for setBuffercount()" into kraken
|
| 1f5be9e90868b92b99868fef232fe973f9d58713 |
21-May-2010 |
Mathias Agopian <mathias@google.com> |
Merge "fix the threading issue for setBuffercount()" into kraken
|
| f50948ce4ecb579ad1bf3d9c618884ec4c7b60ed |
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
|
| 26fe83eb91aada45a75054753d4782e6bfc2fd04 |
21-May-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
|
| 135ad07e33d30e5202deb21061a0e3ecf0ffad35 |
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
nclude/media/AudioCommon.h
nclude/media/AudioSystem.h
nclude/media/EffectApi.h
nclude/media/EffectEqualizerApi.h
nclude/media/EffectFactoryApi.h
nclude/media/EffectReverbApi.h
edia/libeffects/Android.mk
edia/libeffects/AudioBiquadFilter.cpp
edia/libeffects/AudioBiquadFilter.h
edia/libeffects/AudioCoefInterpolator.cpp
edia/libeffects/AudioCoefInterpolator.h
edia/libeffects/AudioCommon.h
edia/libeffects/AudioEqualizer.cpp
edia/libeffects/AudioEqualizer.h
edia/libeffects/AudioFormatAdapter.h
edia/libeffects/AudioHighShelfFilterCoef.inl
edia/libeffects/AudioLowShelfFilterCoef.inl
edia/libeffects/AudioPeakingFilter.cpp
edia/libeffects/AudioPeakingFilter.h
edia/libeffects/AudioPeakingFilterCoef.inl
edia/libeffects/AudioShelvingFilter.cpp
edia/libeffects/AudioShelvingFilter.h
edia/libeffects/EffectEqualizer.cpp
edia/libeffects/EffectReverb.c
edia/libeffects/EffectReverb.h
edia/libeffects/EffectsFactory.c
edia/libeffects/EffectsFactory.h
edia/libeffects/EffectsMath.c
edia/libeffects/EffectsMath.h
|
| e136c3bb38e88315bf8797a464ebf2c788296b22 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| dd9a3a7cb9bd5f68bc6b1fe709e10b6bd1f5b433 |
19-May-2010 |
Mathias Agopian <mathias@google.com> |
fix the threading issue for setBuffercount()
this change introduces R/W locks in the right places.
on the server-side, it guarantees that setBufferCount()
is synchronized with "retire" and "resize".
on the client-side, it guarantees that setBufferCount()
is synchronized with "dequeue", "lockbuffer" and "queue"
nclude/private/surfaceflinger/SharedBufferStack.h
|
| be31432174b10bd09bdccff601fde4fe0fc009bd |
21-May-2010 |
Andreas Huber <andih@google.com> |
am 5e03fd5d: am 4979601f: Make the -o option actually terminate.
|
| 64105f956f15969dbe1ec7319f6caa2a984e588b |
22-Apr-2010 |
Andreas Huber <andih@google.com> |
Make the -o option actually terminate.
Change-Id: I91b70ee5c3e1fc9b8bb645e219af296867692e65
mds/stagefright/stagefright.cpp
|
| 6eb38be7bd51b1a480d1169f9b056cd78ebb0f39 |
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
|
| c02138636202d606ca4cfec2297e057e9158db7d |
21-May-2010 |
Andreas Huber <andih@google.com> |
Merge "Update software AVC decoder to no longer require the kWantsNALFragments hack." into kraken
|
| 093437c388e5dff6903a3d43f2ca9f8a1ba4744a |
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
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/matroska/Android.mk
edia/libstagefright/matroska/MatroskaExtractor.cpp
edia/libstagefright/matroska/MatroskaExtractor.h
edia/libstagefright/matroska/mkvparser.cpp
edia/libstagefright/matroska/mkvparser.hpp
|
| 528b31476c16aefc4f886bf17b6d8bb4bd21292e |
13-May-2010 |
Andreas Huber <andih@google.com> |
Update software AVC decoder to no longer require the kWantsNALFragments hack.
Change-Id: I7f1882530a891a57d0cd76cbbd7084ee31c59bd1
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
|
| 471686a7fb8fe890ebff4069360a994630587876 |
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
|
| af991a9b24865af8b17c6282047638cf00466ea2 |
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
|
| 7405500bb3b5f8e8e739e344bc9d036c2736fcdf |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/OMXCodec.cpp
|
| d997b26ad192788b4817b8b8eefb78ad7f57e17b |
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
|
| cf14f10b7bf39a84205333b87d5c5b7db9598de3 |
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.
|
| 8fe7fa8f90e52cab210ec1de861f2d8ac9435968 |
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.
|
| 139a5d5bd33c9fc7708d0a79f11ee928f7796e6b |
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
mds/stagefright/stagefright.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
|
| 53c2d333d3fac046992407c6135f2714a9aa569c |
19-May-2010 |
James Dong <jdong@google.com> |
am 84b6cd92: am 4414b9ad: Merge "Initial software encoder checkins" into kraken
|
| e13401bf532c7e4bf9ab82c7e9b13642838a927d |
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>
edia/mtp/Android.mk
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
edia/mtp/MtpObjectInfo.cpp
edia/mtp/MtpObjectInfo.h
edia/mtp/MtpPacket.cpp
edia/mtp/MtpServer.cpp
edia/mtp/MtpTypes.h
edia/mtp/mtp.h
edia/mtp/ptptest.cpp
|
| 335dd2be955607f2632eabc25045857f2cc8b674 |
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)>
edia/mtp/Android.mk
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.cpp
edia/mtp/MtpDatabase.h
edia/mtp/MtpDebug.h
edia/mtp/MtpDeviceInfo.cpp
edia/mtp/MtpDeviceInfo.h
edia/mtp/MtpMediaScanner.cpp
edia/mtp/MtpPacket.cpp
edia/mtp/MtpPacket.h
edia/mtp/MtpStorageInfo.cpp
edia/mtp/MtpStorageInfo.h
edia/mtp/MtpTypes.h
edia/mtp/MtpUtils.cpp
edia/mtp/MtpUtils.h
edia/mtp/mtp.h
edia/mtp/ptptest.cpp
|
| 956c553ab0ce72f8074ad0fda2ffd66a0305700c |
15-May-2010 |
James Dong <jdong@google.com> |
Initial software encoder checkins
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/Android.mk
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacenc/AACEncoder.cpp
edia/libstagefright/codecs/aacenc/Android.mk
edia/libstagefright/codecs/aacenc/SampleCode/AAC_E_SAMPLES.c
edia/libstagefright/codecs/aacenc/SampleCode/Android.mk
edia/libstagefright/codecs/aacenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/aacenc/SampleCode/ms.mk
edia/libstagefright/codecs/aacenc/Tools/doit.mk
edia/libstagefright/codecs/aacenc/Tools/eclair.mk
edia/libstagefright/codecs/aacenc/basic_op/basic_op.h
edia/libstagefright/codecs/aacenc/basic_op/basicop2.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.c
edia/libstagefright/codecs/aacenc/basic_op/oper_32b.h
edia/libstagefright/codecs/aacenc/basic_op/typedef.h
edia/libstagefright/codecs/aacenc/basic_op/typedefs.h
edia/libstagefright/codecs/aacenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/aacenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/aacenc/build/eclair/makefile
edia/libstagefright/codecs/aacenc/build/ms.mk
edia/libstagefright/codecs/aacenc/doc/voAACEncoderSDK.pdf
edia/libstagefright/codecs/aacenc/inc/aac_rom.h
edia/libstagefright/codecs/aacenc/inc/aacenc_core.h
edia/libstagefright/codecs/aacenc/inc/adj_thr.h
edia/libstagefright/codecs/aacenc/inc/adj_thr_data.h
edia/libstagefright/codecs/aacenc/inc/band_nrg.h
edia/libstagefright/codecs/aacenc/inc/bit_cnt.h
edia/libstagefright/codecs/aacenc/inc/bitbuffer.h
edia/libstagefright/codecs/aacenc/inc/bitenc.h
edia/libstagefright/codecs/aacenc/inc/block_switch.h
edia/libstagefright/codecs/aacenc/inc/channel_map.h
edia/libstagefright/codecs/aacenc/inc/config.h
edia/libstagefright/codecs/aacenc/inc/dyn_bits.h
edia/libstagefright/codecs/aacenc/inc/grp_data.h
edia/libstagefright/codecs/aacenc/inc/interface.h
edia/libstagefright/codecs/aacenc/inc/line_pe.h
edia/libstagefright/codecs/aacenc/inc/memalign.h
edia/libstagefright/codecs/aacenc/inc/ms_stereo.h
edia/libstagefright/codecs/aacenc/inc/pre_echo_control.h
edia/libstagefright/codecs/aacenc/inc/psy_configuration.h
edia/libstagefright/codecs/aacenc/inc/psy_const.h
edia/libstagefright/codecs/aacenc/inc/psy_data.h
edia/libstagefright/codecs/aacenc/inc/psy_main.h
edia/libstagefright/codecs/aacenc/inc/qc_data.h
edia/libstagefright/codecs/aacenc/inc/qc_main.h
edia/libstagefright/codecs/aacenc/inc/quantize.h
edia/libstagefright/codecs/aacenc/inc/sf_estim.h
edia/libstagefright/codecs/aacenc/inc/spreading.h
edia/libstagefright/codecs/aacenc/inc/stat_bits.h
edia/libstagefright/codecs/aacenc/inc/tns.h
edia/libstagefright/codecs/aacenc/inc/tns_func.h
edia/libstagefright/codecs/aacenc/inc/tns_param.h
edia/libstagefright/codecs/aacenc/inc/transform.h
edia/libstagefright/codecs/aacenc/patent_disclaimer.txt
edia/libstagefright/codecs/aacenc/src/aac_rom.c
edia/libstagefright/codecs/aacenc/src/aacenc.c
edia/libstagefright/codecs/aacenc/src/aacenc_core.c
edia/libstagefright/codecs/aacenc/src/adj_thr.c
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/AutoCorrelation_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/CalcWindowEnergy_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/PrePostMDCT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/R4R8First_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/Radix4FFT_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV5E/band_nrg_v5.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/PrePostMDCT_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/R4R8First_v7.s
edia/libstagefright/codecs/aacenc/src/asm/ARMV7/Radix4FFT_v7.s
edia/libstagefright/codecs/aacenc/src/band_nrg.c
edia/libstagefright/codecs/aacenc/src/bit_cnt.c
edia/libstagefright/codecs/aacenc/src/bitbuffer.c
edia/libstagefright/codecs/aacenc/src/bitenc.c
edia/libstagefright/codecs/aacenc/src/block_switch.c
edia/libstagefright/codecs/aacenc/src/channel_map.c
edia/libstagefright/codecs/aacenc/src/dyn_bits.c
edia/libstagefright/codecs/aacenc/src/grp_data.c
edia/libstagefright/codecs/aacenc/src/interface.c
edia/libstagefright/codecs/aacenc/src/line_pe.c
edia/libstagefright/codecs/aacenc/src/memalign.c
edia/libstagefright/codecs/aacenc/src/ms_stereo.c
edia/libstagefright/codecs/aacenc/src/pre_echo_control.c
edia/libstagefright/codecs/aacenc/src/psy_configuration.c
edia/libstagefright/codecs/aacenc/src/psy_main.c
edia/libstagefright/codecs/aacenc/src/qc_main.c
edia/libstagefright/codecs/aacenc/src/quantize.c
edia/libstagefright/codecs/aacenc/src/sf_estim.c
edia/libstagefright/codecs/aacenc/src/spreading.c
edia/libstagefright/codecs/aacenc/src/stat_bits.c
edia/libstagefright/codecs/aacenc/src/tns.c
edia/libstagefright/codecs/aacenc/src/transform.c
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
edia/libstagefright/codecs/amrwbenc/Android.mk
edia/libstagefright/codecs/amrwbenc/SampleCode/AMRWB_E_SAMPLE.c
edia/libstagefright/codecs/amrwbenc/SampleCode/Android.mk
edia/libstagefright/codecs/amrwbenc/SampleCode/eclair/Makefile
edia/libstagefright/codecs/amrwbenc/SampleCode/ms.mk
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV5E/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ARMV7/Makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/makefile
edia/libstagefright/codecs/amrwbenc/build/eclair/ms.mk
edia/libstagefright/codecs/amrwbenc/doc/voAMRWBEncoderSDK.pdf
edia/libstagefright/codecs/amrwbenc/inc/acelp.h
edia/libstagefright/codecs/amrwbenc/inc/basic_op.h
edia/libstagefright/codecs/amrwbenc/inc/bits.h
edia/libstagefright/codecs/amrwbenc/inc/cnst.h
edia/libstagefright/codecs/amrwbenc/inc/cod_main.h
edia/libstagefright/codecs/amrwbenc/inc/dtx.h
edia/libstagefright/codecs/amrwbenc/inc/grid100.tab
edia/libstagefright/codecs/amrwbenc/inc/ham_wind.tab
edia/libstagefright/codecs/amrwbenc/inc/homing.tab
edia/libstagefright/codecs/amrwbenc/inc/isp_isf.tab
edia/libstagefright/codecs/amrwbenc/inc/lag_wind.tab
edia/libstagefright/codecs/amrwbenc/inc/log2.h
edia/libstagefright/codecs/amrwbenc/inc/log2_tab.h
edia/libstagefright/codecs/amrwbenc/inc/main.h
edia/libstagefright/codecs/amrwbenc/inc/math_op.h
edia/libstagefright/codecs/amrwbenc/inc/mem_align.h
edia/libstagefright/codecs/amrwbenc/inc/mime_io.tab
edia/libstagefright/codecs/amrwbenc/inc/oper_32b.h
edia/libstagefright/codecs/amrwbenc/inc/p_med_o.h
edia/libstagefright/codecs/amrwbenc/inc/p_med_ol.tab
edia/libstagefright/codecs/amrwbenc/inc/q_gain2.tab
edia/libstagefright/codecs/amrwbenc/inc/q_pulse.h
edia/libstagefright/codecs/amrwbenc/inc/qisf_ns.tab
edia/libstagefright/codecs/amrwbenc/inc/qpisf_2s.tab
edia/libstagefright/codecs/amrwbenc/inc/stream.h
edia/libstagefright/codecs/amrwbenc/inc/typedef.h
edia/libstagefright/codecs/amrwbenc/inc/typedefs.h
edia/libstagefright/codecs/amrwbenc/inc/wb_vad.h
edia/libstagefright/codecs/amrwbenc/inc/wb_vad_c.h
edia/libstagefright/codecs/amrwbenc/patent_disclaimer.txt
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Deemph_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Dot_p_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Filt_6k_7k_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Norm_Corr_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/Syn_filt_32_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/convolve_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/cor_h_vec_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/residu_asm_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/scale_sig_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/syn_filt_opt.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Deemph_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Dot_p_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Filt_6k_7k_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Norm_Corr_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/Syn_filt_32_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/convolve_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/cor_h_vec_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/pred_lt4_1_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/residu_asm_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/scale_sig_neon.s
edia/libstagefright/codecs/amrwbenc/src/asm/ARMV7/syn_filt_neon.s
edia/libstagefright/codecs/amrwbenc/src/autocorr.c
edia/libstagefright/codecs/amrwbenc/src/az_isp.c
edia/libstagefright/codecs/amrwbenc/src/bits.c
edia/libstagefright/codecs/amrwbenc/src/c2t64fx.c
edia/libstagefright/codecs/amrwbenc/src/c4t64fx.c
edia/libstagefright/codecs/amrwbenc/src/cmnMemory.c
edia/libstagefright/codecs/amrwbenc/src/convolve.c
edia/libstagefright/codecs/amrwbenc/src/cor_h_x.c
edia/libstagefright/codecs/amrwbenc/src/decim54.c
edia/libstagefright/codecs/amrwbenc/src/deemph.c
edia/libstagefright/codecs/amrwbenc/src/dtx.c
edia/libstagefright/codecs/amrwbenc/src/g_pitch.c
edia/libstagefright/codecs/amrwbenc/src/gpclip.c
edia/libstagefright/codecs/amrwbenc/src/homing.c
edia/libstagefright/codecs/amrwbenc/src/hp400.c
edia/libstagefright/codecs/amrwbenc/src/hp50.c
edia/libstagefright/codecs/amrwbenc/src/hp6k.c
edia/libstagefright/codecs/amrwbenc/src/hp_wsp.c
edia/libstagefright/codecs/amrwbenc/src/int_lpc.c
edia/libstagefright/codecs/amrwbenc/src/isp_az.c
edia/libstagefright/codecs/amrwbenc/src/isp_isf.c
edia/libstagefright/codecs/amrwbenc/src/lag_wind.c
edia/libstagefright/codecs/amrwbenc/src/levinson.c
edia/libstagefright/codecs/amrwbenc/src/log2.c
edia/libstagefright/codecs/amrwbenc/src/lp_dec2.c
edia/libstagefright/codecs/amrwbenc/src/math_op.c
edia/libstagefright/codecs/amrwbenc/src/mem_align.c
edia/libstagefright/codecs/amrwbenc/src/oper_32b.c
edia/libstagefright/codecs/amrwbenc/src/p_med_ol.c
edia/libstagefright/codecs/amrwbenc/src/pit_shrp.c
edia/libstagefright/codecs/amrwbenc/src/pitch_f4.c
edia/libstagefright/codecs/amrwbenc/src/pred_lt4.c
edia/libstagefright/codecs/amrwbenc/src/preemph.c
edia/libstagefright/codecs/amrwbenc/src/q_gain2.c
edia/libstagefright/codecs/amrwbenc/src/q_pulse.c
edia/libstagefright/codecs/amrwbenc/src/qisf_ns.c
edia/libstagefright/codecs/amrwbenc/src/qpisf_2s.c
edia/libstagefright/codecs/amrwbenc/src/random.c
edia/libstagefright/codecs/amrwbenc/src/residu.c
edia/libstagefright/codecs/amrwbenc/src/scale.c
edia/libstagefright/codecs/amrwbenc/src/stream.c
edia/libstagefright/codecs/amrwbenc/src/syn_filt.c
edia/libstagefright/codecs/amrwbenc/src/updt_tar.c
edia/libstagefright/codecs/amrwbenc/src/util.c
edia/libstagefright/codecs/amrwbenc/src/voAMRWBEnc.c
edia/libstagefright/codecs/amrwbenc/src/voicefac.c
edia/libstagefright/codecs/amrwbenc/src/wb_vad.c
edia/libstagefright/codecs/amrwbenc/src/weight_a.c
edia/libstagefright/codecs/common/Android.mk
edia/libstagefright/codecs/common/Config.mk
edia/libstagefright/codecs/common/cmnMemory.c
edia/libstagefright/codecs/common/include/cmnMemory.h
edia/libstagefright/codecs/common/include/voAAC.h
edia/libstagefright/codecs/common/include/voAMRWB.h
edia/libstagefright/codecs/common/include/voAudio.h
edia/libstagefright/codecs/common/include/voIndex.h
edia/libstagefright/codecs/common/include/voMem.h
edia/libstagefright/codecs/common/include/voType.h
edia/libstagefright/include/AACEncoder.h
edia/libstagefright/include/AMRNBEncoder.h
edia/libstagefright/include/AMRWBEncoder.h
|
| fceef46513db3507b413f604cea89e3c7f352663 |
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>
edia/mtp/Android.mk
edia/mtp/MtpDatabase.cpp
edia/mtp/MtpDatabase.h
edia/mtp/MtpMediaScanner.cpp
edia/mtp/MtpMediaScanner.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/mtp.h
edia/mtp/scantest.cpp
|
| 15727818edf0c9bd88303656ccb43fccd2515007 |
18-May-2010 |
Mathias Agopian <mathias@google.com> |
am d4a5ea29: am 2b2529f2: Merge "fix some bugs in SharedBufferStack::resize" into kraken
|
| e1f61055b4abb96a86d1ff24b5a7777dfe40fe5f |
18-May-2010 |
Mathias Agopian <mathias@google.com> |
fix some bugs in SharedBufferStack::resize
added buffers should now be labeled properly.
Change-Id: I28aa753fbe89ab89134e7753575319478934c7fa
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 595f9db22d8161b1dd5cd178d8ae829f51308303 |
17-May-2010 |
Eric Laurent <elaurent@google.com> |
am f62b6ff9: am eb8f850d: Fix issue 2553359: Pandora does not work well with Passion deskdock / Cardock.
|
| 21cd2bd40860be223e5b205974fa299c11cc80fa |
17-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 8dc80423: am ae7ca4c3: Fix build error.
|
| 49e21bb715d356b23ea8740ee22f8da5fc450906 |
17-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
am a3b5ff07: am e339c5ed: Add camera focus distances API.
|
| 64a44220725dd05367beb15fd530b6c900f24e1a |
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>
edia/mtp/f_mtp.h
edia/mtp/mtptest.cpp
|
| d1b449aad6c087a69f5ec66b7facb2845b73f1cb |
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
nclude/media/AudioTrack.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| ae77ffa16bda593fb3751e41d45327d867f3c8e1 |
15-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Fix build error.
Original name INFINITY conflicts with the macro in math.h.
Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 09a2ab9dfe5c8fe74703b9894d930b1b1dbf0c11 |
13-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add camera focus distances API.
Applications can use this API to estimate the distance
between the subject and the camera.
bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| c151787b4fc0f0e362d7730e1919fe04e400687d |
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.
|
| ea10bc6158caa9f595c85a3dc3517d88ee989001 |
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.
|
| c0b42f27a36c96b0ce16ade57c26ff1decb4bb72 |
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.
|
| 1edbcb2bb9988cc7cb54a865aaea4613bdd53a9d |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| e0ddfe33b9480acf3d8c3941f96bdc262d0abc47 |
14-May-2010 |
James Dong <jdong@google.com> |
am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken
|
| a326071ff872d5a197efbf27b9ab6653a90f0734 |
14-May-2010 |
James Dong <jdong@google.com> |
Merge "Detect and handle premature termination of a recording session" into kraken
|
| f44cdd80b091661cdce195f29982ab9639bb821f |
14-May-2010 |
Chih-Chung Chang <chihchung@google.com> |
am 9c192e44: am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
|
| 1999e8d16d15b60b983595d4bf44ccf67cd86732 |
14-May-2010 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken
|
| f0ce2fb0c7bf3a414279e5aba61105f3d9025c0e |
14-May-2010 |
James Dong <jdong@google.com> |
Detect and handle premature termination of a recording session
Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
nclude/media/mediarecorder.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| 09943dd3797bb981a74ce0c233843868144b257a |
14-May-2010 |
James Dong <jdong@google.com> |
am 612058d1: am 9db798d0: Audio/video initial recording time synchronization
|
| eae0edc9003849843889531283d9e4e086ec66ed |
14-May-2010 |
James Dong <jdong@google.com> |
am 8b3611ee: am 1824486e: Handle recording file size and/or duration limit
|
| 3c0131f02b6f008321608044c53bccce2ac5f6dd |
13-May-2010 |
James Dong <jdong@google.com> |
Audio/video initial recording time synchronization
Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| d599cd4573b5a2d5914c5040e0565ef866749b77 |
11-May-2010 |
James Dong <jdong@google.com> |
Handle recording file size and/or duration limit
Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaWriter.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| f00668f97ad5098c38d46637b9c24f3baea38ac3 |
14-May-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 63c93077: am 21a534d9: am 1d628c5d: merge from open-source master
|
| 2e90514be4c98b5fa6e1df5f2049a5e005a4263d |
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.
|
| 4ac3585263ad59def5cf14756347cecab43e6e67 |
14-May-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from open-source master
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
|
| edba6383f8533608c17e76b4c253e21190602b2c |
14-May-2010 |
Eric Laurent <elaurent@google.com> |
am 10fde074: am 9f0810e8: Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken
|
| 49475772e0d3c38ab1246deac3d5e5bc6c2bb4e6 |
14-May-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge "Accept media files by file extension in case insensitive manner."
|
| 7850ef999740f214a1990a9c090d3f3865d435aa |
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>
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.cpp
edia/mtp/MtpDatabase.h
edia/mtp/MtpDebug.cpp
edia/mtp/MtpDebug.h
edia/mtp/MtpPacket.cpp
edia/mtp/MtpPacket.h
edia/mtp/MtpRequestPacket.cpp
edia/mtp/MtpRequestPacket.h
edia/mtp/MtpResponsePacket.cpp
edia/mtp/MtpResponsePacket.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/MtpStringBuffer.cpp
edia/mtp/MtpStringBuffer.h
edia/mtp/MtpUtils.cpp
edia/mtp/MtpUtils.h
edia/mtp/SqliteDatabase.cpp
edia/mtp/SqliteDatabase.h
edia/mtp/SqliteStatement.cpp
edia/mtp/SqliteStatement.h
edia/mtp/mtptest.cpp
edia/mtp/ptptest.cpp
|
| 45df6a2a25ff36606a5301155d8d97e9bf80d00b |
14-May-2010 |
Eric Laurent <elaurent@google.com> |
AudioFlinger: rename variables to clarify reference to track channel count or channel mask
Some variables and structure members should be renamed to reflect the fact that they contain the
number of channels in a track (channel count) or the actual channels used by a track (channel mask).
Especially member "channels" of track control block (struct audio_track_cblk_t) is actually the
number of channels (channels count).
Change-Id: I220c8dede9fc00c8a5693389e790073b6ed307b8
nclude/private/media/AudioTrackShared.h
|
| d06618ee31c11ac7ac6698f95444041a4785a5ab |
13-May-2010 |
Chih-Chung Chang <chihchung@google.com> |
Fix deadlock if the last reference of ICameraClient is removed in
ICamera::connect()
Change-Id: I34ab3e4f07435c62168175e9bb159022c8fb99f4
amera/Camera.cpp
|
| 3c6d0f4c956494241c0c243b079f42049d832d7d |
14-May-2010 |
James Dong <jdong@google.com> |
am 79dfb675: am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken
|
| 67589f441aca391c27244cd231c2d770a9fe203d |
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>
edia/mtp/Android.mk
|
| 16864bae0f51c32c456da2c43adf7a057c0c4882 |
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>
edia/mtp/Android.mk
edia/mtp/MtpClient.cpp
edia/mtp/MtpClient.h
edia/mtp/MtpDataPacket.cpp
edia/mtp/MtpDataPacket.h
edia/mtp/MtpDatabase.cpp
edia/mtp/MtpDatabase.h
edia/mtp/MtpDebug.cpp
edia/mtp/MtpDebug.h
edia/mtp/MtpPacket.cpp
edia/mtp/MtpPacket.h
edia/mtp/MtpRequestPacket.cpp
edia/mtp/MtpRequestPacket.h
edia/mtp/MtpResponsePacket.cpp
edia/mtp/MtpResponsePacket.h
edia/mtp/MtpServer.cpp
edia/mtp/MtpServer.h
edia/mtp/MtpStorage.cpp
edia/mtp/MtpStorage.h
edia/mtp/MtpStringBuffer.cpp
edia/mtp/MtpStringBuffer.h
edia/mtp/MtpUtils.cpp
edia/mtp/MtpUtils.h
edia/mtp/SqliteDatabase.cpp
edia/mtp/SqliteDatabase.h
edia/mtp/SqliteStatement.cpp
edia/mtp/SqliteStatement.h
edia/mtp/f_mtp.h
edia/mtp/mtp.h
edia/mtp/mtptest.cpp
edia/mtp/ptptest.cpp
|
| 65ae665befd929efd1a7d1c9addac41c699f04b2 |
13-May-2010 |
James Dong <jdong@google.com> |
Remove dummy surface in CameraSource
bug - 2680919
Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
nclude/media/stagefright/CameraSource.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/CameraSource.cpp
|
| 328523627293790cbf485fa6095b38a5fdb2118e |
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.
|
| 7838252956e00518afce33f9591252c5c8f9dbac |
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.
|
| a945bfd91aa291fba4d9201ffcb38fce40eab7fe |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| 1b8b4c945eb3e9827e94f551e05ec1329d2234a9 |
13-May-2010 |
Mathias Agopian <mathias@google.com> |
am fb6bd833: am 7406eafe: should fix the build
|
| f8fb8b856427e9b1c406d516a114a9f37cfea4f2 |
13-May-2010 |
Mathias Agopian <mathias@google.com> |
should fix the build
Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
edia/libstagefright/CameraSource.cpp
|
| 81274bf56f309ddc0ee3e2215166559be28136e1 |
13-May-2010 |
Mathias Agopian <mathias@google.com> |
am 19f64314: am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken
|
| 5cc61b153dabc4e188302e85828c06cf9995b410 |
08-May-2010 |
Mathias Agopian <mathias@google.com> |
SharedBufferStack now can grow up to 16 buffers.
there is a new resize() api, which currently only allows growing.
Change-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 5a835979b8066054d096f810a4a79c918e166309 |
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
|
| 67c0cc91989eeb4bacb558ba0b6b115f8b5c145a |
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
|
| eb7a35f047090cf89f0da15c7193e95bd62e7ddd |
12-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 9813a3a2: am b3390135: am d8c33747: am 78624e41: Add remove method in CameraParameters class.
|
| 8229dabcc36a015a6cf11a9b0b2e948ac0476552 |
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.
|
| f5ef7f22bbf73ba5c3910096f8f7f84cc6e21039 |
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)
|
| 83e5a900e5eccbd2af300c03d24d72365d0c8323 |
12-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
am d8c33747: am 78624e41: Add remove method in CameraParameters class.
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken
* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
Add remove method in CameraParameters class.
|
| fb2ab0fea6b8f84364fb68df4cecd1e8d93f4d1e |
11-May-2010 |
James Dong <jdong@google.com> |
am 144bb4fa: am 2cd841d4: Added initial validation on video/audio encoding parameters before/at start()
|
| 6039f3ae8758234ac41371618c539b7e2195a2c9 |
11-May-2010 |
James Dong <jdong@google.com> |
am 6d111efe: am b5e74239: Output streamable MP4 file during MP4 file recording
|
| ef9d0cd72e476a4b7556833fb09505a51b626797 |
11-May-2010 |
James Dong <jdong@google.com> |
Added initial validation on video/audio encoding parameters before/at start()
Change-Id: I1a40dd247202f70e3e5429d74533d349b88f1d54
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
|
| d2333bda49f9d76f1b30b81dfc093d407bc6dbf0 |
11-May-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
|
| ba7c35717116e4dcb8242644f6ccf07c25c7b251 |
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
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/include/HTTPStream.h
|
| 7837c17063a4c50bc856ba59418516fdab731de7 |
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
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 96f52cde23982f668592418a9548045237d5e327 |
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
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
|
| adbda96f6a05507788bb4163d7fbe8a95948f0a5 |
10-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add remove method in CameraParameters class.
bug:2672651
Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 6dcf1e2437d41049021d8a0f04275a2cb9a26a6e |
11-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 0c3bba3e: am e1b2b3b0: Merge "Add continuous focus mode constant." into kraken
|
| b59c95419c48e6e54071b9e93177bd8f79471eb9 |
11-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add continuous focus mode constant." into kraken
|
| 5abd6d4be04ecd4fdcbdcc34bf2973bae231a3ad |
10-May-2010 |
James Dong <jdong@google.com> |
am 98bb3eeb: am 4000e06e: Merge "Metadata construction optimization" into kraken
|
| 10a49e9d73f16f5f924c4013cba49a6ca4a28bac |
10-May-2010 |
James Dong <jdong@google.com> |
Merge "Metadata construction optimization" into kraken
|
| 6ee57f713fa2dcd3c83c7fedff12b879c22749bb |
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
|
| b1ccb623d9db42c451aa9dd4e8cf0e76b164aa50 |
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.
|
| 4bf7ace0d9d51cd47e00f92d26e1ee87909b3cc5 |
06-May-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add continuous focus mode constant.
bug:2612447
Change-Id: I9bc3f5a47ad50722a265d50b1d28fb82a2253dc9
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 06fe8f1452a68cc4634c80616aadfac42ccd1ddb |
10-May-2010 |
Chih-Chung Chang <chihchung@google.com> |
am c2ed1817: am e25cc656: Support multiple cameras in framework.
|
| 35a055b8bfc6f3cbea409b2897caf936654519cb |
06-May-2010 |
Chih-Chung Chang <chihchung@google.com> |
Support multiple cameras in framework.
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
amera/Camera.cpp
amera/ICameraService.cpp
nclude/camera/Camera.h
nclude/camera/ICameraService.h
edia/libstagefright/CameraSource.cpp
|
| ee7ff20e69498ebd53dd9717a0f984188341a75e |
07-May-2010 |
Andreas Huber <andih@google.com> |
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95
related-to-bug: 2654400
nclude/media/stagefright/MediaDefs.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/Utils.h
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OggExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/Utils.cpp
edia/libstagefright/VorbisExtractor.cpp
edia/libstagefright/codecs/vorbis/Android.mk
edia/libstagefright/codecs/vorbis/dec/Android.mk
edia/libstagefright/codecs/vorbis/dec/VorbisDecoder.cpp
edia/libstagefright/include/OggExtractor.h
edia/libstagefright/include/VorbisDecoder.h
edia/libstagefright/include/VorbisExtractor.h
|
| be83c9e8c71ce16c0d0e9ed9df525510a49a541b |
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
edia/libstagefright/MPEG4Writer.cpp
|
| c8e866331913821bef8e2f16101a29a8d8401081 |
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
|
| d8a30349da270715156d3f658b165481ce10cf71 |
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.
|
| f9325834de1ae004212aec2fd03445b4eebfa766 |
06-May-2010 |
Andreas Huber <andih@google.com> |
Merge "Disable vorbis seek when streaming from localhost." into froyo
|
| acdd9d0f59c3d8bdc3de80664a609527ec3d21e2 |
06-May-2010 |
Andreas Huber <andih@google.com> |
Disable vorbis seek when streaming from localhost.
Change-Id: Icda523ae1c89e26482f1c1767fe3a8b9222bb30f
related-to-bug: 2654400
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/HTTPDataSource.h
nclude/media/stagefright/MediaExtractor.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/VorbisExtractor.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/VorbisExtractor.h
|
| 2a521ac3c4bbccf0490b83fb3aefa91ae78b832e |
06-May-2010 |
Dan Bornstein <danfuzz@android.com> |
am 8391a3f4: am ebd2890b: am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.
|
| 71ec1d320e61c490bd3fac172f1d1a206a7198e8 |
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.
|
| 77356c37030215a4b8696b7d0af44a724341a0f9 |
05-May-2010 |
Dan Bornstein <danfuzz@android.com> |
For issue #2651381, allow library prelinking.
Change-Id: I119348b55ad0015a286e9c94709977cd1973a7e1
edia/libstagefright/Android.mk
edia/libstagefright/codecs/amrnb/common/Android.mk
edia/libstagefright/codecs/avc/common/Android.mk
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/omx/Android.mk
|
| 3fa060fb41a0ef8b1374ea2e92584d76906f3f5a |
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
|
| 13aec890216948b0c364f8f92792129d0335f506 |
22-Apr-2010 |
James Dong <jdong@google.com> |
Support audio and video track interleaving in the recorded mp4 file
Change-Id: Ifa27eb23ee265f84fe06773b29b0eb2b0b075b60
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/MPEG4Writer.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| 1af3a78cc6bd1b1bfaeca779d1a6a7872120f5bc |
05-May-2010 |
James Dong <jdong@google.com> |
am b8a8f850: am 8d30b2d2: Merge "Support AAC recording" into kraken
|
| e976f79f328163a009f9884e6b07d08c3b973137 |
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
|
| aa9ca29395eebfcfa64e070dc71009b99131769f |
04-May-2010 |
James Dong <jdong@google.com> |
Merge "Support AAC recording" into kraken
|
| 3830a4f133893e6a77a967c84220d7baf9687f23 |
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.
|
| 3cf4e43cdd391502690c07e08e805aa8ff5db0c0 |
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
nclude/media/stagefright/MediaDefs.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/VorbisExtractor.cpp
edia/libstagefright/include/VorbisExtractor.h
|
| 050b28a593350047845a45a14cc5026221ac1620 |
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
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AudioSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 750bdfd40abae2e545eb103eb811b31422051057 |
01-May-2010 |
Mathias Agopian <mathias@google.com> |
am 1bb8b670: Merge "Add support for enqueuing buffers in arbitrary order" into kraken
|
| 737c54077a29d4e5dadbf986bc1ac45ed50abcb2 |
29-Apr-2010 |
Mathias Agopian <mathias@google.com> |
am daedd81f: Merge "cleanup. waitForCondition() now uses polymorphsim instead of templtes" into kraken
|
| 845764b3429f9a5e47fe64c81b34be6acda4b5cc |
29-Apr-2010 |
Mathias Agopian <mathias@google.com> |
am 1d0fa397: Merge "fix a race condition in undoDequeue(), where \'tail\' could be computed incorrectly." into kraken
|
| 86f69c1f41dcf4e0826b17ecf7fd71eb353b0782 |
28-Apr-2010 |
Mathias Agopian <mathias@google.com> |
Add support for enqueuing buffers in arbitrary order
Also added a very simple SharedBufferStack unit test.
Change-Id: I253dbbe98a53c966b78d22d4d6dd59f8aefc8c40
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 41623bfd339754718bab32a6259ff15920f1c588 |
28-Apr-2010 |
Mathias Agopian <mathias@google.com> |
cleanup. waitForCondition() now uses polymorphsim instead of templtes
the reason for the above change is that waitForCondition() had become
large over time, mainly to handle error cases, using inlines to
evaluate the condition doesn't buys us much anymore while it increases
code size.
Change-Id: I2595d850832628954b900ab8bb1796c863447bc7
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 43d8a28165c0cf5ecfd4ea988f5db0f120672e60 |
28-Apr-2010 |
Mathias Agopian <mathias@google.com> |
fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly.
in the undoDequeue() case, 'tail' was recalculated from 'available' and 'head'
however there was a race between this and retireAndLock(), which could cause
'tail' to be recalculated wrongly.
the interesting thing though is that retireAndLock() shouldn't have any impact
on the value of 'tail', which is client-side only attribute.
we fix the race by saving the value of 'tail' before dequeue() and restore it
in the case of undoDequeue(), since we know it doesn't depend on retireAndLock().
Change-Id: I4bcc4d16b6bc4dd93717ee739c603040b18295a0
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 7a061a43a1ec78be1d36d83aa6562023d984fb83 |
28-Apr-2010 |
James Dong <jdong@google.com> |
am b30bf6ef: Merge "Use timestamp from camera driver for CameraSource" into kraken
|
| c32cd79d9ad4aba7d959b5b3be7361b4715e6f18 |
27-Apr-2010 |
James Dong <jdong@google.com> |
Use timestamp from camera driver for CameraSource
Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
nclude/media/stagefright/CameraSource.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/OMXCodec.cpp
|
| 23493afbbf680a1c328cec97d9d091978b2de690 |
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.
|
| 261741e728f2137f12b28df25c25e96acd942de9 |
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
|
| 0b5ba9eeed56a80fed3735f5cd4951477fda79f0 |
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
edia/libstagefright/OMXCodec.cpp
|
| 68a3517fbecb82dac00bced37cb7226ff83cafb0 |
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
|
| add08eb454bbe8b3a0a40d23621c102b72cd005d |
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.
|
| cb060573bb19d024f1dcf569b87756d78143456d |
21-Apr-2010 |
Mathias Agopian <mathias@google.com> |
am b834b38a: Merge "added setCrop() to android_native_window_t" into kraken
|
| f46f3dd3effec9523e61de1dce33bf6207e4801a |
21-Apr-2010 |
Mathias Agopian <pixelflinger@google.com> |
am 827cda45: Merge "add support for up to 16 buffers per surface" into kraken
|
| 87d83db7909b9a920b4e417bb240ec11e5441749 |
21-Apr-2010 |
Mathias Agopian <mathias@google.com> |
Merge "added setCrop() to android_native_window_t" into kraken
|
| 34cbbc9fb95b6c66840edce3291ce8275a290efb |
21-Apr-2010 |
Mathias Agopian <pixelflinger@google.com> |
Merge "add support for up to 16 buffers per surface" into kraken
|
| 4bf29cabaa7c94d0c74d5f945df6b51da51ed180 |
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
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
|
| 3d02ab8c49b4d77d4b7458fe2cf6c92c9fb9f7f8 |
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
|
| fdce1ccd7e468f3229de8f4f1616d017465470cb |
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.
|
| d2c6894b56a538aa807e20d3ef421807cd55c009 |
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.
edia/libstagefright/OMXCodec.cpp
|
| e9e4d5431d0df77a73f92b4a892417f47a57334c |
16-Apr-2010 |
Mathias Agopian <mathias@google.com> |
added setCrop() to android_native_window_t
hooked up the new method up to Surface.cpp
the actual crop is not implemented in SF yet
Change-Id: Ic6e313c98fd880f127a051a0ccc71808bd689751
nclude/private/surfaceflinger/SharedBufferStack.h
|
| cdaaf320a1db27a7045fafa4d849c20daa97c146 |
06-Apr-2010 |
Mathias Agopian <pixelflinger@google.com> |
add support for up to 16 buffers per surface
also increase the dirtyregion size from 1 to 6 rectangles.
Overall we now need 27KiB process instead of 4KiB
Change-Id: Iebda5565015158f49d9ca8dbcf55e6ad04855be3
nclude/private/surfaceflinger/SharedBufferStack.h
|
| 6b672070fbd9927073d497a62e1898f951a789f0 |
15-Apr-2010 |
James Dong <jdong@google.com> |
am fff02afa: am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
|
| 1fb636e8d723e9a28b38a924c5f30b183dd0934c |
15-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 31a17033: fix unintentional drift
|
| 4acdadbd8195f4fb21ff4cb72f09f088097ddf3b |
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
|
| cbe4b2cb591b5e7a6a25ee4ef85aaa61c537fef0 |
14-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix unintentional drift
Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| 27fde958c8e8e6a998ec7a28d32b0aad97662dee |
14-Apr-2010 |
James Dong <jdong@google.com> |
Use PV_PLAYER to handle RTSP streaming
bug - 2594865
Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| d34f609e4b18356f04a793ae5693d5a2fe8e0cab |
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
|
| d5680aee9ccfb88ad733e2392d962046dd9f3d59 |
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
|
| 3502fe5209b78d463e8fd29633391c72f1c48b3c |
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
|
| e8dded753e59b8d7c09a30384c4faf3f366dd484 |
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.
|
| 53fbf1d2eebd09e14a8995f51c47788670dbab1e |
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
|
| 73c30c5236858b72b74727bc627628672553add9 |
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
|
| 2f6ec4c07a830d9c22d4883e77592cf61d37baca |
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
|
| d84201fcae22b71cfa9f4bca5ef4a4344d04fad5 |
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.
|
| b1c9bd26a3b916d2f6ca7cda1edab92f48da16c8 |
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
|
| b9dbba9285fb406bc6eb87779c8bfc405269b6f2 |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| 07dd5a5a9cf8ea7c48473874b34d0dc6c5a6c231 |
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".
|
| ea623087e93c6e27ce6284946f94c1d4aff7f91b |
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
|
| 25801bfe64dff414991fca2f62f16a61ba554357 |
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
|
| a13da584aa7da751a7e6ebf00fc1c4e2382af611 |
13-Apr-2010 |
James Dong <jdong@google.com> |
Merge "Don't set encoder component role while we query decoders" into froyo
|
| a98420e863c374d1f15309467f2a1fc58d979d3b |
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
mds/stagefright/Android.mk
mds/stagefright/stagefright.cpp
edia/libstagefright/AudioPlayer.cpp
|
| 3fed817bd114f7824d458ca62621417aa71cec84 |
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
|
| 5e3cf6cf36feb3b73b8f8c0a8134c46f5bc85094 |
13-Apr-2010 |
James Dong <jdong@google.com> |
Don't set encoder component role while we query decoders
bug - 2558515
Change-Id: I29683507d234d963994c782c07508034ea807739
edia/libstagefright/OMXCodec.cpp
|
| a3e238d7147ed8d2c0f216b246df8f3009117b30 |
13-Apr-2010 |
Mathias Agopian <mathias@google.com> |
am e73a100f: am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken
|
| 351ab17847a4697d99d7db2e55d01822d1c0bf25 |
13-Apr-2010 |
Mathias Agopian <mathias@google.com> |
am 445a9785: Merge "don\'t hardcode "mSurface" throughout our source code" into kraken
|
| 5c117390591da780e1f53c1c9c91c1efdacbc674 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| c16ea2dbe0cb5ed4189e5ba5451f92bed62a4f4b |
13-Apr-2010 |
Mathias Agopian <mathias@google.com> |
Merge "don't hardcode "mSurface" throughout our source code" into kraken
|
| e8204e7fe37574afb2f8bbaca3dc40a6534065dd |
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
|
| b851fc7071d87d7ac24599826d672e22d88f8fa2 |
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
|
| 88b1b1c7331023828108daa57fcea858c7706566 |
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.
|
| 2e5299988b5f5f9165a76938a66d37e46dd48d6b |
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
edia/libmedia/IOMX.cpp
|
| 81f82c32459029bf0744e28c73f95a7f18cab5ac |
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
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/ESDS.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/include/ESDS.h
|
| a830cc4572be336deb01fe0ece36097b9440caae |
13-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am cd839752: manual merge
|
| 8e5d52bb00dc34608f2cd123a8387e6b15eb8126 |
13-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
manual merge
Change-Id: I9cdacbf1e445e7f6cf06ad03df541a744c242774
|
| 119638541516b6fdccfd11bdc8610b03a1fa2c42 |
12-Apr-2010 |
android-build SharedAccount <android-build@google.com> |
am 1a22ec9f: Merge commit \'36c87ca65281bbbeeed1b25da52468fe52491a7d\' into kraken-plus-aosp
|
| 766c395fbc6b46404af0f89f47fd3b0aeb7765cb |
12-Apr-2010 |
android-build SharedAccount <android-build@google.com> |
am 270027bf: Merge commit \'e8985420bb0fb95ad6dadd6de84f9940ecbd5ab7\' into kraken-plus-aosp
|
| 13b9d1eff282c8f2c4cbd07b119d47da553b6be6 |
12-Apr-2010 |
android-build SharedAccount <android-build@google.com> |
Merge commit '36c87ca65281bbbeeed1b25da52468fe52491a7d' into kraken-plus-aosp
|
| 58cd8ed8c0104bd6ccf7dd657a5e7fd0ff6c8fdd |
12-Apr-2010 |
android-build SharedAccount <android-build@google.com> |
Merge commit 'e8985420bb0fb95ad6dadd6de84f9940ecbd5ab7' into kraken-plus-aosp
|
| 47acf12ffef0a5db470406b7db788adcc6240786 |
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.
|
| 874b55f51c4c062c65aee043ec0f26044b504556 |
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
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/include/TimedEventQueue.h
|
| a3387afbc6dc5db0fd534ab5e3200f46b5a36acd |
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.
|
| 23748a675245149d652b5ede781b4df90fca5d21 |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken
|
| a418a932aa9c800c527451ea93ec9a3a06fb7515 |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
Merge "Remove unnecessary lock from AMRWriter." into kraken
|
| 88951e54c25b0cc58f78b48ffefa451cf87a8942 |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
Merge "Various fixes to enable recording on passion and nexus1." into kraken
|
| d5d0dbeadc2b5d172a9e6007c063b8d1366696e0 |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
Merge "Remove legacy NO_OPENCORE code bypass from MediaPlayerService." into kraken
|
| b547d09ecc3da8ee300099da8ca7e2826bb6849a |
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
|
| 7110385b31c7bc65c8a923a09689ebb0c4a1e07a |
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
edia/libstagefright/OMXCodec.cpp
|
| a5e4677f76b2e6596c2fd6351788ecf82ae9c448 |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
am 10d40772: am cdded187: Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Merge commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0' into kraken
* commit '10d4077240fe17b3a0c0e16a6e3f9d5e66419ba0':
Ignore corrupt aac audio frames and substitute silence.
|
| 77d6e73eff657277359fd18104d677019d51164e |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
am b1e7bee2: am 040301ca: Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
Merge commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4' into kraken
* commit 'b1e7bee2f3537bf5c49d1de796a97d2c2a48ebd4':
Start sending out buffering updates earlier (after preparation has completed) instead of only after playback has started.
|
| f018aa38b808f2e5c6e6b2dc0b29406caa793c65 |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
|
| 9dcda21086608a52a579ac8254991fdde686823a |
12-Apr-2010 |
Andreas Huber <andih@google.com> |
Ignore corrupt aac audio frames and substitute silence.
Change-Id: I544f98a5c00d912061db7921fc4518435209b168
related-to-bug: 2575976
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| 0a0583f9a6dd7fb0b72b7e072da4d55f8597c7ed |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 12d4cc30a535a4f4d37a957ba1f80d19dbecfa18 |
10-Apr-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 76fc56fb: am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
|
| 6328e73c94b8396a233212a18a773cd2f107ec97 |
10-Apr-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 926d9a89: am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
|
| e592430666bf1060c78e7b9308ca5be50b3e9457 |
10-Apr-2010 |
Wu-cheng Li <wuchengli@google.com> |
am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken
* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
|
| 465d5a7f3517f11aaa819c8ae982e113ad5ec479 |
29-Mar-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
bug:2544367
Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 548e31844937b37518fbb62ff69e9ff1f794183b |
09-Apr-2010 |
Andreas Huber <andih@google.com> |
I accidentally broken passion encoding while working around problems with the sholes encoder.
Change-Id: Id91b837ed17083cb21efb08e1c1ab9cc3ff3fa8f
edia/libstagefright/MPEG4Writer.cpp
|
| ebe87f32e442c9a8fb2931632311d6c5a126eddb |
23-Mar-2010 |
Andreas Huber <andih@google.com> |
Remove unnecessary lock from AMRWriter.
Change-Id: Ia02966d936dd8cbb31e92051578a3fa816885710
nclude/media/stagefright/AMRWriter.h
edia/libstagefright/AMRWriter.cpp
|
| 03b268eac37ca2589bfff0bf58daf79d29cc14f4 |
19-Mar-2010 |
Andreas Huber <andih@google.com> |
Various fixes to enable recording on passion and nexus1.
Change-Id: I75a461c9882e2449082ad754ee7b231c1ceec039
mds/stagefright/record.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| fe774a9c3ffe12979e182563b0e922ffc0ad20ef |
05-Apr-2010 |
Andreas Huber <andih@google.com> |
Remove legacy NO_OPENCORE code bypass from MediaPlayerService.
Change-Id: I72db73c91673e0d7f1090e3b033ae915337dc16e
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| e4d404b8974459dbbff03df1df251351751978d5 |
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
|
| 7e1db0ced769084169250e5a608cef0c7ea86671 |
09-Apr-2010 |
Andreas Huber <andih@google.com> |
am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
|
| 6e4f79aa417cf7ef9dcf3f4a36ee671886f7f40e |
09-Apr-2010 |
Andreas Huber <andih@google.com> |
am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
Merge commit '91ce08269600a5b46c84d9480212bf17e1107c2f' into kraken
* commit '91ce08269600a5b46c84d9480212bf17e1107c2f':
Support for ID3 V2.4 tags.
|
| 32f8c1cf4ab2abdd902535fc44a6549ba6f0ff33 |
09-Apr-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for ID3 V2.4 tags." into froyo
|
| bebd11b5a406bc4243cb7bd55f6849841bf911a7 |
08-Apr-2010 |
Andreas Huber <andih@google.com> |
Support for ID3 V2.4 tags.
Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c
related-to-bug: 2581869
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/include/ID3.h
|
| 28e613b1445c4c66c2fd99e2243f1598c4637014 |
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
|
| b9befd704de27e4e520b0bd845c9a298c33489bb |
08-Apr-2010 |
Andreas Huber <andih@google.com> |
am 3eade67b: am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
|
| 0bb74a4aec7ec0f6d7561e250112348520af7258 |
08-Apr-2010 |
Andreas Huber <andih@google.com> |
am b52e9f74: am eb12e45f: Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Merge commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c' into kraken
* commit 'b52e9f748cefaad01fc66a73ddfa707f2446895c':
Refactor connection/redirection code, support redirects on reconnection.
|
| 1ab1e4ec459ab549f79a98693a67f241861450be |
08-Apr-2010 |
Andreas Huber <andih@google.com> |
Refactor connection/redirection code, support redirects on reconnection.
Change-Id: Id2517568000e028b01553c06a4893813a6883168
related-to-bug: 2580785
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/HTTPDataSource.cpp
|
| 2c814e16baecd125d8413f930a77f006b5eff755 |
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
|
| 6bf4f5b404782b94c171a366e5a727c6414dedf0 |
08-Apr-2010 |
Andreas Huber <andih@google.com> |
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 the range he
|
| cb58914852afcc3505746055cfa7594c7bde87dc |
08-Apr-2010 |
Andreas Huber <andih@google.com> |
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 the range header and bett
Merge commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6' into kraken
* commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6':
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.
|
| d8c76856c6d52dcd11a90124dafef0af99956e15 |
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
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPDataSource.cpp
|
| 395cb05625dfc10e9428618c06ac1de5f882e4cb |
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
|
| 348b3e283d6bafba674b73c9b8ad09af9ad01a6b |
07-Apr-2010 |
Andreas Huber <andih@google.com> |
am 1e6edab6: am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
|
| 572cc37714f9833df77727f7a0401d294682a66d |
07-Apr-2010 |
Andreas Huber <andih@google.com> |
am 01f78928: am 567b57b6: Merge "Report the requested seek time while seek is in progress." into froyo
Merge commit '01f78928228cd097bc6816ae03909a2b01d5c1d5' into kraken
* commit '01f78928228cd097bc6816ae03909a2b01d5c1d5':
Report the requested seek time while seek is in progress.
|
| dac4ee72bac87388a1495e098f39d73168c8078f |
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
edia/libstagefright/AwesomePlayer.cpp
|
| b706dde26dcc862838d060ae40d0715c603ce810 |
07-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
merge from kraken-plus-aosp
Change-Id: Ice8381ca0386c01253be0fa6f9f91b993cac500d
|
| 89bc5f85c140a2868a0cb407ab95d18a6824a0c9 |
07-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
merge from kraken
Change-Id: I63b85281bbd21d42a3e703f799c6941cd81614d0
|
| 59eb79522c3da0de0304e17646737df8d883a3c7 |
07-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge policy from frameworks/policies/base
Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662
|
| 1825fe9a51b5e95a519ea656404efd1d80f52b2e |
07-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge policy from frameworks/policies/base
Change-Id: I55bd6b5078290aa7cdeaae8d8b4141d744ccf152
|
| f6c16cad86685564fe80495e9a7423d0810328a4 |
07-Apr-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Merge policy from frameworks/policies/base
Change-Id: Ieca556a1e9ef62f6450aac1dfd33e8c180e7eeeb
|
| 80eb61776f136c316f45ce4187a8bafedf9b3e88 |
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
edia/libstagefright/OMXCodec.cpp
|
| b514a24eac5d9f5a3a9cdb3b7319918c39198769 |
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
|
| 7f498b90a4300ef9badf14d202b0a67c26e20931 |
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
mds/stagefright/stagefright.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| fcdfad530df30d0e7fe21a7a463a3fe369ed325a |
02-Apr-2010 |
Andreas Huber <andih@google.com> |
Merge "Support another kind of iso mpeg4 file." into froyo
|
| a17a1347ffe281fc70633ba8dc98f6cf49ac06ff |
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
edia/libmedia/mediametadataretriever.cpp
|
| 983b449a27b5fa91eca82ede5204b4341899be62 |
01-Apr-2010 |
Andreas Huber <andih@google.com> |
Support another kind of iso mpeg4 file.
Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7
related-to-bug: 2558114
edia/libstagefright/MPEG4Extractor.cpp
|
| 71662fe8f5cc0dda0837596e9d44200d302697e8 |
01-Apr-2010 |
James Dong <jdong@google.com> |
Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
|
| ab4412a1992ce7ec0965cdbf616d64d821b67183 |
01-Apr-2010 |
Dave Sparks <davidsparks@android.com> |
Update AMR codec.
Change-Id: I8ecd2712863f6962b762f26898002912d1c77afb
edia/libstagefright/codecs/amrnb/dec/src/dec_amr.cpp
|
| 0b42f253d15a190e230df43a4b45a3c483e5869a |
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
nclude/media/MediaProfiles.h
|
| 13ecb8d4e47fc5a8af8487a133d7c91b9ce55326 |
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
|
| ba0707dc52b3ad2bec2244e1e6c39f31e06d467a |
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
edia/libstagefright/MP3Extractor.cpp
|
| a7313de4a402043fa5039558f05731189f354be6 |
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
|
| 1321fdd94d354431b930735e9f38f32ecd189a2d |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 2d832a1292d57a1904190b6b95cb1d03e746e00a |
31-Mar-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly fill in the component name for the software decoders." into froyo
|
| 47f729a0543376773070aaeafc12e13eed03f7be |
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
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrwb/AMRWBDecoder.cpp
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| 08f00853886c0d26e087c23da3e24df5d36d3674 |
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
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
|
| 65997f022fa3f557ba864ecc99a1aa33df54c2db |
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
edia/libstagefright/id3/ID3.cpp
|
| fb8391bfe3f21d08add3b65ba08d4d097c2bfdb6 |
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
|
| 03f4e14ec612d53b5e2b987555b24afcbbe319d1 |
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
edia/libstagefright/TimedEventQueue.cpp
|
| 8cc76ae259ad81d5a40277bbf5532696ebae8da8 |
29-Mar-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add some comments for zoom methods.
Also change RuntimeException to IllegalArgumentException.
bug:2458926
Change-Id: I87af31f5f3f10244131a1117bd1725c2d292b587
amera/ICamera.cpp
|
| 2415ecb5bb4e1459024f6d6c8ae2d6e3dc4fbdc7 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| f8ed70a20f8b006539af98c8ad45be9561665f82 |
25-Mar-2010 |
Chih-Chung Chang <chihchung@google.com> |
Call unlinkToDeath() when we disconnect the Camera,
so we don't hold the (weak) reference to it, which caused
(small) memory leaks.
Change-Id: If7d58a354fd38c8bc380946bf227b52988ac5118
amera/Camera.cpp
|
| 246c817c7e4514a34f996a2f38d501b52f617b7e |
24-Mar-2010 |
Andreas Huber <andih@google.com> |
Merge "QueryCodecs now returns the names of the software codecs (non-OpenMax) as well."
|
| 08a88e195d2b3697f2f967e9216491e8c5bd3c9e |
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
mds/stagefright/stagefright.cpp
edia/libstagefright/OMXCodec.cpp
|
| e966fb05c7e67a7f5dce65024de60aac83eb6f81 |
24-Mar-2010 |
Andreas Huber <andih@google.com> |
Enable early termination of the prefetcher's preparation phase.
Change-Id: I929ac9b0fd0b6ebd98c1bc56be18ac8f8378d48c
related-to-bug: 2537407
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/Prefetcher.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/Prefetcher.h
|
| 9584a0726582b6b7603032870c62b4fccd5ce076 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 54b1a0550411c2fd2084d82d28934d505c37349a |
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
edia/libmedia/AudioTrack.cpp
|
| fc1c7b940c84793ad262a345af117c482a86acec |
19-Mar-2010 |
Atsushi Eno <atsushieno+android@gmail.com> |
Accept media files by file extension in case insensitive manner.
Change-Id: I8e246010c96802ae87960797607fc8f8f2ab6031
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 589843b5969aa64a8f9a57fc8176c80b0ddce3c6 |
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(!)"
|
| 5d4f85d1e902a477ec7c8e3327693feee97e1c31 |
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
edia/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
|
| 1c6cebadf4579d997fdce946a1d00317c3e4c567 |
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
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| a89e12dfa46fe42b6309e945585310a89a5a1600 |
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
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| 2fd5624994d3dda4a4b1c2c485ec3e8f8b53cd6e |
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."
|
| 0887d170c7dc57411855382e326dd471824c9c02 |
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
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
|
| 601b38d3c53653270c16292489e8c28945582dae |
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."
|
| c9915aed58b3846251406b337ba2e1813d71f07e |
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
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| d3f93c572e55dc902d01f8eeda1d107a8b9128e2 |
17-Mar-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2416481: Support Voice Dialer over BT SCO."
|
| be55a2d66f03e80524a346500ffa9fd046410b28 |
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
edia/libmedia/AudioSystem.cpp
|
| 72d747da6672c68bc82e05912bf57d4e2bac2c3c |
16-Mar-2010 |
Marco Nelissen <marcone@google.com> |
Merge ""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."
|
| d2858f047b2c52d719719532f24899c0e03c2099 |
16-Mar-2010 |
Andreas Huber <andih@google.com> |
Properly use a long long literal to avoid under/overflow during fps computation.
Change-Id: I04730c86d43d6192ded3e779631effda9dd06e63
mds/stagefright/stagefright.cpp
|
| 15ff9300a667f7347e546eb1516e7cb0b775ba7a |
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
edia/libstagefright/AwesomePlayer.cpp
|
| b4cfc6381503236f8fc959e77a64ab5ab5e639f1 |
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."
|
| 2a3847ee1cbdaa8a65eee397a0173bb02211c459 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 35bb8f908b3f2970bd42d7bc4bf2402f9dd2c271 |
16-Mar-2010 |
Glenn Kasten <gkasten@google.com> |
Merge "Fixes bug 2502132, and masks bug 2518313."
|
| 073247521258cf304253193040200b7e0aa8102d |
16-Mar-2010 |
Kenny Root <kroot@google.com> |
Merge "Fix regression in directory scanning"
|
| aaaa12caef17f34cdcdf118fa7c2b4b8d0d7fe0e |
16-Mar-2010 |
Glenn Kasten <gkasten@google.com> |
Fixes bug 2502132, and masks bug 2518313.
Change-Id: I5c5ecf1c10763f7b3f3d1e5c57dc5ce77cc344fd
edia/libstagefright/AMRExtractor.cpp
|
| 16aec9057ca888cad57404747a842b5ded3fe29f |
16-Mar-2010 |
Andreas Huber <andih@google.com> |
Merge "HTTPDataSource must be connected before it is usable. Fix this in the stagefright tool."
|
| 5284bc4fe8e85bf61d7977cbcc75fd244a13d84c |
16-Mar-2010 |
Andreas Huber <andih@google.com> |
HTTPDataSource must be connected before it is usable. Fix this in the stagefright tool.
Change-Id: I5313b2cb7839233d51b2d37a03b6598b0760c2e0
mds/stagefright/stagefright.cpp
|
| 632a7dfdab89ffa79846ad37718d0582fd36affe |
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
edia/libstagefright/id3/ID3.cpp
|
| 3e42b4491529975f771f8d71f931e24e120a7856 |
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
edia/libmedia/MediaScanner.cpp
|
| 746973186764292a84d11856ac315fa4b62957ad |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| 739d629c59758ca1832b8823daf98161a9e87615 |
15-Mar-2010 |
Andreas Huber <andih@google.com> |
Merge "Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files."
|
| a13cc2332acea28fb17dcb4de6fcb78441152828 |
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."
|
| c3df626e7d36c4d5d72c1cc3d7af9be7f44e81ae |
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."
|
| 643a00adc0cc73bf6ab426f9cc650973006dd859 |
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
edia/libstagefright/id3/Android.mk
|
| 6f3a0c2dcb8d37d34e29e6a02acf1e3f8596088c |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| fa71449d6c3b3da082d8fbedf9470ee8750a1646 |
15-Mar-2010 |
Andreas Huber <andih@google.com> |
Fixing the sim build.
Change-Id: I307f6d59f473471adcf855e66b4e8275ab1b3b74
edia/libstagefright/omx/OMX.cpp
|
| 93e1fb99a0c66784b49b105ce84a23baf054ee9c |
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
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/mediametadataretriever.h
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 52e71f87f1dac8d2f6bcaf77bb25b78cba664c43 |
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
edia/libstagefright/omx/OMX.cpp
|
| c116510dd22091369ab15b63fbbc176e1fb39a04 |
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."
|
| e94bd14078d327ef2f800e69907efce641a13272 |
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
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/HTTPStream.h
|
| 8a6e24135608d1ec6629f381acd20d88369cd940 |
11-Mar-2010 |
Marco Nelissen <marcone@google.com> |
Merge "Revert "Do autodetection even if no locale was specified, and use the""
|
| b5c3107262fdf82aef4bd5ee8b8c60dd3e4725fe |
11-Mar-2010 |
Marco Nelissen <marcone@google.com> |
Revert "Do autodetection even if no locale was specified, and use the"
This reverts commit b45b0845a6db32848ad08ac1037ef67a68ec2d39.
edia/libmedia/MediaScannerClient.cpp
|
| 4023493a827bc9751d8e40795516d0d536a53348 |
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
edia/libmedia/mediaplayer.cpp
|
| 6fc13ab8d00819b7420d1b0a500896264e820409 |
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."
|
| 64fb06f698b39759a7a2ebacd0a175949b7506a5 |
11-Mar-2010 |
Nicolas Catania <niko@google.com> |
Revert "Allow invoke in all the player states except idle and error."
This reverts commit 88f3b81d065d4bec6f69a25eda99158e254f55b1.
edia/libmedia/mediaplayer.cpp
|
| 8d20cd5d15bf008abf43cbd00eadf90cd3e4b84e |
11-Mar-2010 |
Nicolas Catania <niko@google.com> |
Merge "Allow invoke in all the player states except idle and error."
|
| 79b19b39acce9b1303f8cf1a11c6b7ef852dc5a8 |
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
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/DataSource.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 63bacaf543d4faee6dadda08e51556c878b078f5 |
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
edia/libmedia/mediaplayer.cpp
|
| d40b0e858558ba2cac7704e994eaa44ad41e6ad8 |
10-Mar-2010 |
Andreas Huber <andih@google.com> |
Merge "Extend stagefright tool to extract either album art or video frame."
|
| 5983dd43811e433d9a6680439ad4df62eef80d6f |
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."
|
| 1b950bcd3c11a17186cf971e23f5ec829d092ed5 |
10-Mar-2010 |
Andreas Huber <andih@google.com> |
Extend stagefright tool to extract either album art or video frame.
Change-Id: Iab50924e37a1aad057470a349c8f1a81858424e9
mds/stagefright/stagefright.cpp
|
| 2e39c1ca101e01ff13b03129a87939e7982b25bf |
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
nclude/media/stagefright/StagefrightMediaScanner.h
edia/libstagefright/StagefrightMediaScanner.cpp
|
| 83ff1438d2d1d5dbf39ca5e6f2e4fa1799e7ba80 |
10-Mar-2010 |
Marco Nelissen <marcone@google.com> |
MEDIA_PLAYER_STATE_ERROR is not a bitmask
(b/2502881)
Change-Id: I08e427eb2c36f5d70e40f9aeb8638fa8262de989
edia/libmedia/mediaplayer.cpp
|
| b699c595d78e8cd7f60c2c5102d40db07b18926b |
09-Mar-2010 |
Andreas Huber <andih@google.com> |
Merge "Use a more descriptive user-agent string (similar to PV's before) in stagefright http requests."
|
| 69f722fb203371f9879f2b0c9670791ed6deb555 |
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
edia/libstagefright/HTTPDataSource.cpp
|
| d81f873ee1585d2440a759f7188481c4b11cc262 |
09-Mar-2010 |
Wu-cheng Li <wuchengli@google.com> |
Merge "Add camera parameter string constant for "true"."
|
| ebca2dccc0fbd41acf02d8a9c056e206eb29b089 |
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."
|
| e7e3b785a0e7819db4c895a4f60e9a4dd755880c |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/Prefetcher.cpp
|
| d8d888ea7c14715c2210c8dea1a623116c992264 |
09-Mar-2010 |
Wu-cheng Li <wuchengli@google.com> |
Add camera parameter string constant for "true".
bug:2458926
Change-Id: I11eaae8ff031765e23f2627ded5873eabc09cead
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 1ebb261c0c22955116d121e5d38dfa68df027c6c |
08-Mar-2010 |
Andreas Huber <andih@google.com> |
Merge "Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers."
|
| 0caaa95e11b700440f64e110b11f77a93acfa569 |
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
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 1322e7ebc33e8e161fb73cd47e43dd93357608e4 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/Prefetcher.cpp
|
| 8eea8c3b2c48ce693a20eda4828ff188700b72e0 |
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
edia/libstagefright/Prefetcher.cpp
|
| 3a2bee0e7f867ab6a7d36503731dec1432066470 |
06-Mar-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2428563: Camera rendered inoperable by voice call interruption."
|
| 88335b1a749fe0157547907a2ce6c9632f4d2592 |
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.
edia/libmedia/AudioRecord.cpp
|
| 4a68c51b96ff93b7cb41dc682e5c031bee828df0 |
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."
|
| 88d8a83de12592635248aa1a3bd6b9ea46108501 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| ba1f481614b4a4dd290e3b75e0f3f1879a383a44 |
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
edia/libstagefright/MP3Extractor.cpp
|
| c0170bc6c6c81f5dfa86a132bf29ee48c01329d9 |
23-Feb-2010 |
Ray Chen <raychen@google.com> |
Add location provider name to gps-processing-method in EXIF header.
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| fe4c6f01646de47d41bbe3aa6d17c6a0daa2b730 |
02-Mar-2010 |
Dave Sparks <davidsparks@android.com> |
Fix build. I screwed up a merge.
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 4bbc0ba371c52951191eff1cba7c1ea5d27ee976 |
02-Mar-2010 |
Dave Sparks <davidsparks@android.com> |
Add locking to signal in AudioCache::notify(). Bug 2317844.
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 05bca2fde53bfe3063d2a0a877f2b6bfdd6052cf |
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>
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
|
| 949c5037a6e019ff575bd481d286908c2eaa1e34 |
01-Mar-2010 |
Wu-cheng Li <wuchengli@google.com> |
Unhide zoom API.
bug:2458926
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| 25155ff8ccf7898d08ab62fae46297e046a571f0 |
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.
edia/libstagefright/AudioPlayer.cpp
|
| e3d91046072908f5613a21652b6da9b44043f1d5 |
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"
|
| 698f476590bc9e38d4d1d4155da9efdbedd357c4 |
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.
edia/libmedia/mediaplayer.cpp
|
| 789c27a161f8ab7dba0835e015317ff4843c5cd2 |
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."
|
| 42569ac261af2cf8cefd0922a890c31b759c37b8 |
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
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
|
| 4f1bff97170d33575e55a8e110b097c05607095f |
20-Feb-2010 |
Wu-cheng Li <wuchengli@google.com> |
Unhide exposure compensation API.
bug:2375993
amera/CameraParameters.cpp
nclude/camera/CameraParameters.h
|
| e284bac7757ad732d0812eb6133125434ba66d5b |
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
edia/libmedia/mediarecorder.cpp
|
| af5611861df599656edafb751d5140fdccc34135 |
26-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "Support vendor MPEG4 test content with apparently malformed chunks in them."
|
| ea5ea10a036f79c86bf5f204cb81804bf2bacdc7 |
26-Feb-2010 |
Andreas Huber <andih@google.com> |
Support vendor MPEG4 test content with apparently malformed chunks in them.
related-to-bug: 2472211
edia/libstagefright/MPEG4Extractor.cpp
|
| b8b283bd53594ce4bb6da47b3abff12a0a070f04 |
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."
|
| dedec7365f6c4dfbfc69994a8756b4abb5031afa |
26-Feb-2010 |
James Dong <jdong@google.com> |
Merge "Image encoding settings java API through xml configuration file"
|
| 1edee16200cb377b7862b30aa5c387d9686023db |
25-Feb-2010 |
James Dong <jdong@google.com> |
Add some space and total memory amount to the memory dump from the media server process.
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| f5a8385649204213dc19e1a64f4693931e048d85 |
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
nclude/media/MediaProfiles.h
edia/libmedia/MediaProfiles.cpp
|
| d2d947bc8717697e983062147b51b5a0e307b84f |
24-Feb-2010 |
Andreas Huber <andih@google.com> |
Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding.
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| 5a48695ec3bd8845be8ab872144114ac24df629b |
24-Feb-2010 |
Andreas Huber <andih@google.com> |
Tag stagefright development tools as "debug-only".
mds/stagefright/Android.mk
|
| 5295c0c55d41a2906ea7f65a3f22e6278cb17d4b |
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
nclude/media/stagefright/AudioPlayer.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/Prefetcher.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| bd5d93f21e6f79c6d9ebe9d77542c3090d4a7ff4 |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| 36efe505b61cf9d5d019f2021450401bde5d9858 |
22-Feb-2010 |
Andreas Huber <andih@google.com> |
Properly unload the renderer shared library after the renderer goes away.
edia/libstagefright/omx/OMX.cpp
|
| 86559de0275b46a9bdba06b749fbd549ad2022d1 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| df49e8926e85088bc7d1dc7905362437c9806b69 |
22-Feb-2010 |
Eric Laurent <elaurent@google.com> |
am 8978547f: am f5fe3949: Fix issue 2459650.
Merge commit '8978547f254b6b6ba2e322794aa044803f3edc2a'
* commit '8978547f254b6b6ba2e322794aa044803f3edc2a':
Fix issue 2459650.
|
| eb839f5f05b7d0c4558bf845816fd3fe6201e15e |
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.
|
| 7c7fa1b51bec497cd7f46c1bdb5bb0adfaa181b2 |
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.
edia/libmedia/AudioSystem.cpp
|
| 4b2f2c06ea5be0d95da53a3307ab4c1dd940f8dd |
20-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Merge "Make sure that the event callback thread is Java capable in the simulator."
|
| 0df82fcf56668bbde355cac7fb0828368441f6dc |
20-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Make sure that the event callback thread is Java capable in the simulator.
edia/libstagefright/Android.mk
edia/libstagefright/TimedEventQueue.cpp
|
| bd8a5cd484cf6197f89c5a28e091959970e7551d |
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."
|
| 2e8ffaf95bd35358ecd14ddf00cddaf3abefe0a9 |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 9068d69227703817a583d53627b8007063634425 |
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
edia/libstagefright/Prefetcher.cpp
|
| 1f71e77facd0a2b39f4a0be7fa52850533cc121f |
18-Feb-2010 |
Kenny Root <kroot@google.com> |
Merge "Range check in MediaScanner::processDirectory"
|
| eb03f13fd3b5a4b1060cd55881934ff9c918fe8c |
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
edia/libmedia/MediaScanner.cpp
|
| e307dd2d8309a1f49de9a079a3f33cb063c10b24 |
18-Feb-2010 |
Kenny Root <kroot@google.com> |
Merge "Store AudioTrack return value for error condition"
|
| 32dcebf970356eb8599ea965d71535ed0c212c2d |
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
edia/libstagefright/AudioPlayer.cpp
|
| d29345dfa29cdcc650f3705e43950ef2500f6728 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 349a733b58c3b4c656c4ddfa8cbbb06c008d3bc5 |
18-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "Disable the TI AMR hardware decoder for audio decoding until its issues are resolved."
|
| c2158a2f0fb68fe96d24b9bd85c32f15753d8ccb |
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
edia/libstagefright/OMXCodec.cpp
|
| 36e3ee0094e845ed9d2a1c755addecfde9db3a68 |
17-Feb-2010 |
Andreas Huber <andih@google.com> |
Better diagnostics for the stagefright tool and codec performance.
related-to-bug: 2450938
mds/stagefright/stagefright.cpp
|
| f759aa902596e0c8d13b756cecbb8f037769791c |
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."
|
| 36d06e5a244a85f31854d559b8a8e10b3eb89577 |
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."
|
| 389a8b192cf18495ed0c7201a691f515d3b150dc |
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
edia/libstagefright/Prefetcher.cpp
|
| a5142a9282c972b5b2faf21f1cc3831a6dcf0436 |
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
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
|
| 0e917ec1e86477ca22ed8d5dc87a36f4641a6733 |
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
edia/libstagefright/AMRExtractor.cpp
|
| 3cf7054398a9c0f2f15ce1cd189ed88de42e5ec3 |
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)"
|
| b56e992476d1bbeb4021d256852dbe02fc1064f8 |
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)
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
|
| feef608b2ca6beb8098a5f4823085a14e97267ca |
12-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "Preserve a preview frame to be restored after resuming the playback session."
|
| fa090f541bb84a546af2ec834e91a032ff10e66e |
12-Feb-2010 |
Andreas Huber <andih@google.com> |
Preserve a preview frame to be restored after resuming the playback session.
related-to-bug: 2231576
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| ed7c9f7b28c3496568351b9165f686bd20128621 |
12-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "New API on java's MediaPlayer to suspend/resume a session."
|
| 4e92c7efc68b5d7635a32dbd283ab8558ad9bdd6 |
12-Feb-2010 |
Andreas Huber <andih@google.com> |
New API on java's MediaPlayer to suspend/resume a session.
related-to-bug: 2231576
nclude/media/IMediaPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
|
| 7b3396acc702451be9bafb19d7fe26d55d43a316 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/Prefetcher.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 328901bdc7c00ab361c5ef16d0d69c94a0458e95 |
11-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Merge "Add support for "album artist" tag."
|
| 66ac4df65516ebfd0e500bfca75dc4b5ef8d674e |
11-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Add support for "album artist" tag.
nclude/media/mediametadataretriever.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 3cf613507f1e2f7bd932d921a6e222e426fd3be4 |
10-Feb-2010 |
Mathias Agopian <mathias@google.com> |
split libsurfaceflinger_client and libcamera_client out of libui
amera/Android.mk
amera/Camera.cpp
amera/CameraParameters.cpp
amera/ICamera.cpp
amera/ICameraClient.cpp
amera/ICameraService.cpp
nclude/camera/Camera.h
nclude/camera/CameraHardwareInterface.h
nclude/camera/CameraParameters.h
nclude/camera/ICamera.h
nclude/camera/ICameraClient.h
nclude/camera/ICameraService.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
nclude/media/stagefright/HardwareAPI.h
nclude/private/surfaceflinger/LayerState.h
nclude/private/surfaceflinger/SharedBufferStack.h
nclude/private/ui/LayerState.h
nclude/private/ui/SharedBufferStack.h
edia/libmedia/Android.mk
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/IOMX.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 988e3f0b2c74095deae580157c57935a98573052 |
11-Feb-2010 |
Andreas Huber <andih@google.com> |
Support for rendering through an overlay on the droid even if a software renderer is active.
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 2f5b04733badcb8bd5131aef9d99c9a9e84a3a21 |
11-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "Fixing AMR recording code."
|
| b45c62c8e9b05c2703bdae18cc298ae55550db8a |
11-Feb-2010 |
Andreas Huber <andih@google.com> |
Fixing AMR recording code.
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libstagefright/AMRWriter.cpp
|
| 6708918f4f28c1bf6284cfb70724bcef4d67db68 |
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."
|
| cb5b4896ebc1ee36b254866f6c9a3f376d68d0ac |
10-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file."
|
| c5b366a4b428e7dd0626e33193e51180ad3ab8ba |
10-Feb-2010 |
Andreas Huber <andih@google.com> |
Properly detect Adobe's .f4v file format as an mp4 ISO compliant file.
edia/libstagefright/MPEG4Extractor.cpp
|
| 758cc74ff08487ded45f7ff4476c200fe727b366 |
10-Feb-2010 |
Andreas Huber <andih@google.com> |
TI does not want the hardware H.263 decoder to be enabled.
edia/libstagefright/OMXCodec.cpp
|
| 77f8531a739c46cffe7f7fd1e035de542deccf48 |
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.
edia/libmedia/MediaScannerClient.cpp
|
| 7d5b8a70c28c0d5746a600467b2887822dbff88e |
10-Feb-2010 |
Andreas Huber <andih@google.com> |
Implementation of stagefright-enabled MediaPlayerService::decode functionality
related-to-bug: 2359268
nclude/media/MediaPlayerInterface.h
nclude/media/stagefright/AudioPlayer.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/AudioPlayer.cpp
|
| 316f8352846a1470b0ffd1b94ac1ec535922a9f6 |
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..."
|
| bd22c52280179b29eefac91ef7e7bbbc33d25904 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| c017cfcc24dd63c7efde5747a6ed2d4053788abc |
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.
edia/libstagefright/OMXCodec.cpp
|
| 26bae54d7a3d04215eba34c62c349f1be6ab1493 |
09-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Support the disc number and custom genre tags for mp4.
edia/libstagefright/MPEG4Extractor.cpp
|
| 22c85664fead28bf376084de20d2f3a90552e000 |
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."
|
| ec9dd59902c8beea4ba6a842f3a843d46150d949 |
09-Feb-2010 |
Andreas Huber <andih@google.com> |
A little less verbosity in stagefright and special treatment for the error state while shutting down.
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OMXCodec.cpp
|
| cba8b3a18e92df3b2fc8820d55c85674cd9d0198 |
09-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "During shutdown, don't loop forever on a state transition to OMX_StateInvalid."
|
| 569e7f1b1444194d1aca5a0b23de154565ba12da |
09-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Use bswap_16 instead of swap16, because swap16 is not available in glibc
edia/libstagefright/id3/ID3.cpp
|
| 4c23b7d543cd95250e766cef7558d0f4c941ddcb |
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
edia/libstagefright/id3/ID3.cpp
|
| 2dd73b65542c9eeb82bb567098f235349d18b06f |
09-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly implement asynchronous preparation of media playback."
|
| 940ad815a1a30abf0268949e3d3937d7e0d672c0 |
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."
|
| c23f12af0394aa2f6651968a3c8840f1af317aa1 |
08-Feb-2010 |
Andreas Huber <andih@google.com> |
Properly implement asynchronous preparation of media playback.
related-to-bug: 2413002
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/Prefetcher.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/Prefetcher.h
|
| 5a2621a64de196cbdb9a2a50357dee1c32fcf11b |
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.
edia/libstagefright/id3/ID3.cpp
|
| 825bfc23eac1bc37f9eb7a14221b6dc5c303bdf0 |
09-Feb-2010 |
Gloria Wang <gwang@google.com> |
Merge "Use Tremor for sim-eng, and Tremolo for other targets."
|
| 6c8a9a4132337a3419a72a735f0b40df0b82061f |
08-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Add support for the TPOS/TPA (disc number) id3 tag.
nclude/media/mediametadataretriever.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 9636054b52f0de54e42b669805883c71a5196d42 |
08-Feb-2010 |
Gloria Wang <gwang@google.com> |
Use Tremor for sim-eng, and Tremolo for other targets.
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
|
| 0d681df3b0ded2c1e335b6b5785439da4ce2c238 |
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
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| c9c4bef6b7f6793263a1f7659fe3641e856f2573 |
08-Feb-2010 |
Gloria Wang <gwang@google.com> |
Merge "Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first."
|
| 7ebf475799f6ae1ec8c67983fc1028c487af4c2e |
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.
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
|
| 5dd69302ffabd260d035fe309374892c7d681926 |
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)"
|
| ffd4da72e0433a4142f605b626fc7ff6db7a2af8 |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 0af04493: am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '0af0449301e72a52beeed8f26021e5460004d67a'
* commit '0af0449301e72a52beeed8f26021e5460004d67a':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
|
| 9d8bd1c6162b55f8f68c00038e6b75be25100c52 |
05-Feb-2010 |
James Dong <jdong@google.com> |
Merge "When the extractor is not able to be created successfully, don't crash"
|
| d8ee0c22b1bd5a7f0e37f41d68e868d5077fe92b |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
am 31bfdf69: reconcile main tree with open-source eclair
Merge commit '31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp
* commit '31bfdf695ef741f64066ef605bd6a7e23df88714':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Fix regression.
Fix broken build.
Bluetooth A2DP suspend/resume functionality
EventLog when a database file is deleted due to corruption.
Don't forget to clear "backup in progress" state when finishing a pass
Fix issue #2148939: Sholes slow to wake up in landscape mode
Fix Cdma re-start of default connection.
Merge change 26821 into eclair
Not all WebView's host have permission to read the history.
Merge change 26908 into eclair
|
| cac7c56783201754c799c94549b4d96c3f081e59 |
05-Feb-2010 |
The Android Open Source Project <initial-contribution@android.com> |
reconcile main tree with open-source eclair
|
| b93ad64a423975748c7f5e1a5ea94ab8681bc899 |
05-Feb-2010 |
James Dong <jdong@google.com> |
When the extractor is not able to be created successfully, don't crash
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| e08a519fd1de34c68dc2993968d6f93da66323f6 |
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"
|
| cb9859bcf5f00cee57de06e9968b88a69b2d6d9c |
05-Feb-2010 |
Gloria Wang <gwang@google.com> |
Fix for 2224736. Sometimes mSeeking is reset without calling setSeekTo first.
edia/libstagefright/AudioPlayer.cpp
|
| 9944aaea3a4f0e7a68b448e666b025b458ecc595 |
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)
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
|
| 13896b94336085d4e6ff555fa1a420312e8dea79 |
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
nclude/media/MediaProfiles.h
|
| b25e2a948c8b5a96e284069a908c2fddb49efc48 |
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.
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/Android.mk
edia/libstagefright/id3/Android.mk
|
| b399aa37056a3ce7a38b4a20cc0aef8e0e01b23e |
04-Feb-2010 |
Andreas Huber <andih@google.com> |
Merge "Defer creating the video renderer until we see the first video frame."
|
| a657f8deaf21acbe5faba7be1df9c6681d44d471 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| 80a68deec52c9a1b47215ed68526206ec88197f8 |
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
edia/libstagefright/AudioPlayer.cpp
|
| 1862a33b246249630b654182afb5914da3480d4c |
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
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 2eeabb1f98d162786b45a09659674025a0559251 |
03-Feb-2010 |
Mathias Agopian <mathias@google.com> |
fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug)
A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color.
Fix another typo which caused the viewer position to be wrong for
specular highlights.
Switch back to eye-space lighting, since there are still some issues
with some demos (San Angeles in particular).
nclude/private/opengles/gl_context.h
|
| ad6516d9247bd0a76a393810b041c3e4094f0e36 |
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
edia/libstagefright/AudioPlayer.cpp
|
| 7b7a83a6840d34ab39f1a3c8ab81946bb4404c14 |
03-Feb-2010 |
Mathias Agopian <mathias@google.com> |
Merge "implement [2396050] Add ETC1 texture support to AGL"
|
| 1c38c276c8cd1c56907787c2a4f6c9e109409fff |
02-Feb-2010 |
Mathias Agopian <mathias@google.com> |
implement [2396050] Add ETC1 texture support to AGL
nclude/private/opengles/gl_context.h
|
| 7f8b69feef7bf9395ba4fda0619240f1237552b1 |
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
edia/libstagefright/HTTPStream.cpp
|
| 7574ca60ce85f816d3d7f6ee7a74285ff6b72a98 |
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."
|
| de6bec4ec04e9b8e9f96bc44fc15e6d072f851a8 |
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
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
|
| 3b240d6bf235f6f6b40ee4c37a2862de286ca1e4 |
02-Feb-2010 |
Andreas Huber <andih@google.com> |
Properly report the duration of a recording into .mp4 files.
related-to-bug: 2295468
edia/libstagefright/MPEG4Writer.cpp
|
| 4cf04b1bf703522b37a60427ef02f2a18b218c19 |
02-Feb-2010 |
Andreas Huber <andih@google.com> |
Properly advertise the content length of the HTTP stream if available.
related-to-bug: 2312941
nclude/media/stagefright/CachingDataSource.h
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/HTTPDataSource.cpp
|
| a62aad3d3313f02a759ab2fcb92e160272badd5b |
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"
|
| 1d7491b19516505e0754c66a3c8cd61811c9b6a6 |
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
nclude/media/MediaProfiles.h
edia/libmedia/Android.mk
edia/libmedia/MediaProfiles.cpp
|
| b8118650036a763b3cd91bc71f358b453ad28993 |
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."
|
| afeb8352e222a218440e4b5a9d17181fc304c179 |
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."
|
| 89e7fff6a5d7410815f42b4a55958a59d4463180 |
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
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
|
| 78d529eb330ab6c04b5c694403f5a7e7de4b702f |
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.
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 6b3359d4669f539c173bfc40809deb8ffde3dd0c |
30-Jan-2010 |
Mathias Agopian <mathias@google.com> |
Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary.
Use a MemoryHeapBase directly instead.
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
|
| 036a38099c9d339d77dc4a1a148db2907a618c2e |
30-Jan-2010 |
Mathias Agopian <mathias@google.com> |
Merge "Simplify the MemoryDealer implementation"
|
| e300a0c436a048e7568837d9cd8f4bb2bf5e6c72 |
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."
|
| a83adc4131d5c1afa98fb78b9764be0fab6f1ef7 |
29-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Support 24-bit LE PCM wave files in stagefright."
|
| 867d2f6ce668968e463eb86b856d21525f12fd67 |
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.
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| ba7c7eeca462614251aec3d27f0f7ff3a83cefa1 |
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
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| 984d8f40c15e7fd757a9fdc007aad75549aa0fce |
29-Jan-2010 |
Andreas Huber <andih@google.com> |
Support 24-bit LE PCM wave files in stagefright.
related-to-bug: 2300197
edia/libstagefright/WAVExtractor.cpp
|
| d77f65370ea27085a10963ac3463e6f909d8c9ed |
29-Jan-2010 |
The Android Open Source Project <initial-contribution@android.com> |
reconcile android-2.1_r1 snapshot
|
| bbe1ed453aa0407237127fb45a30ba8ffd9e0941 |
29-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Properly forward errors returned by AudioTrack up to the player."
|
| 1846096f274048a5882402e12be7c47db91b3834 |
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.
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
|
| 88c030e0e0152791ff74f90249f55fce01371198 |
29-Jan-2010 |
Andreas Huber <andih@google.com> |
Properly forward errors returned by AudioTrack up to the player.
related-to-bug: 2300197
nclude/media/stagefright/AudioPlayer.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
|
| 0fc863291096e9818fa83f8edc459f7f9c9cf794 |
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."
|
| 69f5f4c021ee55055df39718244c036faf2d3382 |
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
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
|
| 50a9976892316c033cd90d522ecbfcc8e3c0eb9b |
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
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/MPEG4Extractor.cpp
|
| 5561ccf4a8db88a2e44eac1b3ed13b4ff53a7f20 |
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
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/HTTPDataSource.h
nclude/media/stagefright/MediaExtractor.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| 2db8455d8f4468a637109d31f319ce02d9d743ec |
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>
nclude/media/IMediaPlayerService.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVPlayer.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.cpp
edia/libmediaplayerservice/TestPlayerStub.h
edia/libmediaplayerservice/VorbisMetadataRetriever.cpp
edia/libmediaplayerservice/VorbisPlayer.cpp
edia/libmediaplayerservice/VorbisPlayer.h
|
| 8566a635aa4bf6d2e908f0bc64d4fb8917025b58 |
28-Jan-2010 |
Andreas Huber <andih@google.com> |
Fix http streaming for shoutcast servers that do not support http ranges.
related-to-bug: 2295438
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/HTTPDataSource.cpp
|
| dd26833953e9e965df0421c854a3b86a1bb56715 |
27-Jan-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V sync"
|
| 0463f07fe11e6b70d8c46a23abd88273952fabc4 |
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
edia/libstagefright/Prefetcher.cpp
|
| e9f8c544dbe0ac7ff88df18bfe9084c72e3ac1d5 |
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."
|
| 342e9cf388cceb807def720e40e8b0a217f4bcaa |
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.
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
nclude/media/MediaPlayerInterface.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 66b0a35c9a4136a84c3f73b1b25fcb5220138b95 |
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
nclude/media/stagefright/CachingDataSource.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/HTTPDataSource.h
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/Prefetcher.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/include/Prefetcher.h
|
| 2dce41ad26cb3e9e15c9e456a84bcf5309548ca0 |
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
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaWriter.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/MPEG4Writer.cpp
|
| e7dc360f6fcb4d5348e72ba57e936254216ae399 |
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."
|
| ca2b6fa1f99b900420fe392cc401a35bcac91616 |
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."
|
| e7c9cb48fec02697227bd847cd2e69432659adfd |
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
mds/stagefright/audioloop.cpp
nclude/media/stagefright/AMRWriter.h
nclude/media/stagefright/AudioSource.h
edia/libstagefright/AMRWriter.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AudioSource.cpp
|
| b72a396826da8bd934b9531bbd40f86d7509e71c |
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.
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
|
| 6c009eb5ff5f999b1d9bc6978d3213f9f797903f |
25-Jan-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 2363154: Speech synthesis fails to start over A2DP after media server process crash."
|
| 213addfaf4b359c69da4e9b4490c511d116845bb |
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.
nclude/media/IOMX.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/omx/OMX.cpp
|
| 0ef583f785528ef2785e6149d5964004cd1016b0 |
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.
edia/libmedia/AudioSystem.cpp
|
| a826028dc33a83538a2ac6bd13ca46a52de7a9be |
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."
|
| b9280d5c2313c41eb490f58198c4e59118e0e3e6 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| a2a05bf4d24df4ccd2942bfc3766a2430701e8ba |
22-Jan-2010 |
Chih-Chung Chang <chihchung@google.com> |
Add an orientation parameter for overlay, so we can do camera preview in portrait mode.
edia/libstagefright/CameraSource.cpp
|
| 1b55817b3c9f69115d1f8422d9252a82944fee27 |
21-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup."
|
| b49676a55e7dce9710e1a10749a26997513c5ceb |
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
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 0726045216f576e97672ebeefc265d39c4ebaaa5 |
21-Jan-2010 |
Andreas Huber <andih@google.com> |
Fix circular dependency between StagefrightPlayer and AwesomePlayer that prevented proper cleanup.
related-to-bug: 2355922
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/include/AwesomePlayer.h
|
| 570a3cb7582daa030cb38eedc5eb6a06f86ecc7f |
21-Jan-2010 |
Andreas Huber <andih@google.com> |
Fix no-copy-overhead OMXCodec implementation to actually work.
nclude/media/IOMX.h
nclude/media/stagefright/OMXCodec.h
edia/libmedia/IOMX.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| dfaddcc81f27bb9de47edec469a4a5fb2309bd6a |
20-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Adds support for 8-bit (unsigned) PCM wave files."
|
| f99f049dd228333e3d6f886efe373f8e461ff2da |
20-Jan-2010 |
Andreas Huber <andih@google.com> |
Adds support for 8-bit (unsigned) PCM wave files.
related-to-bug: 2382428
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/include/WAVExtractor.h
|
| dcd7303ad62ae4be828edfa1b8d61b18b0fb1ec0 |
20-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Support for 'iTunes-style' metadata in .mp4 and .3gp files."
|
| 0cdfa68cd07150b1f9f329ef0a76761b64ea1fdc |
20-Jan-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Create base class for audio policy manager."
|
| 72b8c5ae6a5f97a4fcfc6d23d33159d6ae50179c |
20-Jan-2010 |
Andreas Huber <andih@google.com> |
Support for 'iTunes-style' metadata in .mp4 and .3gp files.
related-to-bug: 2368967
nclude/media/stagefright/MetaData.h
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/include/MPEG4Extractor.h
|
| 08e7eb983fcb9860a574e964ff905f75aab88d2f |
19-Jan-2010 |
Andreas Huber <andih@google.com> |
Fix trailing garbage after UCS-2 encoded strings in ID3 V2.
related-to-bug: 2381919
edia/libstagefright/id3/ID3.cpp
|
| 83e5850bdf9c8b5c36c364b367b039674eb827ad |
19-Jan-2010 |
Andreas Huber <andih@google.com> |
Support for ID3 version 1 (and 1.1) tags in .mp3 files.
related-to-bug: 2375219
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/id3/testid3.cpp
edia/libstagefright/include/ID3.h
|
| 5cb4241cbeb409f2322bd527349c080a2cf454df |
19-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process."
|
| 0dd4f499b391fc2888b0e83d126208c7a3ec8960 |
19-Jan-2010 |
James Dong <jdong@google.com> |
Merge "Media server death nodification"
|
| 7eaa9c9385535b651064e02d05a8ffa4b2359281 |
16-Jan-2010 |
Andreas Huber <andih@google.com> |
Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process.
nclude/media/IOMX.h
nclude/media/stagefright/OMXCodec.h
edia/libmedia/IOMX.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/omx/OMX.cpp
|
| a2ce85733c8e42c30927eefe3ff4e4bd36515041 |
19-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| 8fd10b7add00c31a3f9317430d9bdcad9fb324a5 |
19-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Remove totally unused code from OMX.cpp"
|
| c57b67905c2128ddadfeca96785ee1f593b6605a |
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.
edia/libstagefright/Android.mk
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/SampleIterator.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/include/SampleIterator.h
edia/libstagefright/include/SampleTable.h
|
| 81dbf71f4488ee1a4cb612f2aba341f365fb546a |
15-Jan-2010 |
Andreas Huber <andih@google.com> |
Remove totally unused code from OMX.cpp
edia/libstagefright/omx/OMX.cpp
|
| 12b6894eca898771e4ddaaf69c6ca3425d582af0 |
19-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Upgrade for the stagefright commandline tool to support extracting thumbnails and to optionally prefer software codecs."
|
| a76e5ddf0bb77c04615db1916c21c1ba315e555b |
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."
|
| dd172fce75b2a1c3cb3a5d3b3bbb5020b1ae8675 |
16-Jan-2010 |
James Dong <jdong@google.com> |
Media server death nodification
nclude/media/IMediaDeathNotifier.h
nclude/media/mediaplayer.h
nclude/media/mediarecorder.h
edia/libmedia/Android.mk
edia/libmedia/IMediaDeathNotifier.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
|
| 97419ed670a12f48a7609673da8ee5dc0376f075 |
15-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| c2b00379dbc6389efbbbfc51e09207933b747c6d |
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."
|
| 2e26e7913c98827d5f0a54c9ca9b5e9ccba041d8 |
15-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Squashed commit of the following:"
|
| da76c64dee7d95c967e2841302300cfb081e67b2 |
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.
edia/libstagefright/SampleTable.cpp
|
| 4e202e779a8495091ab189fd88fc295a3e619c61 |
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.
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| e8a084958c27327b0aca749f69095605d2a21309 |
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.
edia/libstagefright/MPEG4Extractor.cpp
|
| b03fd8c97695d381e202f6a64989b51c7024c04a |
14-Jan-2010 |
Andreas Huber <andih@google.com> |
Workaround for some hardware decoders not properly signaling end-of-output-stream properly.
edia/libstagefright/OMXCodec.cpp
|
| 5c1e3581978164d169050686c73810ce59304471 |
14-Jan-2010 |
Andreas Huber <andih@google.com> |
Upgrade for the stagefright commandline tool to support extracting thumbnails and to optionally prefer software codecs.
mds/stagefright/stagefright.cpp
|
| ab13003c692f25c7c430e6b6c441d88aefdcf9d8 |
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.
edia/libstagefright/omx/tests/OMXHarness.cpp
|
| 7be6407f2ad7f2b0782d195d9f792072c084d6f5 |
13-Jan-2010 |
Andreas Huber <andih@google.com> |
Support for determining the mime type of media via metadata extraction.
nclude/media/mediametadataretriever.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/include/AMRExtractor.h
edia/libstagefright/include/MPEG4Extractor.h
edia/libstagefright/include/WAVExtractor.h
|
| bd4bc59262df90dc85752684a1d4a92833a535a3 |
13-Jan-2010 |
Andreas Huber <andih@google.com> |
More metadata support.
nclude/media/stagefright/MetaData.h
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
|
| 492e666e47795326f4b12b87b150b550e6074bd8 |
10-Dec-2009 |
Eric Laurent <elaurent@google.com> |
Create base class for audio policy manager.
First implementations of audio policy manager in Eclair branch have shown that most code is common to all platforms.
Creating AudioPolicyManagerBase base class will improve code maintainability and readability.
Audio policy manager code for platforms using generic audio previously in AudioPolicyManagerGeneric is replaced by AudioPolicyManagerBase.
Audio policy manager test code previously in AudioPolicyManagerGeneric is moved to AudioPolicyManagerBase.
Also added a wake lock for delayed commands in AudioPolicyService.
nclude/media/AudioSystem.h
|
| d244d6a67896b48df8affd26fd9aa1e70d97719d |
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."
|
| 6064017c61aa0bcadcff3119e176eab5fc3c001b |
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
edia/libstagefright/MPEG4Extractor.cpp
|
| a2631c869957b627c51bd82e738998a0f77d1cda |
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."
|
| b0823224bf6b5dcd40645518af40f17044ad0d70 |
13-Jan-2010 |
The Android Open Source Project <initial-contribution@android.com> |
android-2.1_r1 snapshot
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/stagefright/MediaPlayerImpl.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libstagefright/MediaPlayerImpl.cpp
|
| 54a4b5e76faa0799231e24ea465ba6d6062b00eb |
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
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| 7ee8ac94bb1a724a481a7cddf10ce63d35df6296 |
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.
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| fc9ba09e3bb368f823d473f5e2bb9aa32dba6289 |
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
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/MediaExtractor.h
nclude/media/stagefright/MetaData.h
edia/libstagefright/Android.mk
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/id3/Android.mk
edia/libstagefright/id3/ID3.cpp
edia/libstagefright/id3/testid3.cpp
edia/libstagefright/include/ID3.h
edia/libstagefright/include/MP3Extractor.h
edia/libstagefright/include/StagefrightMetadataRetriever.h
|
| 58e1f78683d9230932c4d5bee53b79fc685b5995 |
12-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "The mp3 decoder should not assert that decoding was successful but return an error instead."
|
| cd231c8672056429003b452c6a97fb705ad0765e |
11-Jan-2010 |
Andreas Huber <andih@google.com> |
The mp3 decoder should not assert that decoding was successful but return an error instead.
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| db74495dbf653a72018396607fae63946bed44ec |
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
edia/libstagefright/MP3Extractor.cpp
|
| 67e5a4f6f6879d512a859e5dba92e9beec7a2f91 |
08-Jan-2010 |
Andreas Huber <andih@google.com> |
Reorganize some of the stagefright implementation related to metadata.
nclude/media/stagefright/StagefrightMediaScanner.h
edia/libmedia/Android.mk
edia/libmedia/StagefrightMediaScanner.cpp
edia/libmedia/StagefrightMediaScanner.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightMetadataRetriever.h
edia/libstagefright/Android.mk
edia/libstagefright/StagefrightMediaScanner.cpp
edia/libstagefright/StagefrightMetadataRetriever.cpp
edia/libstagefright/include/StagefrightMetadataRetriever.h
|
| 23d7a43fb32482e2573b7f203fd9dd5a8349b329 |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Quick and dirty implementation to follow http redirects in stagefright.
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/string.cpp
|
| fcac3378879ab151d786f1ce89da2f032ba3ea97 |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Protect against possible temporary objects going away before we get at their data."
|
| a66a27e07423c6ed1dde9c0267b555e83c44e58e |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Protect against possible temporary objects going away before we get at their data.
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
|
| a400af77a5136495d1e00244e9578aebe6ccd1fd |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "I must have broken raw-audio decoding in the recent past, this fixes it."
|
| 717826ececd8d39596f62418677721d70776add1 |
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
edia/libstagefright/AwesomePlayer.cpp
|
| f1350fdb125e1069f867ba13190c5c8e7b64e9b8 |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Use stagefright for http streaming if the right property is set.
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| b8f92e8fc059693f0b857a185a183f618c4defb0 |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Make metadata support through stagefright property dependent until it's ready."
|
| 82c162310a506f74741fb32cddee937a4beec1fa |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Merge "Fix mpeg4/h.263 software decoder."
|
| 065c05e72091567632f927d9e5411e277480c1bf |
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Make metadata support through stagefright property dependent until it's ready.
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
|
| cb110ccbe4c275eba0857d9af341a75113243fa0 |
04-Jan-2010 |
Andreas Huber <andih@google.com> |
Fix mpeg4/h.263 software decoder.
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/include/M4vH263Decoder.h
|
| c60bc4a7e25f6784644b8f6acf07bae2c58863b3 |
04-Jan-2010 |
Andreas Huber <andih@google.com> |
Fix avc software decoder to properly handle SEI nalType and access unit delimiter.
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
|
| 3e9549e47e2ccc0e37637854f673654750db289f |
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:
|
| 368f5743636d24a6ff70a53b6c9073477cd60ede |
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:
|
| 7ddd450f91dc508b26cc550f5b42fded8a731654 |
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.
nclude/media/AudioSystem.h
|
| a17e2b9a98c836145d6b50c6b1407e2162c526ac |
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.
mds/stagefright/Android.mk
edia/libstagefright/omx/tests/Android.mk
|
| 01d48d20f8e69061cd41741c2ed5c7f2dc8f2116 |
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.
|
| 274316df9dfb163df01339bf7babadb2ea6cfb6a |
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.
|
| 2d3b2097320614cb088bd4eba795905c2a4130b5 |
19-Dec-2009 |
James Dong <jdong@google.com> |
Attempt to fix simular build break.
Missing header file stdlib.h for free, malloc, etc
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
|
| f9918ed60e9fb3050e93e68d714f92f647ef00ab |
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
|
| b82db2542670ddcb3d3d989bbbe620a81acf47da |
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
|
| fd1fe13b4584628d73df31717794e8e886d6bc39 |
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
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/include/M4vH263Decoder.h
|
| ba871922175a52f85a4bb79d0ff24f3c2436f351 |
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
|
| 3e1e0d79887f8777aced8faca207e04cb6ec1f86 |
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
|
| 9801564dbff3c47e747add686feec622575a9869 |
18-Dec-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change Ibac388a3 into eclair-mr2
* changes:
Add support for XING header
|
| 8b77fa8f7b8515b3436ee31350e5fc73abf30c00 |
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
|
| ac6e6569f08911df9d5c96285cf15325cbbf0340 |
10-Dec-2009 |
Gloria Wang <gwang@google.com> |
Add support for XING header
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/include/MP3Extractor.h
|
| 3bcbcd09b48deb2b498f7163f89f92e01b9fd43b |
18-Dec-2009 |
Andreas Huber <andih@google.com> |
Attempt to fix the simulator build by including stdlib.h for NULL.
edia/libstagefright/codecs/avc/common/include/avclib_common.h
|
| 3e78376a6f8aaa269cdb39f21d6abbf9464aee5b |
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.
|
| 47945ea184f62def4c5a1dd15164cfa3fd286882 |
17-Dec-2009 |
Andreas Huber <andih@google.com> |
Disable HTTP playback and metadata support in stagefright, use PV instead.
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
|
| be37c3ce836527514bdf2c6fb83e59a9f2f661d7 |
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
|
| 3306cfee3bf38ab207a0504e49c2d492bb73ffbf |
16-Dec-2009 |
James Dong <jdong@google.com> |
Initial checkins of the mpeg4 and h263 software decoders based on PV
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/m4v_h263/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/Android.mk
edia/libstagefright/codecs/m4v_h263/dec/M4vH263Decoder.cpp
edia/libstagefright/codecs/m4v_h263/dec/include/m4vh263_decoder_pv_types.h
edia/libstagefright/codecs/m4v_h263/dec/include/mp4dec_api.h
edia/libstagefright/codecs/m4v_h263/dec/include/visual_header.h
edia/libstagefright/codecs/m4v_h263/dec/src/adaptive_smooth_no_mmx.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/bitstream.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/bitstream.h
edia/libstagefright/codecs/m4v_h263/dec/src/block_idct.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/cal_dc_scaler.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/chv_filter.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/chvr_filter.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/combined_decode.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/datapart_decode.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/dcac_prediction.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/dec_pred_intra_dc.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/deringing_chroma.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/deringing_luma.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/find_min_max.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/get_pred_adv_b_add.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/get_pred_outside.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/idct.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/idct.h
edia/libstagefright/codecs/m4v_h263/dec/src/idct_vca.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/max_level.h
edia/libstagefright/codecs/m4v_h263/dec/src/mb_motion_comp.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/mb_utils.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/mbtype_mode.h
edia/libstagefright/codecs/m4v_h263/dec/src/motion_comp.h
edia/libstagefright/codecs/m4v_h263/dec/src/mp4dec_lib.h
edia/libstagefright/codecs/m4v_h263/dec/src/mp4def.h
edia/libstagefright/codecs/m4v_h263/dec/src/mp4lib_int.h
edia/libstagefright/codecs/m4v_h263/dec/src/packet_util.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/post_filter.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/post_proc.h
edia/libstagefright/codecs/m4v_h263/dec/src/post_proc_semaphore.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/pp_semaphore_chroma_inter.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/pp_semaphore_luma.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/scaling.h
edia/libstagefright/codecs/m4v_h263/dec/src/scaling_tab.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/vlc_dec_tab.h
edia/libstagefright/codecs/m4v_h263/dec/src/vlc_decode.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/vlc_decode.h
edia/libstagefright/codecs/m4v_h263/dec/src/vlc_dequant.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/vlc_tab.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
edia/libstagefright/codecs/m4v_h263/dec/src/zigzag.h
edia/libstagefright/codecs/m4v_h263/dec/src/zigzag_tab.cpp
edia/libstagefright/codecs/m4v_h263/patent_disclaimer.txt
edia/libstagefright/include/M4vH263Decoder.h
|
| 76189d5997a1423499043e5379dc5cc89eb7f3fd |
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:
|
| 41760137878022ae1788d3893f8c1ce60ee54971 |
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:
|
| 134ee6a324c35f39e3576172e4eae4c6de6eb9dc |
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.
mds/stagefright/stagefright.cpp
nclude/media/IOMX.h
edia/libmedia/IOMX.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/tests/Android.mk
edia/libstagefright/omx/tests/OMXHarness.cpp
edia/libstagefright/omx/tests/OMXHarness.h
|
| 2e9bf90317802367d189693679bae5ae552f060e |
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.
|
| 7422517d4cd4484959ce3327766a18bcec2a567c |
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.
|
| 91da03b86ff9973af59ba4d64fee1fa89d9d0662 |
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.
|
| 8ae1d0bdcef22f2bdd8d283e0e615f3ba6c3f4cd |
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.
nclude/media/stagefright/OMXPluginBase.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXMaster.cpp
edia/libstagefright/omx/OMXMaster.h
edia/libstagefright/omx/OMXPVCodecsPlugin.cpp
edia/libstagefright/omx/OMXPVCodecsPlugin.h
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.h
|
| 7e97608c9eebe8470f72a86aefc30c4063bf982e |
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.
|
| 1af80bc3fefb999756ef4847e72b2dcfd0b88a4a |
15-Dec-2009 |
Andreas Huber <andih@google.com> |
Properly integrate the software codecs into the OMXCodec::Create hierarchy of available components.
edia/libstagefright/OMXCodec.cpp
|
| d56e3f601947b6269cbf1115e3c6238adeaff290 |
15-Dec-2009 |
Android Git Automerger <android-git-automerger@android.com> |
Merge commit 'goog/eclair-plus-aosp'
|
| 917a243617b56632bc434df448d69f631d7caffd |
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.
|
| e335789ae5e3d083466639cf2b8766c9a36e4ff2 |
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.
|
| 6aff64c56753b9972b53889d6e58c505248f3bcb |
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.
|
| 46b51aa4207552ab5c8effc935da599d5533f691 |
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.
|
| c1689e49ac867de33f2e81289449878ac2e536a0 |
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.
edia/libstagefright/AwesomePlayer.cpp
|
| 8235824f474e52cbbbdf4ecf46cb0b8ccede0799 |
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.
|
| 48d911bf83cf82a39c4711156d6b5b60d12caeeb |
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.
|
| 68ddfc7f245bf31f16c3d65ba754cbb78e37fcbe |
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.
|
| 733b7729ea462fae9c6899456444e28fef1c757c |
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.
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/colorconversion/Android.mk
edia/libstagefright/colorconversion/ColorConverter.cpp
edia/libstagefright/colorconversion/SoftwareRenderer.cpp
edia/libstagefright/include/AwesomePlayer.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/ColorConverter.cpp
edia/libstagefright/omx/SoftwareRenderer.cpp
|
| 587423f64501606852f05393ce1edfac0c18d545 |
14-Dec-2009 |
Andreas Huber <andih@google.com> |
The software AVCDecoder now properly seeks as requested.
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/include/AVCDecoder.h
|
| c6714432df327c31c9b3ffc815efb317c4738a1f |
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.
|
| 4f26feda50cc4c51d90c93156afd03c380b9a42e |
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.
|
| b841f14f8e51f2365945281fbfa54ef6a1b1b5a6 |
12-Dec-2009 |
Andreas Huber <andih@google.com> |
Initial checkin of software AMR NB encoder based on PV source code.
nclude/media/stagefright/MetaData.h
edia/libstagefright/Android.mk
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
edia/libstagefright/codecs/amrnb/enc/Android.mk
edia/libstagefright/codecs/amrnb/enc/src/amrencode.cpp
edia/libstagefright/codecs/amrnb/enc/src/amrencode.h
edia/libstagefright/codecs/amrnb/enc/src/autocorr.cpp
edia/libstagefright/codecs/amrnb/enc/src/autocorr.h
edia/libstagefright/codecs/amrnb/enc/src/c1035pf.cpp
edia/libstagefright/codecs/amrnb/enc/src/c1035pf.h
edia/libstagefright/codecs/amrnb/enc/src/c2_11pf.cpp
edia/libstagefright/codecs/amrnb/enc/src/c2_11pf.h
edia/libstagefright/codecs/amrnb/enc/src/c2_9pf.cpp
edia/libstagefright/codecs/amrnb/enc/src/c2_9pf.h
edia/libstagefright/codecs/amrnb/enc/src/c3_14pf.cpp
edia/libstagefright/codecs/amrnb/enc/src/c3_14pf.h
edia/libstagefright/codecs/amrnb/enc/src/c4_17pf.cpp
edia/libstagefright/codecs/amrnb/enc/src/c4_17pf.h
edia/libstagefright/codecs/amrnb/enc/src/c8_31pf.cpp
edia/libstagefright/codecs/amrnb/enc/src/c8_31pf.h
edia/libstagefright/codecs/amrnb/enc/src/calc_cor.cpp
edia/libstagefright/codecs/amrnb/enc/src/calc_cor.h
edia/libstagefright/codecs/amrnb/enc/src/calc_en.cpp
edia/libstagefright/codecs/amrnb/enc/src/calc_en.h
edia/libstagefright/codecs/amrnb/enc/src/cbsearch.cpp
edia/libstagefright/codecs/amrnb/enc/src/cbsearch.h
edia/libstagefright/codecs/amrnb/enc/src/cl_ltp.cpp
edia/libstagefright/codecs/amrnb/enc/src/cl_ltp.h
edia/libstagefright/codecs/amrnb/enc/src/cod_amr.cpp
edia/libstagefright/codecs/amrnb/enc/src/cod_amr.h
edia/libstagefright/codecs/amrnb/enc/src/convolve.cpp
edia/libstagefright/codecs/amrnb/enc/src/convolve.h
edia/libstagefright/codecs/amrnb/enc/src/cor_h.cpp
edia/libstagefright/codecs/amrnb/enc/src/cor_h.h
edia/libstagefright/codecs/amrnb/enc/src/cor_h_x.cpp
edia/libstagefright/codecs/amrnb/enc/src/cor_h_x.h
edia/libstagefright/codecs/amrnb/enc/src/cor_h_x2.cpp
edia/libstagefright/codecs/amrnb/enc/src/cor_h_x2.h
edia/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/dtx_enc.cpp
edia/libstagefright/codecs/amrnb/enc/src/dtx_enc.h
edia/libstagefright/codecs/amrnb/enc/src/enc_lag3.cpp
edia/libstagefright/codecs/amrnb/enc/src/enc_lag3.h
edia/libstagefright/codecs/amrnb/enc/src/enc_lag6.cpp
edia/libstagefright/codecs/amrnb/enc/src/enc_lag6.h
edia/libstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/ets_to_if2.cpp
edia/libstagefright/codecs/amrnb/enc/src/ets_to_if2.h
edia/libstagefright/codecs/amrnb/enc/src/ets_to_wmf.cpp
edia/libstagefright/codecs/amrnb/enc/src/ets_to_wmf.h
edia/libstagefright/codecs/amrnb/enc/src/g_adapt.cpp
edia/libstagefright/codecs/amrnb/enc/src/g_adapt.h
edia/libstagefright/codecs/amrnb/enc/src/g_code.cpp
edia/libstagefright/codecs/amrnb/enc/src/g_code.h
edia/libstagefright/codecs/amrnb/enc/src/g_pitch.cpp
edia/libstagefright/codecs/amrnb/enc/src/g_pitch.h
edia/libstagefright/codecs/amrnb/enc/src/gain_q.cpp
edia/libstagefright/codecs/amrnb/enc/src/gain_q.h
edia/libstagefright/codecs/amrnb/enc/src/gsmamr_enc.h
edia/libstagefright/codecs/amrnb/enc/src/hp_max.cpp
edia/libstagefright/codecs/amrnb/enc/src/hp_max.h
edia/libstagefright/codecs/amrnb/enc/src/inter_36.cpp
edia/libstagefright/codecs/amrnb/enc/src/inter_36.h
edia/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/inter_36_tab.h
edia/libstagefright/codecs/amrnb/enc/src/l_comp.cpp
edia/libstagefright/codecs/amrnb/enc/src/l_extract.cpp
edia/libstagefright/codecs/amrnb/enc/src/l_negate.cpp
edia/libstagefright/codecs/amrnb/enc/src/lag_wind.cpp
edia/libstagefright/codecs/amrnb/enc/src/lag_wind.h
edia/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp
edia/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.h
edia/libstagefright/codecs/amrnb/enc/src/levinson.cpp
edia/libstagefright/codecs/amrnb/enc/src/levinson.h
edia/libstagefright/codecs/amrnb/enc/src/lpc.cpp
edia/libstagefright/codecs/amrnb/enc/src/lpc.h
edia/libstagefright/codecs/amrnb/enc/src/ol_ltp.cpp
edia/libstagefright/codecs/amrnb/enc/src/ol_ltp.h
edia/libstagefright/codecs/amrnb/enc/src/p_ol_wgh.cpp
edia/libstagefright/codecs/amrnb/enc/src/pitch_fr.cpp
edia/libstagefright/codecs/amrnb/enc/src/pitch_fr.h
edia/libstagefright/codecs/amrnb/enc/src/pitch_ol.cpp
edia/libstagefright/codecs/amrnb/enc/src/pitch_ol.h
edia/libstagefright/codecs/amrnb/enc/src/pre_big.cpp
edia/libstagefright/codecs/amrnb/enc/src/pre_big.h
edia/libstagefright/codecs/amrnb/enc/src/pre_proc.cpp
edia/libstagefright/codecs/amrnb/enc/src/pre_proc.h
edia/libstagefright/codecs/amrnb/enc/src/prm2bits.cpp
edia/libstagefright/codecs/amrnb/enc/src/prm2bits.h
edia/libstagefright/codecs/amrnb/enc/src/q_gain_c.cpp
edia/libstagefright/codecs/amrnb/enc/src/q_gain_c.h
edia/libstagefright/codecs/amrnb/enc/src/q_gain_p.cpp
edia/libstagefright/codecs/amrnb/enc/src/q_gain_p.h
edia/libstagefright/codecs/amrnb/enc/src/qgain475.cpp
edia/libstagefright/codecs/amrnb/enc/src/qgain475.h
edia/libstagefright/codecs/amrnb/enc/src/qgain795.cpp
edia/libstagefright/codecs/amrnb/enc/src/qgain795.h
edia/libstagefright/codecs/amrnb/enc/src/qua_gain.cpp
edia/libstagefright/codecs/amrnb/enc/src/s10_8pf.cpp
edia/libstagefright/codecs/amrnb/enc/src/s10_8pf.h
edia/libstagefright/codecs/amrnb/enc/src/set_sign.cpp
edia/libstagefright/codecs/amrnb/enc/src/set_sign.h
edia/libstagefright/codecs/amrnb/enc/src/sid_sync.cpp
edia/libstagefright/codecs/amrnb/enc/src/sid_sync.h
edia/libstagefright/codecs/amrnb/enc/src/sp_enc.cpp
edia/libstagefright/codecs/amrnb/enc/src/sp_enc.h
edia/libstagefright/codecs/amrnb/enc/src/spreproc.cpp
edia/libstagefright/codecs/amrnb/enc/src/spreproc.h
edia/libstagefright/codecs/amrnb/enc/src/spstproc.cpp
edia/libstagefright/codecs/amrnb/enc/src/spstproc.h
edia/libstagefright/codecs/amrnb/enc/src/ton_stab.cpp
edia/libstagefright/codecs/amrnb/enc/src/ton_stab.h
edia/libstagefright/include/AMRNBEncoder.h
|
| af962218eca183d675ce093b843d5b228ac55132 |
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.
|
| c9546b4ded4db4bc73528664816c146c97d0e1d3 |
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.
|
| 6b91407a918d755454ed396068ff7f67b7088f34 |
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.
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
edia/libstagefright/codecs/amrwb/AMRWBDecoder.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| a60d4307653f780b7b95dfdaa6a362f960c87bb5 |
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.
|
| 847df83ea29e0eeafde7a68ffe856d1a7466eb22 |
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.
|
| 72124cf05cd5b40f2902198aca2797616b813457 |
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.
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h
edia/libstagefright/include/AVCDecoder.h
|
| e7637333f06099b97e58876fa1a6b0500fc8d811 |
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...
|
| aee87d995e90dd3625d2301cdc2dccc8d9f2e808 |
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.
|
| d9e2cb5b1b1aa699407f8642f0ab25927e7d0f61 |
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...
|
| 0070109a5c9488e45fd3ff998ad5c8b43f6c9f8e |
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...
|
| 8f6ca20d0c79b36cc479a03316ec4340b34aeb8e |
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.
|
| d97d8011836752f57dd0f84eecc7fa701fdcdf18 |
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...
|
| 08411b75d4c30ce26180639f158e2f33d190eee8 |
11-Dec-2009 |
Andreas Huber <andih@google.com> |
remote destructors are not synchronously executed by the binder...
edia/libstagefright/AwesomePlayer.cpp
|
| fd4a8e09a54469bbccea6248f84319a1eb78765e |
11-Dec-2009 |
Andreas Huber <andih@google.com> |
Fix seek-on-startup behaviour in AwesomePlayer.
edia/libstagefright/AwesomePlayer.cpp
|
| 3570bcd75691317c6722de3a3da2a8de20c51877 |
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.
|
| e8647636abd1294ae929a8f20c0afa5e9b6b268b |
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...
|
| 1fa72e74c079a7c13f4e0fb4e63f87957d635a27 |
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.
|
| 4844ac54e8b5997c3b03872dbafe8ebed4787517 |
11-Dec-2009 |
Andreas Huber <andih@google.com> |
remote destructors are not synchronously executed by the binder...
edia/libstagefright/AwesomePlayer.cpp
|
| 3ce139526703a0c070bc3606e0d8a01290baeeb9 |
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.
|
| 5646429ac387cb38665ca83ea00b22e8c25ee32f |
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.
|
| cef5f487bd4ce45b686056320fb58230550068fa |
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.
|
| 0a2b8e6424d1b027fb188ba0bd290fedff34b0f5 |
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.
|
| c5e1bae0aa56f60a48de8c866f84536b10fed1f6 |
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
|
| 5740d1a493af4409a8f6b51dd05037cc2f626976 |
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
|
| 3869dcbacecc5575cdde7b337a39cbd14c1fd7cb |
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
|
| 609f1a00c96cf5605f4614e7bb6d0487c98969c5 |
10-Dec-2009 |
Andreas Huber <andih@google.com> |
Initial checkin of software AVC video decoder based on PV source code.
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/amrnb/common/Android.mk
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/amrwb/Android.mk
edia/libstagefright/codecs/avc/Android.mk
edia/libstagefright/codecs/avc/common/Android.mk
edia/libstagefright/codecs/avc/common/include/avc_types.h
edia/libstagefright/codecs/avc/common/include/avcapi_common.h
edia/libstagefright/codecs/avc/common/include/avcint_common.h
edia/libstagefright/codecs/avc/common/include/avclib_common.h
edia/libstagefright/codecs/avc/common/src/deblock.cpp
edia/libstagefright/codecs/avc/common/src/dpb.cpp
edia/libstagefright/codecs/avc/common/src/fmo.cpp
edia/libstagefright/codecs/avc/common/src/mb_access.cpp
edia/libstagefright/codecs/avc/common/src/reflist.cpp
edia/libstagefright/codecs/avc/dec/AVCDecoder.cpp
edia/libstagefright/codecs/avc/dec/Android.mk
edia/libstagefright/codecs/avc/dec/include/avcdec_api.h
edia/libstagefright/codecs/avc/dec/include/pvavcdecoder.h
edia/libstagefright/codecs/avc/dec/include/pvavcdecoder_factory.h
edia/libstagefright/codecs/avc/dec/include/pvavcdecoderinterface.h
edia/libstagefright/codecs/avc/dec/src/avc_bitstream.cpp
edia/libstagefright/codecs/avc/dec/src/avcdec_api.cpp
edia/libstagefright/codecs/avc/dec/src/avcdec_bitstream.h
edia/libstagefright/codecs/avc/dec/src/avcdec_int.h
edia/libstagefright/codecs/avc/dec/src/avcdec_lib.h
edia/libstagefright/codecs/avc/dec/src/header.cpp
edia/libstagefright/codecs/avc/dec/src/itrans.cpp
edia/libstagefright/codecs/avc/dec/src/pred_inter.cpp
edia/libstagefright/codecs/avc/dec/src/pred_intra.cpp
edia/libstagefright/codecs/avc/dec/src/residual.cpp
edia/libstagefright/codecs/avc/dec/src/slice.cpp
edia/libstagefright/codecs/avc/dec/src/vlc.cpp
edia/libstagefright/codecs/avc/patent_disclaimer.txt
edia/libstagefright/codecs/mp3dec/Android.mk
edia/libstagefright/include/AVCDecoder.h
|
| 8bb472261e8e98058df85158b241244f32fff333 |
10-Dec-2009 |
Andreas Huber <andih@google.com> |
am 23915ddd: am eec100b2: Merge change If0d04246 into eclair-mr2
Merge commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0'
* commit '23915ddde9ce3ed9f1ce50ea321c8fdce612faf0':
Don't count empty buffers when computing the frame rate.
|
| 496dd58cdce4cabfe11c8564bfb3314d0daba3d4 |
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.
|
| caba7feb26a5efb34b7a701151cb9f714b39bc55 |
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.
|
| 33b949589e96386fd293f02ea1f41f785f211306 |
10-Dec-2009 |
Andreas Huber <andih@google.com> |
am eec100b2: Merge change If0d04246 into eclair-mr2
Merge commit 'eec100b2f44caaea048d3abd898df3c7308865d5' into eclair-mr2-plus-aosp
* commit 'eec100b2f44caaea048d3abd898df3c7308865d5':
Don't count empty buffers when computing the frame rate.
|
| df08a8102aa0721afec6df5db8f5742f5542473c |
10-Dec-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change If0d04246 into eclair-mr2
* changes:
Don't count empty buffers when computing the frame rate.
|
| ec2745938d212671e1a24726a9998f2f1768c2fd |
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.
|
| 20352a300f84516ef615a023b7134733682b3223 |
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.
|
| 81cb6167536c5b81692462ee0638e2c219c232ea |
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.
|
| 29340b0706b7b65e441c47d6f0c83c344d516435 |
10-Dec-2009 |
Andreas Huber <andih@google.com> |
Adding copyright headers to recently introduced decoder source files.
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
|
| 4f1efc098cb5791c3e9f483f2af84aef70d2d0a0 |
09-Dec-2009 |
Andreas Huber <andih@google.com> |
Initial check in of AMR (NB and WB) decoders based on PV source code.
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/amrnb/Android.mk
edia/libstagefright/codecs/amrnb/common/Android.mk
edia/libstagefright/codecs/amrnb/common/include/abs_s.h
edia/libstagefright/codecs/amrnb/common/include/add.h
edia/libstagefright/codecs/amrnb/common/include/az_lsp.h
edia/libstagefright/codecs/amrnb/common/include/basic_op.h
edia/libstagefright/codecs/amrnb/common/include/basic_op_arm_gcc_v5.h
edia/libstagefright/codecs/amrnb/common/include/basic_op_arm_v5.h
edia/libstagefright/codecs/amrnb/common/include/basic_op_c_equivalent.h
edia/libstagefright/codecs/amrnb/common/include/basicop_malloc.h
edia/libstagefright/codecs/amrnb/common/include/bitno_tab.h
edia/libstagefright/codecs/amrnb/common/include/bitreorder_tab.h
edia/libstagefright/codecs/amrnb/common/include/bits2prm.h
edia/libstagefright/codecs/amrnb/common/include/bytesused.h
edia/libstagefright/codecs/amrnb/common/include/cnst.h
edia/libstagefright/codecs/amrnb/common/include/cnst_vad.h
edia/libstagefright/codecs/amrnb/common/include/copy.h
edia/libstagefright/codecs/amrnb/common/include/d_gain_c.h
edia/libstagefright/codecs/amrnb/common/include/d_gain_p.h
edia/libstagefright/codecs/amrnb/common/include/d_plsf.h
edia/libstagefright/codecs/amrnb/common/include/div_32.h
edia/libstagefright/codecs/amrnb/common/include/div_s.h
edia/libstagefright/codecs/amrnb/common/include/dtx_common_def.h
edia/libstagefright/codecs/amrnb/common/include/extract_h.h
edia/libstagefright/codecs/amrnb/common/include/extract_l.h
edia/libstagefright/codecs/amrnb/common/include/frame.h
edia/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
edia/libstagefright/codecs/amrnb/common/include/gc_pred.h
edia/libstagefright/codecs/amrnb/common/include/gmed_n.h
edia/libstagefright/codecs/amrnb/common/include/gsm_amr_typedefs.h
edia/libstagefright/codecs/amrnb/common/include/int_lpc.h
edia/libstagefright/codecs/amrnb/common/include/int_lsf.h
edia/libstagefright/codecs/amrnb/common/include/inv_sqrt.h
edia/libstagefright/codecs/amrnb/common/include/l_abs.h
edia/libstagefright/codecs/amrnb/common/include/l_add.h
edia/libstagefright/codecs/amrnb/common/include/l_add_c.h
edia/libstagefright/codecs/amrnb/common/include/l_comp.h
edia/libstagefright/codecs/amrnb/common/include/l_deposit_h.h
edia/libstagefright/codecs/amrnb/common/include/l_deposit_l.h
edia/libstagefright/codecs/amrnb/common/include/l_extract.h
edia/libstagefright/codecs/amrnb/common/include/l_mac.h
edia/libstagefright/codecs/amrnb/common/include/l_msu.h
edia/libstagefright/codecs/amrnb/common/include/l_mult.h
edia/libstagefright/codecs/amrnb/common/include/l_negate.h
edia/libstagefright/codecs/amrnb/common/include/l_shl.h
edia/libstagefright/codecs/amrnb/common/include/l_shr.h
edia/libstagefright/codecs/amrnb/common/include/l_shr_r.h
edia/libstagefright/codecs/amrnb/common/include/l_sub.h
edia/libstagefright/codecs/amrnb/common/include/log2.h
edia/libstagefright/codecs/amrnb/common/include/log2_norm.h
edia/libstagefright/codecs/amrnb/common/include/lsfwt.h
edia/libstagefright/codecs/amrnb/common/include/lsp.h
edia/libstagefright/codecs/amrnb/common/include/lsp_az.h
edia/libstagefright/codecs/amrnb/common/include/lsp_lsf.h
edia/libstagefright/codecs/amrnb/common/include/lsp_tab.h
edia/libstagefright/codecs/amrnb/common/include/mac_32.h
edia/libstagefright/codecs/amrnb/common/include/mode.h
edia/libstagefright/codecs/amrnb/common/include/mpy_32.h
edia/libstagefright/codecs/amrnb/common/include/mpy_32_16.h
edia/libstagefright/codecs/amrnb/common/include/mult.h
edia/libstagefright/codecs/amrnb/common/include/mult_r.h
edia/libstagefright/codecs/amrnb/common/include/n_proc.h
edia/libstagefright/codecs/amrnb/common/include/negate.h
edia/libstagefright/codecs/amrnb/common/include/norm_l.h
edia/libstagefright/codecs/amrnb/common/include/norm_s.h
edia/libstagefright/codecs/amrnb/common/include/oper_32b.h
edia/libstagefright/codecs/amrnb/common/include/p_ol_wgh.h
edia/libstagefright/codecs/amrnb/common/include/pow2.h
edia/libstagefright/codecs/amrnb/common/include/pred_lt.h
edia/libstagefright/codecs/amrnb/common/include/pvgsmamr.h
edia/libstagefright/codecs/amrnb/common/include/q_plsf.h
edia/libstagefright/codecs/amrnb/common/include/q_plsf_3_tbl.h
edia/libstagefright/codecs/amrnb/common/include/q_plsf_5_tbl.h
edia/libstagefright/codecs/amrnb/common/include/qgain475_tab.h
edia/libstagefright/codecs/amrnb/common/include/qua_gain.h
edia/libstagefright/codecs/amrnb/common/include/qua_gain_tbl.h
edia/libstagefright/codecs/amrnb/common/include/reorder.h
edia/libstagefright/codecs/amrnb/common/include/residu.h
edia/libstagefright/codecs/amrnb/common/include/reverse_bits.h
edia/libstagefright/codecs/amrnb/common/include/round.h
edia/libstagefright/codecs/amrnb/common/include/set_zero.h
edia/libstagefright/codecs/amrnb/common/include/shl.h
edia/libstagefright/codecs/amrnb/common/include/shr.h
edia/libstagefright/codecs/amrnb/common/include/shr_r.h
edia/libstagefright/codecs/amrnb/common/include/sqrt_l.h
edia/libstagefright/codecs/amrnb/common/include/sub.h
edia/libstagefright/codecs/amrnb/common/include/syn_filt.h
edia/libstagefright/codecs/amrnb/common/include/typedef.h
edia/libstagefright/codecs/amrnb/common/include/vad.h
edia/libstagefright/codecs/amrnb/common/include/vad1.h
edia/libstagefright/codecs/amrnb/common/include/vad2.h
edia/libstagefright/codecs/amrnb/common/include/weight_a.h
edia/libstagefright/codecs/amrnb/common/include/window_tab.h
edia/libstagefright/codecs/amrnb/common/include/wmf_to_ets.h
edia/libstagefright/codecs/amrnb/common/pvgsmamrdecoderinterface.h
edia/libstagefright/codecs/amrnb/common/src/add.cpp
edia/libstagefright/codecs/amrnb/common/src/az_lsp.cpp
edia/libstagefright/codecs/amrnb/common/src/bitno_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/bits2prm.cpp
edia/libstagefright/codecs/amrnb/common/src/bytesused.cpp
edia/libstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/copy.cpp
edia/libstagefright/codecs/amrnb/common/src/div_32.cpp
edia/libstagefright/codecs/amrnb/common/src/div_s.cpp
edia/libstagefright/codecs/amrnb/common/src/extract_h.cpp
edia/libstagefright/codecs/amrnb/common/src/extract_l.cpp
edia/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/gc_pred.cpp
edia/libstagefright/codecs/amrnb/common/src/gmed_n.cpp
edia/libstagefright/codecs/amrnb/common/src/gray_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/grid_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/int_lpc.cpp
edia/libstagefright/codecs/amrnb/common/src/inv_sqrt.cpp
edia/libstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/l_abs.cpp
edia/libstagefright/codecs/amrnb/common/src/l_deposit_h.cpp
edia/libstagefright/codecs/amrnb/common/src/l_deposit_l.cpp
edia/libstagefright/codecs/amrnb/common/src/l_shr_r.cpp
edia/libstagefright/codecs/amrnb/common/src/log2.cpp
edia/libstagefright/codecs/amrnb/common/src/log2_norm.cpp
edia/libstagefright/codecs/amrnb/common/src/log2_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/lsfwt.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp_az.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp_lsf.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/lsp_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/mult_r.cpp
edia/libstagefright/codecs/amrnb/common/src/negate.cpp
edia/libstagefright/codecs/amrnb/common/src/norm_l.cpp
edia/libstagefright/codecs/amrnb/common/src/norm_s.cpp
edia/libstagefright/codecs/amrnb/common/src/overflow_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp
edia/libstagefright/codecs/amrnb/common/src/pow2.cpp
edia/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/pred_lt.cpp
edia/libstagefright/codecs/amrnb/common/src/q_plsf.cpp
edia/libstagefright/codecs/amrnb/common/src/q_plsf_3.cpp
edia/libstagefright/codecs/amrnb/common/src/q_plsf_3_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/q_plsf_5.cpp
edia/libstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/reorder.cpp
edia/libstagefright/codecs/amrnb/common/src/residu.cpp
edia/libstagefright/codecs/amrnb/common/src/round.cpp
edia/libstagefright/codecs/amrnb/common/src/set_zero.cpp
edia/libstagefright/codecs/amrnb/common/src/shr.cpp
edia/libstagefright/codecs/amrnb/common/src/shr_r.cpp
edia/libstagefright/codecs/amrnb/common/src/sqrt_l.cpp
edia/libstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp
edia/libstagefright/codecs/amrnb/common/src/sub.cpp
edia/libstagefright/codecs/amrnb/common/src/syn_filt.cpp
edia/libstagefright/codecs/amrnb/common/src/vad1.cpp
edia/libstagefright/codecs/amrnb/common/src/weight_a.cpp
edia/libstagefright/codecs/amrnb/common/src/window_tab.cpp
edia/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp
edia/libstagefright/codecs/amrnb/dec/Android.mk
edia/libstagefright/codecs/amrnb/dec/include/pvamrnbdecoder_api.h
edia/libstagefright/codecs/amrnb/dec/src/a_refl.cpp
edia/libstagefright/codecs/amrnb/dec/src/a_refl.h
edia/libstagefright/codecs/amrnb/dec/src/agc.cpp
edia/libstagefright/codecs/amrnb/dec/src/agc.h
edia/libstagefright/codecs/amrnb/dec/src/amrdecode.cpp
edia/libstagefright/codecs/amrnb/dec/src/amrdecode.h
edia/libstagefright/codecs/amrnb/dec/src/b_cn_cod.cpp
edia/libstagefright/codecs/amrnb/dec/src/b_cn_cod.h
edia/libstagefright/codecs/amrnb/dec/src/bgnscd.cpp
edia/libstagefright/codecs/amrnb/dec/src/bgnscd.h
edia/libstagefright/codecs/amrnb/dec/src/c_g_aver.cpp
edia/libstagefright/codecs/amrnb/dec/src/c_g_aver.h
edia/libstagefright/codecs/amrnb/dec/src/d1035pf.cpp
edia/libstagefright/codecs/amrnb/dec/src/d1035pf.h
edia/libstagefright/codecs/amrnb/dec/src/d2_11pf.cpp
edia/libstagefright/codecs/amrnb/dec/src/d2_11pf.h
edia/libstagefright/codecs/amrnb/dec/src/d2_9pf.cpp
edia/libstagefright/codecs/amrnb/dec/src/d2_9pf.h
edia/libstagefright/codecs/amrnb/dec/src/d3_14pf.cpp
edia/libstagefright/codecs/amrnb/dec/src/d3_14pf.h
edia/libstagefright/codecs/amrnb/dec/src/d4_17pf.cpp
edia/libstagefright/codecs/amrnb/dec/src/d4_17pf.h
edia/libstagefright/codecs/amrnb/dec/src/d8_31pf.cpp
edia/libstagefright/codecs/amrnb/dec/src/d8_31pf.h
edia/libstagefright/codecs/amrnb/dec/src/d_gain_c.cpp
edia/libstagefright/codecs/amrnb/dec/src/d_gain_p.cpp
edia/libstagefright/codecs/amrnb/dec/src/d_plsf.cpp
edia/libstagefright/codecs/amrnb/dec/src/d_plsf_3.cpp
edia/libstagefright/codecs/amrnb/dec/src/d_plsf_5.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_amr.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_amr.h
edia/libstagefright/codecs/amrnb/dec/src/dec_gain.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_gain.h
edia/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_lag3.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_lag3.h
edia/libstagefright/codecs/amrnb/dec/src/dec_lag6.cpp
edia/libstagefright/codecs/amrnb/dec/src/dec_lag6.h
edia/libstagefright/codecs/amrnb/dec/src/dtx_dec.cpp
edia/libstagefright/codecs/amrnb/dec/src/dtx_dec.h
edia/libstagefright/codecs/amrnb/dec/src/ec_gains.cpp
edia/libstagefright/codecs/amrnb/dec/src/ec_gains.h
edia/libstagefright/codecs/amrnb/dec/src/ex_ctrl.cpp
edia/libstagefright/codecs/amrnb/dec/src/ex_ctrl.h
edia/libstagefright/codecs/amrnb/dec/src/gsmamr_dec.h
edia/libstagefright/codecs/amrnb/dec/src/if2_to_ets.cpp
edia/libstagefright/codecs/amrnb/dec/src/if2_to_ets.h
edia/libstagefright/codecs/amrnb/dec/src/int_lsf.cpp
edia/libstagefright/codecs/amrnb/dec/src/lsp_avg.cpp
edia/libstagefright/codecs/amrnb/dec/src/lsp_avg.h
edia/libstagefright/codecs/amrnb/dec/src/ph_disp.cpp
edia/libstagefright/codecs/amrnb/dec/src/ph_disp.h
edia/libstagefright/codecs/amrnb/dec/src/post_pro.cpp
edia/libstagefright/codecs/amrnb/dec/src/post_pro.h
edia/libstagefright/codecs/amrnb/dec/src/preemph.cpp
edia/libstagefright/codecs/amrnb/dec/src/preemph.h
edia/libstagefright/codecs/amrnb/dec/src/pstfilt.cpp
edia/libstagefright/codecs/amrnb/dec/src/pstfilt.h
edia/libstagefright/codecs/amrnb/dec/src/pvgsmamrdecoder.cpp
edia/libstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp
edia/libstagefright/codecs/amrnb/dec/src/sp_dec.cpp
edia/libstagefright/codecs/amrnb/dec/src/sp_dec.h
edia/libstagefright/codecs/amrnb/dec/src/wmf_to_ets.cpp
edia/libstagefright/codecs/amrnb/patent_disclaimer.txt
edia/libstagefright/codecs/amrwb/AMRWBDecoder.cpp
edia/libstagefright/codecs/amrwb/Android.mk
edia/libstagefright/codecs/amrwb/include/pvamrwbdecoder_api.h
edia/libstagefright/codecs/amrwb/patent_disclaimer.txt
edia/libstagefright/codecs/amrwb/src/agc2_amr_wb.cpp
edia/libstagefright/codecs/amrwb/src/band_pass_6k_7k.cpp
edia/libstagefright/codecs/amrwb/src/dec_acelp_2p_in_64.cpp
edia/libstagefright/codecs/amrwb/src/dec_acelp_4p_in_64.cpp
edia/libstagefright/codecs/amrwb/src/dec_alg_codebook.cpp
edia/libstagefright/codecs/amrwb/src/dec_gain2_amr_wb.cpp
edia/libstagefright/codecs/amrwb/src/deemphasis_32.cpp
edia/libstagefright/codecs/amrwb/src/dtx.h
edia/libstagefright/codecs/amrwb/src/dtx_decoder_amr_wb.cpp
edia/libstagefright/codecs/amrwb/src/e_pv_amrwbdec.h
edia/libstagefright/codecs/amrwb/src/get_amr_wb_bits.cpp
edia/libstagefright/codecs/amrwb/src/get_amr_wb_bits.h
edia/libstagefright/codecs/amrwb/src/highpass_400hz_at_12k8.cpp
edia/libstagefright/codecs/amrwb/src/highpass_50hz_at_12k8.cpp
edia/libstagefright/codecs/amrwb/src/homing_amr_wb_dec.cpp
edia/libstagefright/codecs/amrwb/src/interpolate_isp.cpp
edia/libstagefright/codecs/amrwb/src/isf_extrapolation.cpp
edia/libstagefright/codecs/amrwb/src/isp_az.cpp
edia/libstagefright/codecs/amrwb/src/isp_isf.cpp
edia/libstagefright/codecs/amrwb/src/lagconceal.cpp
edia/libstagefright/codecs/amrwb/src/low_pass_filt_7k.cpp
edia/libstagefright/codecs/amrwb/src/median5.cpp
edia/libstagefright/codecs/amrwb/src/mime_io.cpp
edia/libstagefright/codecs/amrwb/src/mime_io.h
edia/libstagefright/codecs/amrwb/src/noise_gen_amrwb.cpp
edia/libstagefright/codecs/amrwb/src/normalize_amr_wb.cpp
edia/libstagefright/codecs/amrwb/src/normalize_amr_wb.h
edia/libstagefright/codecs/amrwb/src/oversamp_12k8_to_16k.cpp
edia/libstagefright/codecs/amrwb/src/phase_dispersion.cpp
edia/libstagefright/codecs/amrwb/src/pit_shrp.cpp
edia/libstagefright/codecs/amrwb/src/pred_lt4.cpp
edia/libstagefright/codecs/amrwb/src/preemph_amrwb_dec.cpp
edia/libstagefright/codecs/amrwb/src/pv_amr_wb_type_defs.h
edia/libstagefright/codecs/amrwb/src/pvamrwb_math_op.cpp
edia/libstagefright/codecs/amrwb/src/pvamrwb_math_op.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder.cpp
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder_acelp.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_armv5.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_cequivalent.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder_basic_op_gcc_armv5.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder_cnst.h
edia/libstagefright/codecs/amrwb/src/pvamrwbdecoder_mem_funcs.h
edia/libstagefright/codecs/amrwb/src/q_gain2_tab.cpp
edia/libstagefright/codecs/amrwb/src/q_pulse.h
edia/libstagefright/codecs/amrwb/src/qisf_ns.cpp
edia/libstagefright/codecs/amrwb/src/qisf_ns.h
edia/libstagefright/codecs/amrwb/src/qisf_ns_tab.cpp
edia/libstagefright/codecs/amrwb/src/qpisf_2s.cpp
edia/libstagefright/codecs/amrwb/src/qpisf_2s.h
edia/libstagefright/codecs/amrwb/src/qpisf_2s_tab.cpp
edia/libstagefright/codecs/amrwb/src/scale_signal.cpp
edia/libstagefright/codecs/amrwb/src/synthesis_amr_wb.cpp
edia/libstagefright/codecs/amrwb/src/synthesis_amr_wb.h
edia/libstagefright/codecs/amrwb/src/voice_factor.cpp
edia/libstagefright/codecs/amrwb/src/wb_syn_filt.cpp
edia/libstagefright/codecs/amrwb/src/weight_amrwb_lpc.cpp
edia/libstagefright/include/AMRNBDecoder.h
edia/libstagefright/include/AMRWBDecoder.h
|
| ab0f94d68bcb74547c8191bd4c47a9ad1b7c7c48 |
10-Dec-2009 |
Andreas Huber <andih@google.com> |
Don't count empty buffers when computing the frame rate.
mds/stagefright/stagefright.cpp
|
| 5849b361ce5d0ce234133deeedd239bd95285d39 |
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.
|
| 3c378c08d79c683f8ce96c95bd9c03fd697dc8f6 |
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.
|
| 29bc460239a77c3d655b9e39ccc76775a9a62cd6 |
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.
|
| 9ae95bea0082dc2c34bfb242c7fc936c98460d2b |
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)...
|
| 9d1447eddd8128f73640cc11ef5aa0b04abaaf5d |
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.
|
| 8eb8011120a68a86199b9960cf1ae91a6ddc7e6d |
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.
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 017016d80628e5cb95c43adaf26acfc5158c0a72 |
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.
|
| 366455da889b506d697ac843a27995671cdc5e32 |
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.
|
| 1f384fe9ca5c0f10a21a5f4ef5d6ee7f505de3c2 |
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.
|
| 43fe9f904dcb449d139b4dd7ab91e86172161140 |
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)...
|
| 3bf324bd45607c9e2c36cc95e2f9c01fd4af13df |
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
|
| c54176addef15699a518b69cd6bbd40ffc95e72e |
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.
edia/libstagefright/codecs/mp3dec/Android.mk
|
| 35dd25795bb83d41c1022b1aefe890ffc00e9a35 |
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.
|
| edf4e6f02b54481ecd74bbdb51e3f5e3db0f53ff |
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.
|
| 48643f38c9e92dd0a3d4a31c293c954f3df4db1b |
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.
nclude/media/AudioSystem.h
|
| a05022d9297878db315e4c051df9963c7fec6ae1 |
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.
|
| e4c2f16cdaa4487ea97722b911787348b925c426 |
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.
|
| 7390e39f87ffce7d35cb0d950ef23be46c466bc5 |
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.
|
| bd874a801dbce8a2bb165703736b01043a8d9cc0 |
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.
|
| dbd23c10f1b3b0ea318d19b70c20c8ec1c9bf70d |
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.
|
| d912f4646ece79832f9d852b39eb6b0d836ccfc4 |
08-Dec-2009 |
Andreas Huber <andih@google.com> |
Note to self: Don't reverse the arguments to fseek(o)...
edia/libstagefright/FileSource.cpp
|
| ebd0d94d2619280f9871ef2d0965d95fb880404c |
08-Dec-2009 |
Andreas Huber <andih@google.com> |
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
edia/libstagefright/include/AACDecoder.h
|
| 541962997b4076da11546619f082467ffd9bcd1f |
08-Dec-2009 |
Andreas Huber <andih@google.com> |
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
edia/libstagefright/MP3Extractor.cpp
|
| 2bf67b4ea453e7e5628641904600637c40e92f08 |
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.
|
| 84cfc9312f01b0324d3e85c6a0fab42de3d3333d |
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.
|
| d9618f23226f46c752e56f712bc4b505117d8b4b |
07-Dec-2009 |
Andreas Huber <andih@google.com> |
Initial checkin of stagefright MP3 audio decoder based on PV source code.
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/mp3dec/Android.mk
edia/libstagefright/codecs/mp3dec/MP3Decoder.cpp
edia/libstagefright/codecs/mp3dec/include/mp3_decoder_selection.h
edia/libstagefright/codecs/mp3dec/include/pvmp3_audio_type_defs.h
edia/libstagefright/codecs/mp3dec/include/pvmp3decoder_api.h
edia/libstagefright/codecs/mp3dec/patent_disclaimer.txt
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_16_gcc.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_9_arm.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_dct_9_gcc.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_arm.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_gcc.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_mdct_18_wm.asm
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_arm.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_gcc.s
edia/libstagefright/codecs/mp3dec/src/asm/pvmp3_polyphase_filter_window_wm.asm
edia/libstagefright/codecs/mp3dec/src/mp3_mem_funcs.h
edia/libstagefright/codecs/mp3dec/src/pv_mp3_huffman.h
edia/libstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op.h
edia/libstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm.h
edia/libstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_arm_gcc.h
edia/libstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_c_equivalent.h
edia/libstagefright/codecs/mp3dec/src/pv_mp3dec_fxd_op_msc_evc.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_alias_reduction.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_alias_reduction.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_crc.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_crc.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_dct_16.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_dct_16.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_dct_6.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_dct_9.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_dec_defs.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_decode_huff_cw.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_decode_huff_cw.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_dequantize_sample.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_dequantize_sample.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_equalizer.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_equalizer.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_framedecoder.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_get_main_data_size.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_get_main_data_size.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_get_scale_factors.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_get_scale_factors.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_getbits.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_getbits.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_huffman_decoding.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_huffman_parsing.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_imdct_synth.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_imdct_synth.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_mdct_18.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_mdct_18.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_mdct_6.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_mdct_6.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_data.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_mpeg2_get_scale_factors.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_mpeg2_stereo_proc.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_normalize.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_normalize.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_poly_phase_synthesis.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_polyphase_filter_window.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_polyphase_filter_window.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_reorder.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_reorder.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_seek_synch.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_seek_synch.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_stereo_proc.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_stereo_proc.h
edia/libstagefright/codecs/mp3dec/src/pvmp3_tables.cpp
edia/libstagefright/codecs/mp3dec/src/pvmp3_tables.h
edia/libstagefright/codecs/mp3dec/src/s_huffcodetab.h
edia/libstagefright/codecs/mp3dec/src/s_mp3bits.h
edia/libstagefright/codecs/mp3dec/src/s_tmp3dec_chan.h
edia/libstagefright/codecs/mp3dec/src/s_tmp3dec_file.h
edia/libstagefright/include/MP3Decoder.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
edia/libstagefright/omx/mp3dec/Android.mk
edia/libstagefright/omx/mp3dec/MP3Decoder.cpp
edia/libstagefright/omx/mp3dec/MP3Decoder.h
|
| 107aebf3bedb3725bb7d36b4772fca65e444ce1a |
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.
|
| 92616b5655b7aef260480f60f2aabf98e821c8f3 |
07-Dec-2009 |
Andreas Huber <andih@google.com> |
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
|
| a0708be5ff00b7a185b1ae1186e5c83cbf9bd545 |
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.
|
| 4659bf204c5b82af9c0d931b3173d1d7c9c7a822 |
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.
|
| 08291637217fc2b791501394aa79f82104487e80 |
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.
|
| c4fbba6ab63b6fc1a60f6d91238291a73332091b |
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.
|
| a410d5a7150d6b14f98197e570c78ea7b6a65091 |
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.
|
| f44de515d3b6098a0b585865c1a0c7b20d3075a6 |
07-Dec-2009 |
Andreas Huber <andih@google.com> |
Initial check in of stagefright software AAC decoder based on PV source code.
edia/libstagefright/Android.mk
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/codecs/Android.mk
edia/libstagefright/codecs/aacdec/AACDecoder.cpp
edia/libstagefright/codecs/aacdec/Android.mk
edia/libstagefright/codecs/aacdec/aac_mem_funcs.h
edia/libstagefright/codecs/aacdec/analysis_sub_band.cpp
edia/libstagefright/codecs/aacdec/analysis_sub_band.h
edia/libstagefright/codecs/aacdec/apply_ms_synt.cpp
edia/libstagefright/codecs/aacdec/apply_ms_synt.h
edia/libstagefright/codecs/aacdec/apply_tns.cpp
edia/libstagefright/codecs/aacdec/apply_tns.h
edia/libstagefright/codecs/aacdec/bit_reversal_swap.h
edia/libstagefright/codecs/aacdec/buf_getbits.cpp
edia/libstagefright/codecs/aacdec/buf_getbits.h
edia/libstagefright/codecs/aacdec/buffer_normalization.h
edia/libstagefright/codecs/aacdec/byte_align.cpp
edia/libstagefright/codecs/aacdec/calc_auto_corr.cpp
edia/libstagefright/codecs/aacdec/calc_auto_corr.h
edia/libstagefright/codecs/aacdec/calc_gsfb_table.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_anafilterbank.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_anafilterbank.h
edia/libstagefright/codecs/aacdec/calc_sbr_envelope.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_envelope.h
edia/libstagefright/codecs/aacdec/calc_sbr_synfilterbank.cpp
edia/libstagefright/codecs/aacdec/calc_sbr_synfilterbank.h
edia/libstagefright/codecs/aacdec/chans.h
edia/libstagefright/codecs/aacdec/check_crc.cpp
edia/libstagefright/codecs/aacdec/check_crc.h
edia/libstagefright/codecs/aacdec/dct16.cpp
edia/libstagefright/codecs/aacdec/dct16.h
edia/libstagefright/codecs/aacdec/dct64.cpp
edia/libstagefright/codecs/aacdec/dct64.h
edia/libstagefright/codecs/aacdec/decode_huff_cw_binary.cpp
edia/libstagefright/codecs/aacdec/decode_noise_floorlevels.cpp
edia/libstagefright/codecs/aacdec/decode_noise_floorlevels.h
edia/libstagefright/codecs/aacdec/deinterleave.cpp
edia/libstagefright/codecs/aacdec/digit_reversal_tables.cpp
edia/libstagefright/codecs/aacdec/digit_reversal_tables.h
edia/libstagefright/codecs/aacdec/dst16.cpp
edia/libstagefright/codecs/aacdec/dst16.h
edia/libstagefright/codecs/aacdec/dst32.cpp
edia/libstagefright/codecs/aacdec/dst32.h
edia/libstagefright/codecs/aacdec/dst8.cpp
edia/libstagefright/codecs/aacdec/dst8.h
edia/libstagefright/codecs/aacdec/e_adif_const.h
edia/libstagefright/codecs/aacdec/e_blockswitching.h
edia/libstagefright/codecs/aacdec/e_coupling_mode.h
edia/libstagefright/codecs/aacdec/e_elementid.h
edia/libstagefright/codecs/aacdec/e_huffmanconst.h
edia/libstagefright/codecs/aacdec/e_infoinitconst.h
edia/libstagefright/codecs/aacdec/e_invf_mode.h
edia/libstagefright/codecs/aacdec/e_maskstatus.h
edia/libstagefright/codecs/aacdec/e_mp4ff_const.h
edia/libstagefright/codecs/aacdec/e_progconfigconst.h
edia/libstagefright/codecs/aacdec/e_rawbitstreamconst.h
edia/libstagefright/codecs/aacdec/e_sbr_element_id.h
edia/libstagefright/codecs/aacdec/e_sbr_error.h
edia/libstagefright/codecs/aacdec/e_sbr_header_status.h
edia/libstagefright/codecs/aacdec/e_sbr_master_status.h
edia/libstagefright/codecs/aacdec/e_sbr_sync_state.h
edia/libstagefright/codecs/aacdec/e_sr_mode.h
edia/libstagefright/codecs/aacdec/e_tmp4audioobjecttype.h
edia/libstagefright/codecs/aacdec/e_tns_const.h
edia/libstagefright/codecs/aacdec/e_window_sequence.h
edia/libstagefright/codecs/aacdec/e_window_shape.h
edia/libstagefright/codecs/aacdec/esc_iquant_scaling.cpp
edia/libstagefright/codecs/aacdec/esc_iquant_scaling.h
edia/libstagefright/codecs/aacdec/extractframeinfo.cpp
edia/libstagefright/codecs/aacdec/extractframeinfo.h
edia/libstagefright/codecs/aacdec/fft_rx4.h
edia/libstagefright/codecs/aacdec/fft_rx4_long.cpp
edia/libstagefright/codecs/aacdec/fft_rx4_short.cpp
edia/libstagefright/codecs/aacdec/fft_rx4_tables_fxp.cpp
edia/libstagefright/codecs/aacdec/find_adts_syncword.cpp
edia/libstagefright/codecs/aacdec/find_adts_syncword.h
edia/libstagefright/codecs/aacdec/fwd_long_complex_rot.cpp
edia/libstagefright/codecs/aacdec/fwd_long_complex_rot.h
edia/libstagefright/codecs/aacdec/fwd_short_complex_rot.cpp
edia/libstagefright/codecs/aacdec/fwd_short_complex_rot.h
edia/libstagefright/codecs/aacdec/fxp_mul32.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_gcc.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_v4.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_v4_gcc.h
edia/libstagefright/codecs/aacdec/fxp_mul32_arm_v5.h
edia/libstagefright/codecs/aacdec/fxp_mul32_c_equivalent.h
edia/libstagefright/codecs/aacdec/fxp_mul32_c_msc_evc.h
edia/libstagefright/codecs/aacdec/fxp_mul32_c_msc_evc_armv5.h
edia/libstagefright/codecs/aacdec/fxp_mul32_pentium.h
edia/libstagefright/codecs/aacdec/gen_rand_vector.cpp
edia/libstagefright/codecs/aacdec/gen_rand_vector.h
edia/libstagefright/codecs/aacdec/get_adif_header.cpp
edia/libstagefright/codecs/aacdec/get_adif_header.h
edia/libstagefright/codecs/aacdec/get_adts_header.cpp
edia/libstagefright/codecs/aacdec/get_adts_header.h
edia/libstagefright/codecs/aacdec/get_audio_specific_config.cpp
edia/libstagefright/codecs/aacdec/get_audio_specific_config.h
edia/libstagefright/codecs/aacdec/get_dse.cpp
edia/libstagefright/codecs/aacdec/get_dse.h
edia/libstagefright/codecs/aacdec/get_ele_list.cpp
edia/libstagefright/codecs/aacdec/get_ele_list.h
edia/libstagefright/codecs/aacdec/get_ga_specific_config.cpp
edia/libstagefright/codecs/aacdec/get_ga_specific_config.h
edia/libstagefright/codecs/aacdec/get_ics_info.cpp
edia/libstagefright/codecs/aacdec/get_ics_info.h
edia/libstagefright/codecs/aacdec/get_prog_config.cpp
edia/libstagefright/codecs/aacdec/get_prog_config.h
edia/libstagefright/codecs/aacdec/get_pulse_data.cpp
edia/libstagefright/codecs/aacdec/get_pulse_data.h
edia/libstagefright/codecs/aacdec/get_sbr_bitstream.cpp
edia/libstagefright/codecs/aacdec/get_sbr_bitstream.h
edia/libstagefright/codecs/aacdec/get_sbr_startfreq.cpp
edia/libstagefright/codecs/aacdec/get_sbr_startfreq.h
edia/libstagefright/codecs/aacdec/get_sbr_stopfreq.cpp
edia/libstagefright/codecs/aacdec/get_sbr_stopfreq.h
edia/libstagefright/codecs/aacdec/get_sign_bits.h
edia/libstagefright/codecs/aacdec/get_tns.cpp
edia/libstagefright/codecs/aacdec/get_tns.h
edia/libstagefright/codecs/aacdec/getbits.h
edia/libstagefright/codecs/aacdec/getfill.cpp
edia/libstagefright/codecs/aacdec/getfill.h
edia/libstagefright/codecs/aacdec/getgroup.cpp
edia/libstagefright/codecs/aacdec/getics.cpp
edia/libstagefright/codecs/aacdec/getmask.cpp
edia/libstagefright/codecs/aacdec/hcbtables.h
edia/libstagefright/codecs/aacdec/hcbtables_binary.cpp
edia/libstagefright/codecs/aacdec/huffcb.cpp
edia/libstagefright/codecs/aacdec/huffdecode.cpp
edia/libstagefright/codecs/aacdec/hufffac.cpp
edia/libstagefright/codecs/aacdec/huffman.h
edia/libstagefright/codecs/aacdec/huffspec_fxp.cpp
edia/libstagefright/codecs/aacdec/ibstream.h
edia/libstagefright/codecs/aacdec/idct16.cpp
edia/libstagefright/codecs/aacdec/idct16.h
edia/libstagefright/codecs/aacdec/idct32.cpp
edia/libstagefright/codecs/aacdec/idct32.h
edia/libstagefright/codecs/aacdec/idct8.cpp
edia/libstagefright/codecs/aacdec/idct8.h
edia/libstagefright/codecs/aacdec/imdct_fxp.cpp
edia/libstagefright/codecs/aacdec/imdct_fxp.h
edia/libstagefright/codecs/aacdec/infoinit.cpp
edia/libstagefright/codecs/aacdec/init_sbr_dec.cpp
edia/libstagefright/codecs/aacdec/init_sbr_dec.h
edia/libstagefright/codecs/aacdec/intensity_right.cpp
edia/libstagefright/codecs/aacdec/intensity_right.h
edia/libstagefright/codecs/aacdec/inv_long_complex_rot.cpp
edia/libstagefright/codecs/aacdec/inv_long_complex_rot.h
edia/libstagefright/codecs/aacdec/inv_short_complex_rot.cpp
edia/libstagefright/codecs/aacdec/inv_short_complex_rot.h
edia/libstagefright/codecs/aacdec/iquant_table.cpp
edia/libstagefright/codecs/aacdec/iquant_table.h
edia/libstagefright/codecs/aacdec/long_term_prediction.cpp
edia/libstagefright/codecs/aacdec/long_term_prediction.h
edia/libstagefright/codecs/aacdec/long_term_synthesis.cpp
edia/libstagefright/codecs/aacdec/long_term_synthesis.h
edia/libstagefright/codecs/aacdec/lt_decode.cpp
edia/libstagefright/codecs/aacdec/lt_decode.h
edia/libstagefright/codecs/aacdec/lt_prediction.h
edia/libstagefright/codecs/aacdec/ltp_common_internal.h
edia/libstagefright/codecs/aacdec/mdct_fxp.cpp
edia/libstagefright/codecs/aacdec/mdct_fxp.h
edia/libstagefright/codecs/aacdec/mdct_tables_fxp.cpp
edia/libstagefright/codecs/aacdec/mdst.cpp
edia/libstagefright/codecs/aacdec/mdst.h
edia/libstagefright/codecs/aacdec/mix_radix_fft.cpp
edia/libstagefright/codecs/aacdec/mix_radix_fft.h
edia/libstagefright/codecs/aacdec/ms_map_mask.h
edia/libstagefright/codecs/aacdec/ms_synt.cpp
edia/libstagefright/codecs/aacdec/ms_synt.h
edia/libstagefright/codecs/aacdec/pns_corr.cpp
edia/libstagefright/codecs/aacdec/pns_corr.h
edia/libstagefright/codecs/aacdec/pns_intensity_right.cpp
edia/libstagefright/codecs/aacdec/pns_intensity_right.h
edia/libstagefright/codecs/aacdec/pns_left.cpp
edia/libstagefright/codecs/aacdec/pns_left.h
edia/libstagefright/codecs/aacdec/ps_all_pass_filter_coeff.cpp
edia/libstagefright/codecs/aacdec/ps_all_pass_filter_coeff.h
edia/libstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.cpp
edia/libstagefright/codecs/aacdec/ps_all_pass_fract_delay_filter.h
edia/libstagefright/codecs/aacdec/ps_allocate_decoder.cpp
edia/libstagefright/codecs/aacdec/ps_allocate_decoder.h
edia/libstagefright/codecs/aacdec/ps_applied.cpp
edia/libstagefright/codecs/aacdec/ps_applied.h
edia/libstagefright/codecs/aacdec/ps_bstr_decoding.cpp
edia/libstagefright/codecs/aacdec/ps_bstr_decoding.h
edia/libstagefright/codecs/aacdec/ps_channel_filtering.cpp
edia/libstagefright/codecs/aacdec/ps_channel_filtering.h
edia/libstagefright/codecs/aacdec/ps_constants.h
edia/libstagefright/codecs/aacdec/ps_decode_bs_utils.cpp
edia/libstagefright/codecs/aacdec/ps_decode_bs_utils.h
edia/libstagefright/codecs/aacdec/ps_decorrelate.cpp
edia/libstagefright/codecs/aacdec/ps_decorrelate.h
edia/libstagefright/codecs/aacdec/ps_fft_rx8.cpp
edia/libstagefright/codecs/aacdec/ps_fft_rx8.h
edia/libstagefright/codecs/aacdec/ps_hybrid_analysis.cpp
edia/libstagefright/codecs/aacdec/ps_hybrid_analysis.h
edia/libstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.cpp
edia/libstagefright/codecs/aacdec/ps_hybrid_filter_bank_allocation.h
edia/libstagefright/codecs/aacdec/ps_hybrid_synthesis.cpp
edia/libstagefright/codecs/aacdec/ps_hybrid_synthesis.h
edia/libstagefright/codecs/aacdec/ps_init_stereo_mixing.cpp
edia/libstagefright/codecs/aacdec/ps_init_stereo_mixing.h
edia/libstagefright/codecs/aacdec/ps_pwr_transient_detection.cpp
edia/libstagefright/codecs/aacdec/ps_pwr_transient_detection.h
edia/libstagefright/codecs/aacdec/ps_read_data.cpp
edia/libstagefright/codecs/aacdec/ps_read_data.h
edia/libstagefright/codecs/aacdec/ps_stereo_processing.cpp
edia/libstagefright/codecs/aacdec/ps_stereo_processing.h
edia/libstagefright/codecs/aacdec/pulse_nc.cpp
edia/libstagefright/codecs/aacdec/pulse_nc.h
edia/libstagefright/codecs/aacdec/pv_audio_type_defs.h
edia/libstagefright/codecs/aacdec/pv_div.cpp
edia/libstagefright/codecs/aacdec/pv_div.h
edia/libstagefright/codecs/aacdec/pv_log2.cpp
edia/libstagefright/codecs/aacdec/pv_log2.h
edia/libstagefright/codecs/aacdec/pv_normalize.cpp
edia/libstagefright/codecs/aacdec/pv_normalize.h
edia/libstagefright/codecs/aacdec/pv_pow2.cpp
edia/libstagefright/codecs/aacdec/pv_pow2.h
edia/libstagefright/codecs/aacdec/pv_sine.cpp
edia/libstagefright/codecs/aacdec/pv_sine.h
edia/libstagefright/codecs/aacdec/pv_sqrt.cpp
edia/libstagefright/codecs/aacdec/pv_sqrt.h
edia/libstagefright/codecs/aacdec/pvmp4audiodecoder_api.h
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderconfig.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderframe.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecodergetmemrequirements.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderinitlibrary.cpp
edia/libstagefright/codecs/aacdec/pvmp4audiodecoderresetbuffer.cpp
edia/libstagefright/codecs/aacdec/pvmp4setaudioconfig.cpp
edia/libstagefright/codecs/aacdec/q_normalize.cpp
edia/libstagefright/codecs/aacdec/q_normalize.h
edia/libstagefright/codecs/aacdec/qmf_filterbank_coeff.cpp
edia/libstagefright/codecs/aacdec/qmf_filterbank_coeff.h
edia/libstagefright/codecs/aacdec/s_adif_header.h
edia/libstagefright/codecs/aacdec/s_bit_buffer.h
edia/libstagefright/codecs/aacdec/s_bits.h
edia/libstagefright/codecs/aacdec/s_ch_info.h
edia/libstagefright/codecs/aacdec/s_crc_buffer.h
edia/libstagefright/codecs/aacdec/s_elelist.h
edia/libstagefright/codecs/aacdec/s_frameinfo.h
edia/libstagefright/codecs/aacdec/s_hcb.h
edia/libstagefright/codecs/aacdec/s_huffman.h
edia/libstagefright/codecs/aacdec/s_hybrid.h
edia/libstagefright/codecs/aacdec/s_lt_pred_status.h
edia/libstagefright/codecs/aacdec/s_mc_info.h
edia/libstagefright/codecs/aacdec/s_mixdown.h
edia/libstagefright/codecs/aacdec/s_patch.h
edia/libstagefright/codecs/aacdec/s_progconfig.h
edia/libstagefright/codecs/aacdec/s_ps_dec.h
edia/libstagefright/codecs/aacdec/s_pulseinfo.h
edia/libstagefright/codecs/aacdec/s_sbr_channel.h
edia/libstagefright/codecs/aacdec/s_sbr_dec.h
edia/libstagefright/codecs/aacdec/s_sbr_element_stream.h
edia/libstagefright/codecs/aacdec/s_sbr_frame_data.h
edia/libstagefright/codecs/aacdec/s_sbr_header_data.h
edia/libstagefright/codecs/aacdec/s_sbrbitstream.h
edia/libstagefright/codecs/aacdec/s_sectinfo.h
edia/libstagefright/codecs/aacdec/s_sr_info.h
edia/libstagefright/codecs/aacdec/s_tdec_int_chan.h
edia/libstagefright/codecs/aacdec/s_tdec_int_file.h
edia/libstagefright/codecs/aacdec/s_tns_frame_info.h
edia/libstagefright/codecs/aacdec/s_tnsfilt.h
edia/libstagefright/codecs/aacdec/s_wnd_shape.h
edia/libstagefright/codecs/aacdec/sbr_aliasing_reduction.cpp
edia/libstagefright/codecs/aacdec/sbr_aliasing_reduction.h
edia/libstagefright/codecs/aacdec/sbr_applied.cpp
edia/libstagefright/codecs/aacdec/sbr_applied.h
edia/libstagefright/codecs/aacdec/sbr_code_book_envlevel.cpp
edia/libstagefright/codecs/aacdec/sbr_code_book_envlevel.h
edia/libstagefright/codecs/aacdec/sbr_constants.h
edia/libstagefright/codecs/aacdec/sbr_crc_check.cpp
edia/libstagefright/codecs/aacdec/sbr_crc_check.h
edia/libstagefright/codecs/aacdec/sbr_create_limiter_bands.cpp
edia/libstagefright/codecs/aacdec/sbr_create_limiter_bands.h
edia/libstagefright/codecs/aacdec/sbr_dec.cpp
edia/libstagefright/codecs/aacdec/sbr_dec.h
edia/libstagefright/codecs/aacdec/sbr_decode_envelope.cpp
edia/libstagefright/codecs/aacdec/sbr_decode_envelope.h
edia/libstagefright/codecs/aacdec/sbr_decode_huff_cw.cpp
edia/libstagefright/codecs/aacdec/sbr_decode_huff_cw.h
edia/libstagefright/codecs/aacdec/sbr_downsample_lo_res.cpp
edia/libstagefright/codecs/aacdec/sbr_downsample_lo_res.h
edia/libstagefright/codecs/aacdec/sbr_envelope_calc_tbl.cpp
edia/libstagefright/codecs/aacdec/sbr_envelope_calc_tbl.h
edia/libstagefright/codecs/aacdec/sbr_envelope_unmapping.cpp
edia/libstagefright/codecs/aacdec/sbr_envelope_unmapping.h
edia/libstagefright/codecs/aacdec/sbr_extract_extended_data.cpp
edia/libstagefright/codecs/aacdec/sbr_extract_extended_data.h
edia/libstagefright/codecs/aacdec/sbr_find_start_andstop_band.cpp
edia/libstagefright/codecs/aacdec/sbr_find_start_andstop_band.h
edia/libstagefright/codecs/aacdec/sbr_generate_high_freq.cpp
edia/libstagefright/codecs/aacdec/sbr_generate_high_freq.h
edia/libstagefright/codecs/aacdec/sbr_get_additional_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_additional_data.h
edia/libstagefright/codecs/aacdec/sbr_get_cpe.cpp
edia/libstagefright/codecs/aacdec/sbr_get_cpe.h
edia/libstagefright/codecs/aacdec/sbr_get_dir_control_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_dir_control_data.h
edia/libstagefright/codecs/aacdec/sbr_get_envelope.cpp
edia/libstagefright/codecs/aacdec/sbr_get_envelope.h
edia/libstagefright/codecs/aacdec/sbr_get_header_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_header_data.h
edia/libstagefright/codecs/aacdec/sbr_get_noise_floor_data.cpp
edia/libstagefright/codecs/aacdec/sbr_get_noise_floor_data.h
edia/libstagefright/codecs/aacdec/sbr_get_sce.cpp
edia/libstagefright/codecs/aacdec/sbr_get_sce.h
edia/libstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.cpp
edia/libstagefright/codecs/aacdec/sbr_inv_filt_levelemphasis.h
edia/libstagefright/codecs/aacdec/sbr_open.cpp
edia/libstagefright/codecs/aacdec/sbr_open.h
edia/libstagefright/codecs/aacdec/sbr_read_data.cpp
edia/libstagefright/codecs/aacdec/sbr_read_data.h
edia/libstagefright/codecs/aacdec/sbr_requantize_envelope_data.cpp
edia/libstagefright/codecs/aacdec/sbr_requantize_envelope_data.h
edia/libstagefright/codecs/aacdec/sbr_reset_dec.cpp
edia/libstagefright/codecs/aacdec/sbr_reset_dec.h
edia/libstagefright/codecs/aacdec/sbr_update_freq_scale.cpp
edia/libstagefright/codecs/aacdec/sbr_update_freq_scale.h
edia/libstagefright/codecs/aacdec/set_mc_info.cpp
edia/libstagefright/codecs/aacdec/set_mc_info.h
edia/libstagefright/codecs/aacdec/sfb.cpp
edia/libstagefright/codecs/aacdec/sfb.h
edia/libstagefright/codecs/aacdec/shellsort.cpp
edia/libstagefright/codecs/aacdec/shellsort.h
edia/libstagefright/codecs/aacdec/stereo_2_mono.h
edia/libstagefright/codecs/aacdec/synthesis_sub_band.cpp
edia/libstagefright/codecs/aacdec/synthesis_sub_band.h
edia/libstagefright/codecs/aacdec/tns_ar_filter.cpp
edia/libstagefright/codecs/aacdec/tns_ar_filter.h
edia/libstagefright/codecs/aacdec/tns_decode_coef.cpp
edia/libstagefright/codecs/aacdec/tns_decode_coef.h
edia/libstagefright/codecs/aacdec/tns_inv_filter.cpp
edia/libstagefright/codecs/aacdec/tns_inv_filter.h
edia/libstagefright/codecs/aacdec/trans4m_freq_2_time_fxp.cpp
edia/libstagefright/codecs/aacdec/trans4m_time_2_freq_fxp.cpp
edia/libstagefright/codecs/aacdec/unpack_idx.cpp
edia/libstagefright/codecs/aacdec/unpack_idx.h
edia/libstagefright/codecs/aacdec/window_block_fxp.h
edia/libstagefright/codecs/aacdec/window_tables_fxp.cpp
edia/libstagefright/codecs/aacdec/write_output.h
edia/libstagefright/include/AACDecoder.h
|
| 9ce05907d3a419ab70537892374306aa66bd1907 |
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.
|
| bf697e37550d9e8376089b0b5e498613bede798c |
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.
mds/stagefright/audioloop.cpp
mds/stagefright/record.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 148b266afe2ac92b5616c24e8d5160e6f9242f69 |
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.
edia/libmedia/AudioRecord.cpp
|
| 251949f53525e71659d4117446ba9fe72b3ea702 |
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.
|
| f0fb96c352f30b812a4903a1d783a715e1e817bd |
04-Dec-2009 |
Andreas Huber <andih@google.com> |
Enable proper cleanup of OMX nodes managed through stagefright.
nclude/media/stagefright/OMXPluginBase.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXMaster.cpp
edia/libstagefright/omx/OMXMaster.h
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/OMXPVCodecsPlugin.cpp
edia/libstagefright/omx/OMXPVCodecsPlugin.h
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.h
|
| c36af2d0e4f97d54f71d41328f67ec0e3bbea7e1 |
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
|
| 82f107c633cdb06d03b5dd706f0ddc6258931365 |
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.
|
| e4402499164d1a38fe0e5646116b7c57afe93487 |
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.
|
| ceb9ce6619e4d2c6ac15e211f6b88739bb9d927e |
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.
|
| aaaa915f304b339533ea30a0b7265c8f754e9787 |
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:
|
| ebf1f106065b4bb4316b33de5be85bc99eed435e |
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.
|
| ea918fe87cca343d143652d60d595443bbd8955d |
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.
|
| d0fec9cd4a04a6553b749cfd6748544ad3806df9 |
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
|
| adf7d77752b3dbd47badc8819aa2674860d6ccba |
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
|
| 05250b376f40325c56ae93e54a7f24617ec77b12 |
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.
|
| f28bdcfab1f79bc40587837a40f42f3ac0f041d0 |
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.
|
| 9c0674d1097a2fd1d52b75db2ed275664a4ecb83 |
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.
|
| 49096a039a16ea1cb2fc121c9de168be3f088e19 |
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:
|
| 4e1e4bfb43d14d867345da7e0680c4636f40f63b |
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.
|
| c9ffa992276a1aadb6a99a62417f5222daa03c2e |
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.
|
| 15478f3287c62a780d19b9059023331721bd4f4f |
04-Dec-2009 |
Andreas Huber <andih@google.com> |
Two more uses of strlcpy that break the sim build. Now fixed.
edia/libstagefright/omx/mp3dec/MP3Decoder.cpp
|
| 0ef47568ed93872feab423330b10a62a432decd5 |
04-Dec-2009 |
Andreas Huber <andih@google.com> |
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
|
| 97494da9d418b599fa1b9930487b90c978357634 |
04-Dec-2009 |
Andreas Huber <andih@google.com> |
I accidentally broke this code while refactoring MediaScanner. This is the fix.
edia/libmedia/StagefrightMediaScanner.cpp
|
| 572e6a5cea656c1df50f69df9730f2dc351308de |
03-Dec-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I74bf38a0 into eclair-mr2
* changes:
Squashed commit of the following:
|
| 413f523afe96aff02d2b0a7459127b8f67b2b43c |
03-Dec-2009 |
Andreas Huber <andih@google.com> |
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
nclude/media/mediascanner.h
edia/libmedia/Android.mk
edia/libmedia/MediaScanner.cpp
edia/libmedia/MediaScannerClient.cpp
edia/libmedia/StagefrightMediaScanner.cpp
edia/libmedia/StagefrightMediaScanner.h
edia/libmedia/autodetect.cpp
edia/libmedia/autodetect.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaRecorderClient.cpp
|
| e3ec3cec3a2e27033249ff82964d2cbd441d9873 |
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.
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/OMXPluginBase.h
edia/libstagefright/include/OMX.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXComponentBase.cpp
edia/libstagefright/omx/OMXComponentBase.h
edia/libstagefright/omx/OMXMaster.cpp
edia/libstagefright/omx/OMXMaster.h
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/OMXPVCodecsPlugin.cpp
edia/libstagefright/omx/OMXPVCodecsPlugin.h
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.cpp
edia/libstagefright/omx/OMXSoftwareCodecsPlugin.h
edia/libstagefright/omx/mp3dec/Android.mk
edia/libstagefright/omx/mp3dec/MP3Decoder.cpp
edia/libstagefright/omx/mp3dec/MP3Decoder.h
|
| 981594f5c3697c3330bdbd4bb5a743fb9f01e6ab |
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.
edia/libmedia/ToneGenerator.cpp
|
| 8908d616cc9d74f9fe2c17f1d8d9335ee28c290d |
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.
|
| 1d711f67ffb3ea73aca155537e0f21b444251158 |
03-Dec-2009 |
Dave Sparks <davidsparks@android.com> |
Remove old hack A/V sync hack that is no longer needed.
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 488745bb56bdbdad1bbc68585a73e7729f431d5a |
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).
|
| baeb6dddd1b848320457b9af8c5eb415b43f181a |
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).
|
| c297fccffc4ab1cb3b9f5c6a5b0802be057f3e0f |
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).
mds/stagefright/Android.mk
mds/stagefright/SineSource.cpp
mds/stagefright/audioloop.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 0f32c51a01f9b192bfb69408b06d90ee175df707 |
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.
|
| 666579b7effdaad8cde01d6de987cc065563b776 |
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.
|
| ab762493da1f36e41ba6239bd5b8fa1b8af293fa |
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.
|
| b2c6deda3922f0452dec2dfe107bea6a8b7d8d56 |
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.
|
| b32ee4efcbce49277d659238c12ee53abefe5384 |
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.
|
| 8943c6536ddf1420c202e3762932f2d167826218 |
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.
|
| a7c816c4bdb72cf4f9fe853a96cd7efdb394006d |
24-Nov-2009 |
Dave Sparks <davidsparks@android.com> |
am 16cc72bd: Fix simulator build.
Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2
* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
Fix simulator build.
|
| 827f3004421aacb6bceaf772ac825d4f2d3006e4 |
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.
|
| f311c557729099d002f4aae37c402a8287912369 |
24-Nov-2009 |
Dave Sparks <davidsparks@android.com> |
Fix simulator build.
edia/libmedia/IMediaMetadataRetriever.cpp
|
| ec4dde75955f87e5afea3f59ef991130257f3f3a |
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.
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
|
| 37aab2a2256eb1b315184caed8c13cdcb59f4fa0 |
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.
|
| daf8ef73da2f7633b61b98e86a3d6a638e0e9d26 |
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).
|
| 8c3097f8fb9ab6413c55a67b60b9ccb0841a2080 |
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.
|
| 95601ba21e9083d19306a719c94970194be327c4 |
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.
|
| e5d6df402da9b6c5577470abb81a5e6801bd7752 |
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.
edia/libstagefright/OMXCodec.cpp
|
| 1213d6f3c466bb77da198418e5f4653c4eca8ce1 |
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).
|
| f83d9a75c4616b2da4db7b1559e918fbf8709005 |
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).
|
| d78bc77da7dbb57c74b8840a75a1a57ad5af9b3a |
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.
|
| 738c4315859395bfeeaae3d4c9d6fb9f414778f1 |
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.
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OMXCodec.cpp
|
| 650773d00356129ffd661cdaef3fb3095c343707 |
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).
edia/libstagefright/AwesomePlayer.cpp
|
| ac568ceead51a51baf1a59f0205e16161606567a |
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:
|
| 72b0e78480f38f24607e6ddb7a118cac6c4f1107 |
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:
|
| bfa6b2d7a1be1832ac40ed90aece1834f720b5c6 |
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.
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
nclude/media/MediaPlayerInterface.h
nclude/media/stagefright/AudioPlayer.h
nclude/media/stagefright/MediaPlayerImpl.h
nclude/media/stagefright/MmapSource.h
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/AwesomePlayer.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/MmapSource.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/include/AMRExtractor.h
edia/libstagefright/include/AwesomePlayer.h
|
| c2904bab5f4c900a67cdf1aeed196fdc171a3710 |
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
|
| aadb854e0bc63547c0d4b4129330a49917a30f75 |
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
|
| 0478cd8b9468d54a32a6befd2654ebb9ae538b2d |
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
|
| bf89c099fc97717e3008a481aeddc76c1ac5e00d |
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
|
| 4ddf30b2b118068d82bb37858186d668eddbbe6d |
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
|
| 6100d2d60517ff33ed8eb35d0b7ea63cde0831c9 |
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.
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| b5b133daa70779c09ef1ad6e88f5f85584537dc8 |
20-Nov-2009 |
Andreas Huber <andih@google.com> |
am 7227e72b: (-s ours) am 57c70146: am f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit '7227e72bf4b9f6f4bcf5a3ec8006a3318efd3cca'
* commit '7227e72bf4b9f6f4bcf5a3ec8006a3318efd3cca':
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.
|
| 317599076b653bffb9142a98c6bb4f887804f231 |
20-Nov-2009 |
Andreas Huber <andih@google.com> |
am 57c70146: am f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit '57c701463f57ea50f6116690641f376e84c4c290' into eclair-mr2-plus-aosp
* commit '57c701463f57ea50f6116690641f376e84c4c290':
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.
|
| 9da546f16810e8041046405ea4924f42ea5c1242 |
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.
|
| 70453d7e16079720947adabad1e76d5d6b72ea14 |
20-Nov-2009 |
Andreas Huber <andih@google.com> |
am f854e077: (-s ours) Merge change I8134d6ed into eclair
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2
* 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.
|
| 2f5925e123afdaba79c7ca8ef6647e4b86cd5488 |
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.
nclude/media/stagefright/MediaPlayerImpl.h
edia/libstagefright/MediaPlayerImpl.cpp
|
| 624b08924f4482d91f731de3efde37bcea4f90f8 |
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:
|
| 82865549a0da6bf8337b5da4dbfba30b088671d6 |
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.
|
| 31e119f5d0a38665072781de106af4e85199c081 |
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.
|
| aae2af5870a165e121b3aeced2135061177c8550 |
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:
|
| f78933fdfc5bc71881b3011f921b643d90387664 |
17-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change Iea6a38c6 into eclair-mr2
* changes:
Squashed commit of the following:
|
| 7ffaaee13c2e3253807fd21ce17ab2648b3cdd2b |
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.
|
| 8b8e0e6d5cc2a39eed0236ad6beba551e7052913 |
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.
|
| c77a293c4971d9f6c4e3b0c0573fb13276bedf18 |
17-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change Ib64ea2dd into eclair-mr2
* changes:
Improvements to TimedEventQueue.
|
| be11f392a8b8ff1006cf536350cc8a85f8788ff4 |
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.
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/include/TimedEventQueue.h
|
| 03475f5af25e4aa32d46d41dd2ec756853d8dd9d |
17-Nov-2009 |
Andreas Huber <andih@google.com> |
Update FileSource to also accept a file descriptor and a range.
nclude/media/stagefright/FileSource.h
edia/libstagefright/FileSource.cpp
|
| 30ab66297501757d745b9ae10da61adcd891f497 |
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".
nclude/media/MediaRecorderBase.h
nclude/media/PVMediaRecorder.h
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/StagefrightRecorder.cpp
edia/libmediaplayerservice/StagefrightRecorder.h
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXCodec.cpp
|
| 0d37e5a62ea709d7ef036e0b22e66ce0980e3e9f |
16-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am ce757d69: merge from open-source master
Merge commit 'ce757d693ebc5fee327e3f13c352bbd0c0cf4dea'
* commit 'ce757d693ebc5fee327e3f13c352bbd0c0cf4dea':
Fix 2209086: Fix missing callback that was preventing tab bar text from updating.
always preserve rows for accounts with type of localhost even if the account manager doesn't know about them
Fix 2262069: Cosmetic change - shift DigitalClock down to provide room for carrier.
Fix a race condition that resulted in the screen coming on without the brightness set to the correct value.
PowerManagerService: Hold a wakelock while mProximityTask is queued
eclair snapshot
|
| 35c47da5f814ce8b90bc97567a472771037428bc |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 696cfa660e024cca3ea22ca3686283f622ddfdb2 |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
Merge commit 'goog/stage-korg-master^' into HEAD
|
| 66f4e7ea7a600c512eeb24c039610320f155e97e |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from eclair
|
| d4b9655dbbaa8452c245857af1dfe61f71f04d86 |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am 8a4e470f: merge from open-source master
Merge commit '8a4e470fc2c1351d58a6ab2d99eb12d01c5c2656'
* commit '8a4e470fc2c1351d58a6ab2d99eb12d01c5c2656':
Fix build
Typo fix in javadoc
Correction of an error in the setRotate method of the ColorMatrix class.
|
| ea7a503aad55c75d80758f49f8862a343bc19473 |
15-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 2ffcb6c4fe5be89b38b72803182cbc5f3fbad43a |
13-Nov-2009 |
Jean-Baptiste Queru <jbq@google.com> |
eclair snapshot
mds/stagefright/Android.mk
mds/stagefright/SineSource.cpp
mds/stagefright/SineSource.h
mds/stagefright/WaveWriter.h
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
nclude/media/IAudioPolicyService.h
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
nclude/media/IMediaMetadataRetriever.h
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerClient.h
nclude/media/IMediaPlayerService.h
nclude/media/IMediaRecorder.h
nclude/media/IOMX.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/MediaPlayerInterface.h
nclude/media/Metadata.h
nclude/media/PVPlayer.h
nclude/media/ToneGenerator.h
nclude/media/mediametadataretriever.h
nclude/media/mediaplayer.h
nclude/media/mediarecorder.h
nclude/media/mediascanner.h
nclude/media/stagefright/AMRExtractor.h
nclude/media/stagefright/AudioPlayer.h
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/CachingDataSource.h
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/ESDS.h
nclude/media/stagefright/FileSource.h
nclude/media/stagefright/HTTPDataSource.h
nclude/media/stagefright/HTTPStream.h
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/JPEGSource.h
nclude/media/stagefright/MP3Extractor.h
nclude/media/stagefright/MPEG4Extractor.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaBuffer.h
nclude/media/stagefright/MediaBufferGroup.h
nclude/media/stagefright/MediaDebug.h
nclude/media/stagefright/MediaDefs.h
nclude/media/stagefright/MediaErrors.h
nclude/media/stagefright/MediaExtractor.h
nclude/media/stagefright/MediaPlayerImpl.h
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/MmapSource.h
nclude/media/stagefright/OMXClient.h
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/SampleTable.h
nclude/media/stagefright/ShoutcastSource.h
nclude/media/stagefright/SoftwareRenderer.h
nclude/media/stagefright/TimeSource.h
nclude/media/stagefright/TimedEventQueue.h
nclude/media/stagefright/Utils.h
nclude/media/stagefright/VideoRenderer.h
nclude/media/stagefright/stagefright_string.h
nclude/private/binder/Static.h
nclude/private/binder/binder_module.h
nclude/private/media/AudioTrackShared.h
nclude/private/opengles/gl_context.h
nclude/private/ui/LayerState.h
nclude/private/ui/RegionHelper.h
nclude/private/ui/SharedBufferStack.h
nclude/private/ui/SharedState.h
nclude/private/ui/SurfaceFlingerSynchro.h
nclude/private/ui/android_natives_priv.h
nclude/private/ui/sw_gralloc_handle.h
nclude/private/utils/Static.h
nclude/private/utils/binder_module.h
nclude/private/utils/futex_synchro.h
edia/libmedia/Android.mk
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/IOMX.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/Metadata.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.cpp
edia/libmediaplayerservice/TestPlayerStub.h
edia/libmediaplayerservice/VorbisMetadataRetriever.cpp
edia/libmediaplayerservice/VorbisMetadataRetriever.h
edia/libmediaplayerservice/VorbisPlayer.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/ESDS.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/JPEGSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/MediaBufferGroup.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/MediaSource.cpp
edia/libstagefright/MetaData.cpp
edia/libstagefright/MmapSource.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/TimeSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/Utils.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/omx/OMXRenderer.h
edia/libstagefright/omx/SoftwareRenderer.cpp
edia/libstagefright/stagefright_string.cpp
edia/mediaserver/Android.mk
edia/mediaserver/main_mediaserver.cpp
|
| b11487468b09c0f6890b7fadd06393895ac5acf4 |
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
|
| 43a5fafac7d13557688069e3021c03706f4466e5 |
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.
|
| 49e33c6a4c00698a0aac6acf035bd4a28775947a |
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
|
| 8574c3ca0460badebf0ba816920c071609a7d92f |
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.
|
| 057eacf4578ac6b90ee18c524670e01445bf2732 |
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
|
| 86b48a89a6cde62fc1db9140593386450bc0a9a1 |
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.
|
| a4f8a20b42ed4b17694c4c5ef05e41f5fc9dafd6 |
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
|
| 583892d0185d102f3c9ca69ea48fe38af31ecd31 |
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
|
| baca60ad4131d31323401087f64df56dbd82d223 |
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.
|
| 1aaa563c2cb0df3f414aa0cfc13f9ae7b457dc49 |
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.
|
| 0f2d1e2dd7601e06fdf834f3f942eeb5c8b33a15 |
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.
nclude/media/AudioSystem.h
|
| 1e2746e33cb153d5fb1f41999dd5792877680f43 |
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.
|
| 0ede5ad4737d952c177992bd7cbef80a06823c81 |
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.
|
| 53f45f0367d9563278f427db106736dcd1a433d1 |
12-Nov-2009 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of c66d53f9 to eclair-mr2
|
| 0f23df6c7f9a403a74d4654c84962e01ae8a24bd |
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.
|
| 1dfc99f22fb9d8c798065938c24eeb4eb9691747 |
12-Nov-2009 |
Andreas Huber <andih@google.com> |
Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
nclude/media/stagefright/HardwareAPI.h
nclude/media/stagefright/QComHardwareRenderer.h
nclude/media/stagefright/TIHardwareRenderer.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/QComHardwareRenderer.cpp
edia/libstagefright/omx/SoftwareRenderer.cpp
edia/libstagefright/omx/TIHardwareRenderer.cpp
|
| 2b584244930c9de0e3bc46898a801e9ccb731900 |
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.
edia/libmedia/AudioTrack.cpp
|
| 1a05d4379d37326b59c2ffc18a79f5eb2fed2820 |
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.
|
| 5e3daeaa774664661770ca5630cb7f8be45fb7b4 |
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.
|
| ca4bea0965f870c7d1d92357d860f50c6c18d51d |
10-Nov-2009 |
Andreas Huber <andih@google.com> |
Make MediaPlayerImpl less verbose by default.
edia/libstagefright/MediaPlayerImpl.cpp
|
| 5fe78ca2a3a4deff20f2fbcbb23a2d2e4c5076b5 |
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.
|
| 69889aa759ef071c3155ec8af1b9335b5830290f |
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.
|
| b93e38935de15babba9521140c765067923ffef9 |
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.
|
| 7eb443df575d8002d045bec28cdcde23c8137a2c |
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.
|
| a75e9fb4876139fff4bb836fb0ebd5f80c8b20b3 |
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.
edia/libmediaplayerservice/StagefrightPlayer.cpp
|
| 50610623fc8a3b81189db8eec0f8321fc2627219 |
10-Nov-2009 |
Andreas Huber <andih@google.com> |
am 45e89568: am d71ab51a: Merge change I3e1bdd38 into eclair-mr2
Merge commit '45e89568b6004db847b9e4057e386aa7db2e764c'
* commit '45e89568b6004db847b9e4057e386aa7db2e764c':
Transcode files again.
|
| fa6d0d90caa33b42e09fa1d973befce57bfd1e5b |
10-Nov-2009 |
Andreas Huber <andih@google.com> |
am d71ab51a: Merge change I3e1bdd38 into eclair-mr2
Merge commit 'd71ab51a46d3648493ab3425e77e5762544be03a' into eclair-mr2-plus-aosp
* commit 'd71ab51a46d3648493ab3425e77e5762544be03a':
Transcode files again.
|
| 732324915492184dc5f773235af7f9146016c360 |
10-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I3e1bdd38 into eclair-mr2
* changes:
Transcode files again.
|
| b43695da8863664fb3ec10fa3d0442c572842cf5 |
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.
|
| 82594bed5a179038391857033ed5b5e22c894e25 |
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.
|
| 5bb42b780a934386f26c1c1f0a8249494ec65f7c |
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.
|
| a111b4e51959d96dabb71a073314753d2f6fe694 |
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).
|
| 37648c87fa268bfe33ec6b93878fa24885b664aa |
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).
|
| 84ec55b736ae2278d6abdc1c7a0312de46ef5f3d |
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).
|
| 8abf5aa19b4f2b34ffcd7a1afaf96cbe2526c796 |
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).
|
| fa70cad40b01627ac1c22e04cdd548ece9c2654f |
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.
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| dae04ca7c4b5590786ffc336721ee8714cc79fef |
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).
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/MediaPlayerImpl.cpp
|
| 77d9b982d59da214f6cf36083501baa8077d00c1 |
05-Nov-2009 |
Andreas Huber <andih@google.com> |
am 74b03657: (-s ours) am e334ce27: am 05eca1d4: (-s ours) Merge change Ie80e2381 into eclair
Merge commit '74b036577427ed6dca4b11540a32d676126231e3'
* commit '74b036577427ed6dca4b11540a32d676126231e3':
DO NOT MERGE: Squashed commit of the following:
|
| 03c8558ee5868cb759df478bc3cbe1848a21ea6e |
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.
|
| f08c4dde5f580764881dff211c0dbf2671c8a3cd |
05-Nov-2009 |
Andreas Huber <andih@google.com> |
am e334ce27: am 05eca1d4: (-s ours) Merge change Ie80e2381 into eclair
Merge commit 'e334ce27f1c936af54748c1312cfdeeb3eea7184' into eclair-mr2-plus-aosp
* commit 'e334ce27f1c936af54748c1312cfdeeb3eea7184':
DO NOT MERGE: Squashed commit of the following:
|
| 4b4d8408844a3e8a8d8d87089bb438d853721107 |
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.
|
| 6fceb868bf79feac0498ca5db8694c92ef6b4fa5 |
05-Nov-2009 |
Andreas Huber <andih@google.com> |
am 05eca1d4: (-s ours) Merge change Ie80e2381 into eclair
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-mr2
* commit '05eca1d46a45723a57899dabad698537b7faef82':
DO NOT MERGE: Squashed commit of the following:
|
| 78819585beae56054d75a4c583e4b97129817001 |
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:
|
| 022ad466c95001eaf043b1f0aff89cde92e3387f |
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.
|
| ce66ca43f454ff7516d0ee5e4828648fcf936b81 |
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.
|
| 5b65c7043dada0c89d3a941742666ac40ea35746 |
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.
mds/stagefright/stagefright.cpp
nclude/media/IMediaPlayerService.h
nclude/media/IOMX.h
nclude/media/stagefright/HTTPStream.h
nclude/media/stagefright/stagefright_string.h
nclude/media/stagefright/string.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IOMX.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libstagefright/Android.mk
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMX.h
edia/libstagefright/omx/OMXNodeInstance.cpp
edia/libstagefright/stagefright_string.cpp
edia/libstagefright/string.cpp
|
| d899d73308f987c932a4366977e67a3d8aa8bc8b |
05-Nov-2009 |
Andreas Huber <andih@google.com> |
Now that UseBuffer on this component is fixed, let's use it.
edia/libstagefright/OMXCodec.cpp
|
| b787525a3e739a6991498d37e377465e34ccdff1 |
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.
|
| 0be134336190a7f1afb2101e2b2e445e50bba184 |
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.
|
| 3aea319ca5c6a3c1ab0fcdf6db8d9096c8f5287a |
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.
|
| 1c02bfb63ea6e1d1630a09229044d64be200a9ef |
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.
|
| dee7f8349ad8e93c5b16c24bed49fa9192790e0f |
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.
|
| 34f1d8ecd23169a5f299937e3aaf1bd7937578a0 |
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.
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/ToneGenerator.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/ToneGenerator.cpp
|
| 7dc7b51d025422263fb0a304cb7cf831ceb3300e |
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.
|
| 41020e23f0d4177889784afbada8adb036ba53d3 |
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.
|
| 3c3bfda1ddecf4c6e34a4b604f84940c7190f5d7 |
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.
|
| 308d4aea9ccb62d3d9e3010a73b16435e554d5f2 |
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.
|
| 1d35b2f899c0e787995f4adae5bdbcd31cd4eac9 |
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.
|
| 60df93a7654b1845b6ff0770adb78af89bada26b |
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.
|
| abe3ce8494b2fbbf78716ec6e68dd4427ff3dfa2 |
04-Nov-2009 |
Andreas Huber <andih@google.com> |
am 66c25573: am 12bc3af0: Merge change I6f6bf3d8 into eclair-mr2
Merge commit '66c2557334d6c8116c874aa65e84b280d325009e'
* commit '66c2557334d6c8116c874aa65e84b280d325009e':
Support raw audio sources in stagefright commandline tool.
|
| 677ed071b3870e7acfd62118ea39026fad21cee2 |
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...
|
| 587e067a970fc23c707c448f508cc32e052a8380 |
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.
|
| 80ec5cc248d2ca84d60b50207f33c2c95331f3f8 |
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.
|
| 9d753222dce9ee80ee19e1a51f64b3660b457bca |
04-Nov-2009 |
Andreas Huber <andih@google.com> |
am 12bc3af0: Merge change I6f6bf3d8 into eclair-mr2
Merge commit '12bc3af0fb4ce17065d0f17982e0a9da52fc093d' into eclair-mr2-plus-aosp
* commit '12bc3af0fb4ce17065d0f17982e0a9da52fc093d':
Support raw audio sources in stagefright commandline tool.
|
| 8b36375248eddd241161bdc78b2bffe52f3a180d |
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...
|
| 2c814adaf6340ee3cf2b942f1dff0f2ea6904c81 |
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.
|
| 01b8bbb3a841729052860d8ca734e0e0e90bb40a |
04-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I313953dc into eclair-mr2
* changes:
Support raw audio sources in MediaPlayerImpl.
|
| 08994dc192d79a5b60b6741db330bd383096be34 |
04-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I6f6bf3d8 into eclair-mr2
* changes:
Support raw audio sources in stagefright commandline tool.
|
| af2abc8634dcae706c0fae02b1381fe70e678f35 |
04-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I5126e183 into eclair-mr2
* changes:
Fix MP3Extractor duration overflows...
|
| d763b9513e520c7f0113077b4a2c62cee16e4266 |
04-Nov-2009 |
Jean-Michel Trivi <jmtrivi@google.com> |
Add new audio sources to support the A1026 recording configurations.
nclude/media/mediarecorder.h
|
| 0dba73763a04d39faf999dcc5ef12af3c99535a7 |
04-Nov-2009 |
Andreas Huber <andih@google.com> |
Adds a WAVExtractor for 16-bit signed PCM audio wave files.
nclude/media/stagefright/MediaDefs.h
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/WAVExtractor.cpp
edia/libstagefright/include/WAVExtractor.h
|
| 1f9ad1d704a17533989a9274c55bd5bb9d3abcc0 |
04-Nov-2009 |
Andreas Huber <andih@google.com> |
Support raw audio sources in MediaPlayerImpl.
edia/libstagefright/MediaPlayerImpl.cpp
|
| 125ef261deb4efbb50cc41c60902dea48d8d4187 |
04-Nov-2009 |
Andreas Huber <andih@google.com> |
Support raw audio sources in stagefright commandline tool.
mds/stagefright/stagefright.cpp
|
| c0bbcf32ac6ffa76409232d7156250e1092bfa24 |
04-Nov-2009 |
Andreas Huber <andih@google.com> |
Fix MP3Extractor duration overflows...
edia/libstagefright/MP3Extractor.cpp
|
| 77ef8f53948d14545539ed5cfcc37fb308708a95 |
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.
|
| 3e4944efd9bc369bafc35de8908f4b325a143c08 |
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.
|
| 0476a0cebf0a378a5bf18e546c17b33e697e3814 |
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.
|
| 202ff50113b293a80c8df60022e2c4ad8a829fbe |
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.
|
| c6c6237a67661c7b2d8822b7360cdf01e64d2c7c |
03-Nov-2009 |
Andreas Huber <andih@google.com> |
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
edia/libstagefright/omx/QComHardwareRenderer.cpp
|
| 24cff45ee558c517d70b7695292277794c1277b3 |
03-Nov-2009 |
Mathias Agopian <mathias@google.com> |
am d1d744cd: am 07d38c66: am 8637759a: Merge change I36d0184e into eclair
Merge commit 'd1d744cdf4b08c8ef969790bae305c82ae783f4e'
* commit 'd1d744cdf4b08c8ef969790bae305c82ae783f4e':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
|
| 72c31d3171b85aaf11e90519ae52062ecc1f6247 |
03-Nov-2009 |
Mathias Agopian <mathias@google.com> |
am 07d38c66: am 8637759a: Merge change I36d0184e into eclair
Merge commit '07d38c66692b7d87415667010c0658202b5a7f39' into eclair-mr2-plus-aosp
* commit '07d38c66692b7d87415667010c0658202b5a7f39':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
|
| 672635d84f2d897b5e782448356bba18b5f2dc7c |
03-Nov-2009 |
Mathias Agopian <mathias@google.com> |
am 8637759a: Merge change I36d0184e into eclair
Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-mr2
* commit '8637759a1d34a4adda292579d5f8790587659235':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
|
| 1d04f867d459c5bdc09546b700dd1d9164ac6143 |
03-Nov-2009 |
Mathias Agopian <mathias@google.com> |
am 8637759a: Merge change I36d0184e into eclair
Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-plus-aosp
* commit '8637759a1d34a4adda292579d5f8790587659235':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
|
| 967441ef270cf9dda4c859770764dcb2146f2435 |
03-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I36d0184e into eclair
* changes:
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
|
| 9416be414bf104fb07a532a8d6d9f71150eb6595 |
03-Nov-2009 |
Mathias Agopian <mathias@google.com> |
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
we lost the concept of vertical stride when moving video playback to EGLImage.
Here we bring it back in a somewhat hacky-way that will work only for the
softgl/mdp backend.
nclude/private/opengles/gl_context.h
|
| 6c56040e850da95dfcc9da8e1b322f56efb37892 |
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.
|
| f808c4cf1c3e2c6b18a2e9268bfa3cfc9ca793f8 |
29-Oct-2009 |
Andreas Huber <andih@google.com> |
Transcode files again.
mds/stagefright/record.cpp
|
| 80fe5c777892c6c67328a25e91e13b17a864db88 |
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.
|
| 076667f9624516f9c65d5d4d7571ef5522237229 |
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.
|
| a44730b8dc95cd7bba4c7ddcb059c6d6594e178c |
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.
|
| 7ddc40044ac664245e1535b20426900733163724 |
02-Nov-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change Id095e180 into eclair
* changes:
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
|
| 6741eb86bf54bee6a0875e4f7a825d5d0de5c23a |
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.
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 6f461a1409c4c5945d0ef0f7dc6ba2a27ed49347 |
02-Nov-2009 |
Eric Laurent <elaurent@google.com> |
am 2926bf7d: am c69e7516: am ee98c240: Merge change I73680cd9 into eclair
Merge commit '2926bf7d9aca0097a347ce6b77fc762f309a597b'
* commit '2926bf7d9aca0097a347ce6b77fc762f309a597b':
Fix 2194140: [Passion] Support Audience chip.
|
| e5688471975a132c9a6ba1414adf3e1d320c5200 |
02-Nov-2009 |
Eric Laurent <elaurent@google.com> |
am c69e7516: am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'c69e7516482aae626eb550f5dd99f0f2f7a45909' into eclair-mr2-plus-aosp
* commit 'c69e7516482aae626eb550f5dd99f0f2f7a45909':
Fix 2194140: [Passion] Support Audience chip.
|
| 5dce5d8609857f803cb0eec7e2b1b55c158ce525 |
02-Nov-2009 |
Eric Laurent <elaurent@google.com> |
am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-mr2
* commit 'ee98c24020c1634b02cde6d333968f04a0de941f':
Fix 2194140: [Passion] Support Audience chip.
|
| 9ff884b58a3947ee418619aaad8c62f4303c435a |
02-Nov-2009 |
Eric Laurent <elaurent@google.com> |
am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-plus-aosp
* commit 'ee98c24020c1634b02cde6d333968f04a0de941f':
Fix 2194140: [Passion] Support Audience chip.
|
| 90b75fbd19571784c8ceee4841a28b8333a8198e |
02-Nov-2009 |
Eric Laurent <elaurent@google.com> |
Fix 2194140: [Passion] Support Audience chip.
Added new input device DEVICE_IN_BACK_MIC.
Added new audio source AUDIO_SOURCE_CAMCORDER.
nclude/media/AudioSystem.h
nclude/media/mediarecorder.h
|
| a832f3944911aa52124af5f874acf5e0863037b1 |
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.
|
| 523300e6155e42c264ca633a0340e262bb0817f6 |
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.
|
| 8d8380ccea24aed511f96ecb9282b0d2c3331d10 |
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.
|
| 85f1296e29d99b571fdb2e58f05f809faeae6065 |
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.
|
| dac6a31a33ba53fb93850670cdddd1e6515dadce |
29-Oct-2009 |
Gloria Wang <gwang@google.com> |
Dump media recorder PID in dumpsys media.player, and fix minor bugs.
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
|
| 53304b1a8ed82d8a8b9dd876bd62b3ba798e2f07 |
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.
|
| 84d6db3b79893ce3c6bd30256702cf2d81a926ab |
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.
|
| df6b61291f6f89d827851d5ed727b09d19a5c7db |
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.
|
| 888f72a4628eed3c136ff2e346a15d129da0d520 |
29-Oct-2009 |
Andreas Huber <andih@google.com> |
Revive support for video encoding in OMXCodec.
mds/stagefright/record.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 9877582ac7267b75c4710a13f7822dba7da0c5d0 |
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.
|
| 82a72bbb6afac2ee7e28bcc4a9010edec022ddea |
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.
|
| b439827ca7e2a991055260982952b8fd8bc84fee |
29-Oct-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change Ic5e3d73f into eclair-mr2
* changes:
LOG_ASSERT needs a message.
|
| 23e246f7c2a53426b97296ec7780e8dfe80147d4 |
29-Oct-2009 |
Patrick Scott <phanna@android.com> |
LOG_ASSERT needs a message.
This fails to build when asserts are turned on.
edia/libmediaplayerservice/TestPlayerStub.cpp
|
| 8d8cf3789b504c8832597507f7203879b5d73429 |
29-Oct-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am c4514c09: merge from open-source master
Merge commit 'c4514c09124b203bf120889bc42d2bc9532d40ad'
* commit 'c4514c09124b203bf120889bc42d2bc9532d40ad':
donut snapshot
donut snapshot
|
| 32c038063a8cf758a6c85825338a93e055963a28 |
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.
|
| 9cf984e2bd0d25fa5c069934d8a8a65ab3dcb638 |
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."
|
| 8197f52f0d650a263d3319692fe568fc2cbe7c46 |
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.
|
| d1a8512b2114999c61586a30c5e9d397c9a40bc2 |
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).
|
| e3c6f7bd3a371c0e8ec0012df010cc7dfc37f876 |
28-Oct-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| b83e7e42b0efa9062d5c5ccd3239640e449d78d8 |
28-Oct-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 1e97b8370fec992006ab4005cf810114f017ae44 |
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.
|
| 70f31d992838dd980d2b30613661d6a15a297676 |
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."
|
| 4ee1540a3949693693688c2004a56cb42de55160 |
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.
|
| 548403bfc52434b875d620a05cc88985e5cc879c |
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."
|
| b1e3bc7933e29b668bcf5caf59bc46e848d6c875 |
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.
|
| 636df899721d7da23fc792f20df29937e628ab2f |
28-Oct-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I155e2ad0 into eclair-mr2
* changes:
Re-enable CameraSource.
|
| be5c74f5da6a93b0d23f96e11848acfcc3b4d1d9 |
14-Oct-2009 |
Andreas Huber <andih@google.com> |
Re-enable CameraSource.
nclude/media/stagefright/CameraSource.h
edia/libstagefright/Android.mk
edia/libstagefright/CameraSource.cpp
|
| d04f7f5165017b7268eb757d7a96aae21f5ea6ac |
28-Oct-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge from donut
|
| 62620ec08bd983c777d6534685f9dd55d450dc2a |
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).
|
| 1eea7f529c1c25901a7749fed4792ed68379d841 |
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).
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 5eac6f8ff7a2b93a6f9046a705d0d34a86a1759e |
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.
|
| 634600800faeb3397e30bc8cf30d16d4ecaf2d9a |
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.
|
| aeea9852e897b9f0c52b9d79f4c299e4579f7d1b |
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.
|
| c76a4ceed2897da8f085172b78a4ae87f5c1ef58 |
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."
|
| f9ae38fa6eafa700b6642ea045c8749df5364cd6 |
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.
|
| 41fbe930c0c128bcded1348e60d7d9e8f79d8a77 |
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.
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
|
| d6703ab22c85b43fdb2deb78a37e51465c902a5f |
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.
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 17d58a83356ba568861b3aa391c5df915d33c0f1 |
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.
edia/libstagefright/OMXCodec.cpp
|
| 909a3e5cf1b49bc642df61c6839590e8351450ed |
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.
|
| dc97c041fbaf575806cb6758bb7aa506d5a2781d |
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.
|
| fe44b7a8b2b8da50a7a78f4b7e034b6d01785e44 |
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.
|
| 305893fbc10da99c3a98285ca5528ac34669f302 |
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.
|
| 88e5ad9f0d9b35d4868347bce47b28b7358b32e4 |
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.
|
| f0cf7e92203ee15b1650afbebdbebd2e1632fca7 |
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.
|
| ae0d688c9631f8f9480aeeaa699518ab462f31cc |
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.
|
| d4ce8732956c5140ee19b1e218faf94c48f9c156 |
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.
|
| 34769bc913e9f6bb138e666d94a9d685bf3da217 |
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.
nclude/media/stagefright/CachingDataSource.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/FileSource.h
nclude/media/stagefright/HTTPDataSource.h
nclude/media/stagefright/MediaExtractor.h
nclude/media/stagefright/MmapSource.h
nclude/media/stagefright/ShoutcastSource.h
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/JPEGSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/MmapSource.cpp
edia/libstagefright/SampleTable.cpp
|
| 0b8748b0efa667d9dc9aee15bfbbd42f3c386690 |
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.
|
| 66326a5ee0869f1ee4d136a477e6effba428b3cb |
23-Oct-2009 |
Andreas Huber <andih@google.com> |
Moving the individual extractor headers files to the private include directory.
mds/stagefright/record.cpp
nclude/media/stagefright/AMRExtractor.h
nclude/media/stagefright/MP3Extractor.h
nclude/media/stagefright/MPEG4Extractor.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/include/AMRExtractor.h
edia/libstagefright/include/MP3Extractor.h
edia/libstagefright/include/MPEG4Extractor.h
|
| eea7b9b471b505d230528be0ba010e69d6ea9269 |
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.
|
| 948efb66c96c7573c472a2641083f51cfacc04fa |
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.
|
| d8b3c92cde24038517b244e46fd1d6476a449b8c |
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.
|
| 632abaa5f03facfd46d42b79ada229a3203b3fab |
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.
|
| b8a3f589b25c7be909a5509c4c6174b1b0ac199b |
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.
|
| 6f62eb2944cabeef61f9f791862d0117bb0e4910 |
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.
|
| 47bed1a7755ed58fa5d4c0d35b20468deb83bd60 |
22-Oct-2009 |
Andreas Huber <andih@google.com> |
Make stagefright a little less verbose. Fix heap corruption for real.
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| d2d76ed9a9172b4752d138c774d25f3faf06eebf |
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.
|
| 64822eacade358f4af6dd4df2dde29f85481a582 |
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.
|
| 48ac1615d669b7ba3b212d174441b31755d02ef1 |
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.
|
| ba229b3faa98b3bb6567cf95040062be2d9c2b3f |
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.
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libstagefright/OMXCodec.cpp
|
| 7b70cfc35c8555eda186fd0b792f013a4b082cff |
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.
|
| 09d88b00dbd0a04ed45a661590cca49d6e5b42f5 |
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.
|
| dc09e0427f3fb648b26567b9237f6fe643c0c9da |
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.
|
| a9a4390989072d579eedab6b71fb41248b3ad8fe |
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.
edia/libmedia/ToneGenerator.cpp
|
| b0bfc31561a320debc70c5ac0b49392b9aa8c312 |
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.
|
| 12392bf8e1ed1b8f37d93ab58173d57e1d0a47b9 |
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.
|
| 7e04dcf8d6784dd56f53aa90bf34431ab4f0710c |
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()
nclude/media/stagefright/AMRExtractor.h
nclude/media/stagefright/MP3Extractor.h
nclude/media/stagefright/MPEG4Extractor.h
nclude/media/stagefright/MediaExtractor.h
nclude/media/stagefright/MetaData.h
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/include/SampleTable.h
|
| 616a187f5fcb19d4b3ddbd00553a16d36a064da8 |
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.
|
| 9de9709d59c6b7376a0200d338efaaaca51b8041 |
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.
|
| be24978d00675acac5bb830059bb31c4f82b2fe4 |
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.
|
| 521bad496a8b80008abe573a6712a8051c9eb322 |
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.
|
| 2d6d6e9a3d569eda4555c4eb68cec452be958bb1 |
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.
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 7b32ee833ae0aaf96781f8919df29813bffe9d23 |
22-Oct-2009 |
Andreas Huber <andih@google.com> |
am f25c9660: (-s ours) am 1e23a401: am ca404dfb: (-s ours) Merge change Ie3ffb526 into eclair
Merge commit 'f25c96609224213be07a34219a32c006ee9063f0'
* commit 'f25c96609224213be07a34219a32c006ee9063f0':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
|
| 6f9b57f4ee8365a5349010d0bab713288a15e634 |
22-Oct-2009 |
Andreas Huber <andih@google.com> |
am 1e23a401: am ca404dfb: (-s ours) Merge change Ie3ffb526 into eclair
Merge commit '1e23a4019a2782054fc2c72f243008e29e13b411' into eclair-mr2-plus-aosp
* commit '1e23a4019a2782054fc2c72f243008e29e13b411':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
|
| 97055951de932589b99bedb0506a3d6eca728523 |
22-Oct-2009 |
Andreas Huber <andih@google.com> |
am ca404dfb: (-s ours) Merge change Ie3ffb526 into eclair
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2
* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
|
| e3c49b72d29ab581326f80fb0dccd44e996ee01e |
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.
|
| bd231fca95829b0ba0bbc463a48810794a408f35 |
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.
|
| 4926a47afc079c8d9259f18a26accbfba2f976eb |
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.
edia/libstagefright/OMXCodec.cpp
|
| c6323f9d72e0f08dd1e813550a56c8d2f0fd76a2 |
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.
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libstagefright/OMXCodec.cpp
|
| f0ee6f4055e26fb35d9c526a596668a4dc9da5ba |
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().
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
|
| 7746714681832c648a863f77405be76933b49d3f |
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.
|
| 66d1e82ce5d5e189442285b6225977137b65c608 |
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.
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/QComHardwareRenderer.cpp
|
| 801878749fef87da593e7e487f62859dc02325ca |
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.
|
| 69be69a05f14489bf7057806d9ff437164cd0287 |
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.
|
| ddc47ee177e82ce4c8071a48c690a08b7bdc606a |
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.
|
| e59f4cac39eb5e995aeb1029fb3772adfbe3096b |
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.
|
| 12658b720b176b7d934444256d07ba3c595d9b44 |
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.
edia/libstagefright/OMXCodec.cpp
|
| a58568bc37ea3964ba116925fcc5fa52dfe6fa49 |
19-Oct-2009 |
Andreas Huber <andih@google.com> |
Fixing the build by renaming private "string.h" header file.
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/stagefright_string.h
edia/libstagefright/include/string.h
edia/libstagefright/string.cpp
|
| c712885065a10b346c4a35a664804a0bdca9c94e |
17-Oct-2009 |
Andreas Huber <andih@google.com> |
am 1705d87b: am bfea1e13: resolved conflicts for merge of f585be7f to eclair-mr2
Merge commit '1705d87b7e576bcd3bdc670411511376b4e245c5'
* commit '1705d87b7e576bcd3bdc670411511376b4e245c5':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
|
| d2bbef2ac225af44e2a876d275e58c55113de690 |
17-Oct-2009 |
Andreas Huber <andih@google.com> |
am bfea1e13: resolved conflicts for merge of f585be7f to eclair-mr2
Merge commit 'bfea1e139683cdb339e0cb6aa5970b5334369d77' into eclair-mr2-plus-aosp
* commit 'bfea1e139683cdb339e0cb6aa5970b5334369d77':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
|
| b90ca5b1beb9c73e09f46773172c08fad12d6a95 |
17-Oct-2009 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of f585be7f to eclair-mr2
|
| cbf87c590639c942c34c5d3313cdf088a36385a5 |
17-Oct-2009 |
Andreas Huber <andih@google.com> |
am f585be7f: Merge change I11ebbfd9 into eclair
Merge commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7' into eclair-plus-aosp
* commit 'f585be7f373ad7920a7c486f84cc38b86e3572b7':
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
|
| a3b28504ad5e5d1a6265d385031f2aaba01cec76 |
17-Oct-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I11ebbfd9 into eclair
* changes:
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
|
| af6757c1de099b5352a52b8ed4a67af40f49fc78 |
17-Oct-2009 |
Andreas Huber <andih@google.com> |
A few more testcases for the vendor to reproduce issues with their decoder. Not part of the shipping image.
mds/stagefright/stagefright.cpp
|
| d65d68624321cd19dfa7c70ecb4a62b2e20d592e |
17-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 453b5ba2: am fe50b63f: am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '453b5ba21f1bf5ea6d046965a4b189c998e8cc37'
* commit '453b5ba21f1bf5ea6d046965a4b189c998e8cc37':
fix [2182249] [MR1] valgrind error in surface flinger
|
| 30534db1d2c21821977fd4b62e85eb3ea631d6bf |
16-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am fe50b63f: am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe' into eclair-mr2-plus-aosp
* commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe':
fix [2182249] [MR1] valgrind error in surface flinger
|
| b02ee76cc797db50bff7684c17d826ebbefd423c |
16-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-mr2
* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
fix [2182249] [MR1] valgrind error in surface flinger
|
| f66455e4736a24f78c4ad771eaa2764e00e9b2c0 |
16-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-plus-aosp
* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
fix [2182249] [MR1] valgrind error in surface flinger
|
| 472d23ee86e3d82b83685b9f7558aae454af7967 |
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.
|
| 2dd3d79885e9688d4d43e7b57133c83c3052cf04 |
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.
|
| 318ad9c1d9d6515026dfc2c021359d27decaa7a1 |
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.
mds/stagefright/stagefright.cpp
nclude/media/IMediaPlayerService.h
nclude/media/IOMX.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IOMX.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/include/OMX.h
edia/libstagefright/include/OMXNodeInstance.h
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMX.h
edia/libstagefright/omx/OMXNodeInstance.cpp
|
| 7b9d6a92534fd712c465b5ffcc4e7631f0147c1c |
16-Oct-2009 |
Mathias Agopian <mathias@google.com> |
fix [2182249] [MR1] valgrind error in surface flinger
nclude/private/ui/RegionHelper.h
|
| 2d41bb746820ecf25ff712930dbcd539f9d525b0 |
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.
|
| 964d6568d1804f18bcd2386993bc7ea25c02125d |
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.
|
| 6cc9b7b8f418d5db04996c2daa222f20d0ae97dc |
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.
|
| 6e017031ca8104a68525c019479512782ab58fcd |
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.
|
| dbf83870804f0b657b60ed35b7c682ff6820caed |
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.
|
| 2481447060c8adb92f53bf9779608d20fd75bd79 |
13-Oct-2009 |
Andreas Huber <andih@google.com> |
am 861c462c: am 9b8f9477: Fixing the build.
Merge commit '861c462c521db2ca54924c3e6a8563784db98b53'
* commit '861c462c521db2ca54924c3e6a8563784db98b53':
Fixing the build.
|
| bac6832f0d5d276cf8b022d92a798221166d0e5f |
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.
|
| 3dc1caf03c1d41abdb776dcbdee5670d2a540183 |
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.
|
| 02adb8904f88592a7d8dd664957af586ebdbeef4 |
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.
|
| d12320d6a9aa529896cd4a681605031827e4a34b |
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
|
| 6442caf0e53566cf80308c4b938925145365e963 |
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.
|
| 07eb7ba44a1400df1f2917694478f53f4e919a70 |
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.
|
| 89e69da4d86348409994c9dafbbb2634ccd7c196 |
13-Oct-2009 |
Andreas Huber <andih@google.com> |
Separated private from public header files.
nclude/media/stagefright/ESDS.h
nclude/media/stagefright/HTTPDataSource.h
nclude/media/stagefright/HTTPStream.h
nclude/media/stagefright/QComHardwareRenderer.h
nclude/media/stagefright/SampleTable.h
nclude/media/stagefright/SoftwareRenderer.h
nclude/media/stagefright/TIHardwareRenderer.h
nclude/media/stagefright/TimedEventQueue.h
nclude/media/stagefright/string.h
edia/libstagefright/ESDS.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/include/ESDS.h
edia/libstagefright/include/HTTPStream.h
edia/libstagefright/include/QComHardwareRenderer.h
edia/libstagefright/include/SampleTable.h
edia/libstagefright/include/SoftwareRenderer.h
edia/libstagefright/include/TIHardwareRenderer.h
edia/libstagefright/include/TimedEventQueue.h
edia/libstagefright/include/string.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/QComHardwareRenderer.cpp
edia/libstagefright/omx/SoftwareRenderer.cpp
edia/libstagefright/omx/TIHardwareRenderer.cpp
edia/libstagefright/string.cpp
|
| 549aa3741725ea2fd75c5fb717ff5a9316a5a55d |
13-Oct-2009 |
Andreas Huber <andih@google.com> |
Fix various compiler warnings accumulated over time.
nclude/media/stagefright/SampleTable.h
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/SampleTable.cpp
|
| 3fc0367dc25e676c1609dd673426e9dd58596570 |
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.
|
| 7f281f87670c63775ea1ae8b24af31822d5ad416 |
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.
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MediaErrors.h
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/OMXCodec.h
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/OMXCodec.cpp
|
| f5b825631821946d2ed9c6a7784a921c5a0715b1 |
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.
|
| 8308837da73e081471eb077326cdbe5342377ba2 |
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.
|
| 0bf3921522461b1c7d321d0c667c1020ab3110bc |
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
edia/libstagefright/MP3Extractor.cpp
|
| 48c948b1137e7bbdb161b51908657ab72ac5e2da |
08-Oct-2009 |
Andreas Huber <andih@google.com> |
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
mds/stagefright/SineSource.cpp
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MetaData.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/MetaData.cpp
edia/libstagefright/OMXCodec.cpp
|
| d52c4f00e9e57db9e152989e21bb97c58deeb789 |
12-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 58226c4a: am 18fc0120: am a2de8e31: Merge change Ie05f07df into eclair
Merge commit '58226c4a760fd25f6a926a6c72f3b9abd475278c'
* commit '58226c4a760fd25f6a926a6c72f3b9abd475278c':
|
| 699cdf45ef6ca43f5c9e0e84f9390a5d66d69252 |
12-Oct-2009 |
Mike Cleron <mcleron@google.com> |
am f9b8d3e1: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit 'f9b8d3e1038032bd5eb1c36123c9066a3792fd9c'
* commit 'f9b8d3e1038032bd5eb1c36123c9066a3792fd9c':
fix [2170319] gmail bulk operation checkbox latency on passion
|
| af7e099f05f91dc73117b2b059a0dd2b25996b8c |
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.
|
| 4af7af9828c5550417bf84de475708aa96bc7247 |
12-Oct-2009 |
Elliott Hughes <enh@google.com> |
am 4f0c414c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '4f0c414c091daa54ac7997b7438995279506f791'
* commit '4f0c414c091daa54ac7997b7438995279506f791':
|
| b56d23d256cc2bf1f2e94b3156fb13500dbe734c |
12-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am e3aa2ada: am 5fd0ea8f: am 26fe45dc: Merge change I4961c959 into eclair
Merge commit 'e3aa2ada1931be2b66636aeb7296b20df8dbae09'
* commit 'e3aa2ada1931be2b66636aeb7296b20df8dbae09':
fix [2152536] ANR in browser
|
| d9efeabb59f42c05ca7d52ca319f4dcf5590d62d |
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).
|
| 9351c1e1ae322eb078c440d330bf7d083069fd9f |
12-Oct-2009 |
android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> |
merged d7c18d7672f3ecbbcb2f5bec92fe54dd990cb8dd, w/conflict in opengl/tests/copybits/Android.mk
|
| dbfc227196f657a8a89a68eeb0a0f05afdc654b1 |
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.
|
| b4b68f9f64a419d10c49514f6f831f917b96ba4e |
12-Oct-2009 |
Patrick Scott <phanna@android.com> |
am 8e20e88b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
Merge commit '8e20e88ba664ff606cd7eb427dd05fd981355410'
* commit '8e20e88ba664ff606cd7eb427dd05fd981355410':
|
| cdb4999b729049f1ffc7cf6b720779c91eefe8aa |
12-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 7c64a89b: am f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37'
* commit '7c64a89b3c6d05e03bc72df18fbcf34365833b37':
Attempt to fix [2152536] ANR in browser
|
| d3242febb70aca55c5df866300aa7ea03c39e82c |
09-Oct-2009 |
Andreas Huber <andih@google.com> |
am 9b8f9477: Fixing the build.
Merge commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2' into eclair-mr2-plus-aosp
* commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2':
Fixing the build.
|
| d3eaeefb1bac68bc1fee91b794be2c2c3bea6d94 |
09-Oct-2009 |
Andreas Huber <andih@google.com> |
Fixing the build.
nclude/media/stagefright/ColorConverter.h
|
| d5b86bc5c3be14ad152f6d815282571f94f4635c |
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.
|
| 2a4a7d5af053a17586a262a1267ba993e31790f1 |
07-Oct-2009 |
Andreas Huber <andih@google.com> |
Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
nclude/media/stagefright/ColorConverter.h
nclude/media/stagefright/SoftwareRenderer.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/StagefrightMetadataRetriever.cpp
edia/libmediaplayerservice/StagefrightMetadataRetriever.h
edia/libstagefright/MmapSource.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/ColorConverter.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/SoftwareRenderer.cpp
|
| ce87db03ebff7d3bb18e4a25cf51bdc5f0b93677 |
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.
|
| ed70cc1efe8b484bdb16536b2f1ea87ad7c4208f |
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.
|
| 36efa039efaae4526791336cb688032d22b34bec |
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.
nclude/media/IOMX.h
edia/libmedia/IOMX.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMX.h
|
| 479ededc5b55e63ea9b425cbe465c93bb8b8b3dc |
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.
|
| f16d4c3e8b454f970515530b9bf87edc318bdaf0 |
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
|
| 9749025189acc6c737be22007e90ed8bbbcdbc21 |
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
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| fcf6723f0974854a04bd0d9e676b5ed2a147ce09 |
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.
edia/libstagefright/omx/QComHardwareRenderer.cpp
|
| 75523691629db2af6248628f0852cd5b64bc4ef8 |
08-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 18fc0120: am a2de8e31: Merge change Ie05f07df into eclair
Merge commit '18fc0120f59f179ab13adf9e122371f32f65a12c' into eclair-mr2-plus-aosp
* commit '18fc0120f59f179ab13adf9e122371f32f65a12c':
|
| a8badeb8b63c8eea7a864cebdf0cce0277512d6f |
08-Oct-2009 |
Mike Cleron <mcleron@google.com> |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
|
| 1211518516cc019df3e5ef1882b216498f7e7a51 |
08-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am a2de8e31: Merge change Ie05f07df into eclair
Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-plus-aosp
* commit 'a2de8e31c2693d009db1f9386406758874dd1d40':
fix [2170319] gmail bulk operation checkbox latency on passion
|
| 733c0882e993a5c3124e50345c79a310c817c1c3 |
08-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am a2de8e31: Merge change Ie05f07df into eclair
Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-mr2
* commit 'a2de8e31c2693d009db1f9386406758874dd1d40':
fix [2170319] gmail bulk operation checkbox latency on passion
|
| 68174b17d69f482e5b7015452673c813343a1587 |
08-Oct-2009 |
Mathias Agopian <mathias@google.com> |
fix [2170319] gmail bulk operation checkbox latency on passion
This also fixes [2152536] ANR in browser
When SF is enqueuing buffers faster than SF dequeues them.
The update flag in SF is not counted and under some situations SF will only
dequeue the first buffer. The state at this point is not technically
corrupted, it's valid, but just delayed by one buffer.
In the case of the Browser ANR, because the last enqueued buffer was delayed
the resizing of the current buffer couldn't happen.
The system would always fall back onto its feet if anything -else- in
tried to draw, because the "late" buffer would be picked up then.
nclude/private/ui/SharedBufferStack.h
nclude/private/ui/SurfaceFlingerSynchro.h
|
| 34a76cd613ef30f70ab7e2f88cf98c630694a611 |
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.
|
| ec430b158df17b2c766f7750a96c35d3902f5f49 |
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.
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 3e4fbe326e07981a53e2e1e035393c5213a7fc3c |
07-Oct-2009 |
Elliott Hughes <enh@google.com> |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
|
| f187830a58b0e78a076985c6054b82d927e15ef2 |
07-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 26fe45dc: Merge change I4961c959 into eclair
Merge commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7' into eclair-plus-aosp
* commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7':
fix [2152536] ANR in browser
|
| 0df42e8b1cb99f3d73d8dd3d045125ef3fea2439 |
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).
|
| 21063d0a1601530cc729ad5d7a0fbffd70a9f279 |
07-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-plus-aosp
* commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb':
fix [2168528] enable glTexImage2D code path in SF for software-only buffers
fix [2168531] have software-only gralloc buffer side-step the HAL
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
|
| a849526f3d2e99d49751bbed060185158a8ba7ea |
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.
|
| 7e51a3a2d59278b301c0fdd17bfb748490436ac5 |
07-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am f8e4bc9f: Merge change I0c4cec7e into eclair
Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-plus-aosp
* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
Attempt to fix [2152536] ANR in browser
|
| 676ddcbcfa0492d61fd187f65f6ae207c00f3de6 |
07-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 5fd0ea8f: am 26fe45dc: Merge change I4961c959 into eclair
Merge commit '5fd0ea8fb4827cdf183fe3c5c7f11bfd9c94d895' into eclair-mr2-plus-aosp
* commit '5fd0ea8fb4827cdf183fe3c5c7f11bfd9c94d895':
fix [2152536] ANR in browser
|
| eab618d39407454aefc267343a46faaf8c32d5ef |
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).
|
| 259cb675ac53a20410143b4b4330674d54e5fb46 |
07-Oct-2009 |
Mathias Agopian <mathias@google.com> |
am 0ef55540: am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclair
Merge commit '0ef55540ab75660c58b284415ebae7ea66684706' into eclair-mr2-plus-aosp
* commit '0ef55540ab75660c58b284415ebae7ea66684706':
fix [2168528] enable glTexImage2D code path in SF for software-only buffers
fix [2168531] have software-only gralloc buffer side-step the HAL
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
|
| 23e1ce72323c87cacd3443b7d0deeda3a82f9dba |
07-Oct-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I4961c959 into eclair
* changes:
fix [2152536] ANR in browser
|
| d46758b6ec99533babbd24f62e381eae0a2a66a6 |
07-Oct-2009 |
Mathias Agopian <mathias@google.com> |
fix [2152536] ANR in browser
A window is created and the browser is about to render into it the
very first time, at that point it does an IPC to SF to request a new
buffer. Meanwhile, the window manager removes that window from the
list and the shared memory block it uses is marked as invalid.
However, at that point, another window is created and is given the
same index (that just go freed), but a different identity and resets
the "invalid" bit in the shared block. When we go back to the buffer
allocation code, we're stuck because the surface we're allocating for
is gone and we don't detect it's invalid because the invalid bit has
been reset.
It is not sufficient to check for the invalid bit, I should
also check that identities match.
nclude/private/ui/SharedBufferStack.h
|
| e33e00e931d1381d402484aa5cde67e540e3c82c |
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.
nclude/media/ToneGenerator.h
edia/libmedia/ToneGenerator.cpp
|
| 5bffa09d4483ac31de42077d05d24ba26fab928d |
06-Oct-2009 |
Mathias Agopian <mathias@google.com> |
fix [2168531] have software-only gralloc buffer side-step the HAL
nclude/private/ui/sw_gralloc_handle.h
|
| 9d64a06fd89d125f0c8903bd0448b75853b6c0ef |
06-Oct-2009 |
Mathias Agopian <mathias@google.com> |
fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
When EGLImage extension is not available, SurfaceFlinger will fallback to using
glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an
extra copy. However this code path has never been exercised and had some bugs
which this patch fix.
Mainly the scale factor wasn't computed right when falling back on glDrawElements.
We also fallback to this mode of operation if a buffer doesn't have the adequate
usage bits for EGLImage usage.
This changes only code that is currently not executed. Some refactoring was needed to
keep the change clean. This doesn't change anything functionaly.
nclude/private/ui/SurfaceBuffer.h
nclude/private/ui/android_natives_priv.h
|
| 9563e4284869dfb2d4c8d33bae313fcf7f755afb |
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.
|
| 10dbb8e97e7a81ca4867663b5517f048820b3094 |
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.
nclude/media/IMediaPlayerService.h
nclude/media/mediaplayer.h
edia/libmedia/Android.mk
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| 6d710778613dbae8956b70fd179cb41ca3ac3248 |
05-Oct-2009 |
Patrick Scott <phanna@android.com> |
Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
|
| defd1bd08aaf7edc1918108419cf3f9d185c22f9 |
03-Oct-2009 |
Mathias Agopian <mathias@google.com> |
Attempt to fix [2152536] ANR in browser
The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable.
When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return
immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT.
This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status
in all code paths where a surface is removed from the list.
Additionaly added more information in the logs, should this happen again.
nclude/private/ui/SharedBufferStack.h
|
| 7c29a43a3490d6740d682ab91855424db7af1e17 |
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.
|
| fdf23c711d5d6094c95b43cdc9356a25d67f10c8 |
30-Sep-2009 |
Jianhong Jiang <jianhong@google.com> |
Remove audio latency fudge factor 96 msec.
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 8cdc17ad9ab9f32a659e27ee2e10124641ac796e |
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:
|
| a569aebd284506058a34d9772ebb28c8dac09aa3 |
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
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
|
| d931eef4e585a2f296c26e735be573889e9bc2ee |
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.
|
| 824b6a4a67166c3937400702944f659bd0d5d386 |
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.
nclude/media/ToneGenerator.h
edia/libmedia/ToneGenerator.cpp
|
| 958e24226f43e0f6bba3510b8d0cf690c38447c6 |
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.
|
| cdc9847ba4caa93817a8edf3014919d4480298ad |
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.
|
| 5228dd1b7468bfc86a807a299f515d33048f96ac |
17-Sep-2009 |
Andreas Huber <andih@google.com> |
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
mds/stagefright/stagefright.cpp
edia/libstagefright/OMXCodec.cpp
|
| 5b028421f70c3351a537778302f60ff93e7ff10e |
17-Sep-2009 |
Mathias Agopian <mathias@google.com> |
am bcef9ac3: add basic time stats for surfaces lock time
Merge commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669' into eclair-plus-aosp
* commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669':
add basic time stats for surfaces lock time
|
| 9e3ebf8c45ff1872a473c948acb8b7d9e3648f56 |
17-Sep-2009 |
Mathias Agopian <mathias@google.com> |
add basic time stats for surfaces lock time
nclude/private/ui/SharedBufferStack.h
|
| ee678acd88cbec07c08cd5a36bb98bb99a56371f |
17-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 387eac4b282b9b403af772f92bcad469ae69177f |
22-Jun-2009 |
Ravi K Yenduri <yenduri@pv.com> |
Update comment in mediaplayer.h.
When sending a MEDIA_INFO message, the second integer is supposed
to be an "info" code instead of an "error" code.
nclude/media/mediaplayer.h
|
| 0b183338e6ccf86a43c9c36e86abacbedb94bab0 |
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.
|
| 56a9496a8f4adf3bf27448e1f41757af513c2a40 |
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.
|
| eed9de37440c1b3143b275dd06821392834eb229 |
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.
|
| 4265a834394bfe14a008a2ac58fbbe388566ad07 |
16-Sep-2009 |
Andreas Huber <andih@google.com> |
Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
nclude/media/stagefright/SoftwareRenderer.h
edia/libstagefright/omx/SoftwareRenderer.cpp
|
| 269091da58951736dc2f4c8b74886b6a9aa12be1 |
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...
edia/libstagefright/OMXCodec.cpp
|
| 353bdab3c974c8cf6802e21fce76f9eb7bddac91 |
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.
|
| d159fc0b2982c837248f8dd9d3cc462e7a7f8770 |
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.
|
| 430209e4d4d767e96d1e59a705d1b8b6624cb1e8 |
15-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 25128 into eclair
* changes:
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
|
| 10f75b8c71beb7f327e50bbac8e528af4e40fa24 |
15-Sep-2009 |
Andreas Huber <andih@google.com> |
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
nclude/media/stagefright/SoftwareRenderer.h
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/SoftwareRenderer.cpp
|
| 1b84df1a0823fbcb9cec754311f53eaccfe85ae3 |
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.
mds/stagefright/Android.mk
nclude/media/IOMX.h
edia/libmedia/Android.mk
edia/libmedia/IOMX.cpp
edia/libmediaplayerservice/Android.mk
edia/libstagefright/Android.mk
edia/libstagefright/omx/Android.mk
|
| c77d44c08e24d0c762d4091d41bf1d131f915887 |
15-Sep-2009 |
Mathias Agopian <mathias@google.com> |
am a1212578: Merge change 24947 into eclair
Merge commit 'a1212578bfd11bd391c686c82c18b21b4a3a69b4' into eclair-plus-aosp
* commit 'a1212578bfd11bd391c686c82c18b21b4a3a69b4':
make sure to update the tail pointer when undoing a dequeue
|
| 85cca02ebdc636e9b3ed5894503671fd043bf2a7 |
15-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 24947 into eclair
* changes:
make sure to update the tail pointer when undoing a dequeue
|
| 8d1923fa9d23cccc08f2ee5543fd4f2ff1e2742a |
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...
|
| 5a37cc51551efff88c780088ae8280f87b496472 |
15-Sep-2009 |
Mathias Agopian <mathias@google.com> |
make sure to update the tail pointer when undoing a dequeue
nclude/private/ui/SharedBufferStack.h
|
| 95301196d59fb88ef96342fd307a2be374b5079b |
15-Sep-2009 |
Andreas Huber <andih@google.com> |
Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
edia/libstagefright/OMXCodec.cpp
|
| 50b71a4df0689074c885111c7a07ff5986f9ac8f |
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.
|
| 803d1ab94a74d6205e749909633cec56c742ca44 |
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.
|
| 5583ed437e153a4da013c278f659f0d6a7103941 |
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.
|
| a72e166d734648f7fb27bf4e820e045b0da9f7a5 |
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.
|
| df4de7d7bd0060a84b064ce074d3f86d3a7aa0ae |
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.
edia/libstagefright/OMXCodec.cpp
|
| 13ed932adac2456fb9b4e1a950577374563a8306 |
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).
|
| 8f0e4aace6c0643f7c4005184c7df2c73368f0dc |
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).
mds/stagefright/Android.mk
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/Android.mk
|
| 6f507cf9ad4ca7cc6a4960d18728ab25796dfe6b |
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.
|
| 777893a928680f09e306b4b9efc1d5cf4479a9da |
11-Sep-2009 |
Andreas Huber <andih@google.com> |
Move JPEGSource.{cpp,h} into libstagefright.
mds/stagefright/Android.mk
mds/stagefright/JPEGSource.cpp
mds/stagefright/JPEGSource.h
mds/stagefright/stagefright.cpp
nclude/media/stagefright/JPEGSource.h
edia/libstagefright/Android.mk
edia/libstagefright/JPEGSource.cpp
|
| 6f8ea1927b6b9c31d55820e7d8fbdd3cf0efe98c |
11-Sep-2009 |
Mathias Agopian <mathias@google.com> |
am f84a2182: Merge change 24643 into eclair
Merge commit 'f84a21820b39dbfa983352b7d8ac949e560827d3' into eclair-plus-aosp
* commit 'f84a21820b39dbfa983352b7d8ac949e560827d3':
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
|
| 14bd287d7036935c4fcb15d2dab374c449a77079 |
11-Sep-2009 |
Mathias Agopian <mathias@google.com> |
am 12d2cdcd: Merge change 24642 into eclair
Merge commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b' into eclair-plus-aosp
* commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b':
make sure conditions will return when the status of a surface is not NO_ERROR
|
| 11c043f1f7e2f9c55ad8dec851f7ad3c303d83d1 |
11-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 24643 into eclair
* changes:
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
|
| 997161b0a03e69e7b8d45ac0fc6eb8605797cbd7 |
11-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 24642 into eclair
* changes:
make sure conditions will return when the status of a surface is not NO_ERROR
|
| 4fc61bfdeff922c3bf88aee52a693b52bd98788c |
11-Sep-2009 |
Mathias Agopian <mathias@google.com> |
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
this also fixes part of [2111536] Device is soft rebooted after ending the call through voice dialer
nclude/private/ui/SharedBufferStack.h
|
| 3dbf98cec721828df6c533ed5dfba8ceccaa3933 |
11-Sep-2009 |
Mathias Agopian <mathias@google.com> |
make sure conditions will return when the status of a surface is not NO_ERROR
nclude/private/ui/SharedBufferStack.h
|
| de54b0600fae092480aea6d69ebafb10208a9a45 |
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.
|
| 18291bc20e55e8f3fd5feb786771a8ed32c19c59 |
10-Sep-2009 |
Andreas Huber <andih@google.com> |
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
mds/stagefright/JPEGSource.cpp
mds/stagefright/SineSource.cpp
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MediaDefs.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaDefs.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/ShoutcastSource.cpp
|
| 333551994230eb3271cb980816221b71a2a30b6c |
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
|
| 8cd11d23197209e2c2bdb7980bc17e3f1257a118 |
10-Sep-2009 |
Andreas Huber <andih@google.com> |
Add component name to informational logging in OMXCodec.cpp
edia/libstagefright/OMXCodec.cpp
|
| 0bf876d4f766aaba9125cad09a745b890238d26f |
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.
|
| cc91b7135a1279a9e9317613e8747459297c2c3c |
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.
|
| 04f2ba3367912179f45bf1453212d6a6b3e01559 |
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.
|
| 44d4b64990c34fb69ee012fdec1b0ef1bd3edde8 |
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.
|
| 51ae4a9426fbc0f512facb180439affdb9859645 |
10-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 24448 into eclair
* changes:
Support for amr-wb tracks in MPEG4Extractor.
|
| 25b130939339d57789a86fac837a2a8cedbcb7d8 |
10-Sep-2009 |
Andreas Huber <andih@google.com> |
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
nclude/media/stagefright/MPEG4Writer.h
edia/libstagefright/MPEG4Writer.cpp
|
| 371e243b6638e74e577d56a24eee7d5a97e36d2b |
10-Sep-2009 |
Andreas Huber <andih@google.com> |
Support for amr-wb tracks in MPEG4Extractor.
edia/libstagefright/MPEG4Extractor.cpp
|
| 2f7daa1d7e01bfc2cd7546edeeaea0c3c2ee728c |
10-Sep-2009 |
Andreas Huber <andih@google.com> |
Added some more verbose output for AMR formats. Properly fill out the output format.
edia/libstagefright/OMXCodec.cpp
|
| a3af6fa0c8890575521ed5fa9350bfd4dd6b3393 |
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.
|
| c32e87624aaf6b18df9f9267700d043d265dd135 |
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).
|
| 195ea1e0d4484f1deb2309e239f6a5cc9a7e5ba7 |
08-Sep-2009 |
Andreas Huber <andih@google.com> |
Calculate proper output buffer size for some more 16-bit RGB color spaces.
edia/libstagefright/OMXCodec.cpp
|
| f75978f63a25e79c683e96611f95cb5cd49efd3d |
09-Sep-2009 |
Andreas Huber <andih@google.com> |
Added a .amr file extractor (for AMR-NB and AMR-WB content).
nclude/media/stagefright/AMRExtractor.h
nclude/media/stagefright/MP3Extractor.h
edia/libstagefright/AMRExtractor.cpp
edia/libstagefright/Android.mk
edia/libstagefright/DataSource.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/OMXCodec.cpp
|
| db94808daf034c8735b2838af6b37c62f243b3e6 |
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.
|
| 03480f8ae9df41902b6523493fe19a2a513b8d98 |
09-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 24179 into eclair
* changes:
Support encoding amr-wb content in stagefright.
|
| 5841db78dff14898538200287d246577b1fc37e2 |
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.
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
|
| 62fbc10eaa8ea9d07794b2ba636692b3d107caed |
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.
|
| 85fa14d35468acca07ce0085d67b909f673fae07 |
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.
nclude/media/ToneGenerator.h
edia/libmedia/ToneGenerator.cpp
|
| c5ad7ee4bd6c5310b895767cc5f031556481e87c |
08-Sep-2009 |
Mathias Agopian <mathias@google.com> |
am b80f6983: Merge changes 24119,24120 into eclair
Merge commit 'b80f698362e84b83e1c44c92fb76b0fdf1a5ef6d' into eclair-plus-aosp
* commit 'b80f698362e84b83e1c44c92fb76b0fdf1a5ef6d':
delete old and unused source files
fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
|
| ee7347162e02fb1e44526aa0aae9906485ce3950 |
08-Sep-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge changes 24119,24120 into eclair
* changes:
delete old and unused source files
fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
|
| 3ed8f4a02b390a412586e4c733221c7f6283a2d4 |
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.
|
| 1931f308afe1f8d13822ecadb0fab003c2c4d1d7 |
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.
|
| 8723e5ab1fbe66df796c4f4e303ce29f6ad26f7f |
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.
|
| 456db75516efc889e1ee4e5e16021e77c03b0941 |
08-Sep-2009 |
Andreas Huber <andih@google.com> |
Support encoding amr-wb content in stagefright.
mds/stagefright/record.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| b7802d9ee9c9dbb471ae4f010bd67ba1aaa9f264 |
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.
edia/libstagefright/OMXCodec.cpp
|
| 148c1a2a96774517407717b61e5bc9cb08be8806 |
06-Sep-2009 |
James Dong <jdong@google.com> |
Add basic metadata retrieval support for midi, ogg, etc.
Bug 2050320
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/mediametadataretriever.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.cpp
edia/libmediaplayerservice/MidiMetadataRetriever.h
edia/libmediaplayerservice/VorbisMetadataRetriever.cpp
edia/libmediaplayerservice/VorbisMetadataRetriever.h
|
| 81e2a52fea13e6e4c9468884bfdd936c3c22e226 |
08-Sep-2009 |
Mathias Agopian <mathias@google.com> |
fix [2068105] implement queueBuffer/lockBuffer/dequeueBuffer properly
Rewrote SurfaceFlinger's buffer management from the ground-up.
The design now support an arbitrary number of buffers per surface, however the current implementation is limited to four. Currently only 2 buffers are used in practice.
The main new feature is to be able to dequeue all buffers at once (very important when there are only two).
A client can dequeue all buffers until there are none available, it can lock all buffers except the last one that is used for composition. The client will block then, until a new buffer is enqueued.
The current implementation requires that buffers are locked in the same order they are dequeued and enqueued in the same order they are locked. Only one buffer can be locked at a time.
eg. Allowed sequence: DQ, DQ, LOCK, Q, LOCK, Q
eg. Forbidden sequence: DQ, DQ, LOCK, LOCK, Q, Q
nclude/private/ui/LayerState.h
nclude/private/ui/SharedBufferStack.h
nclude/private/ui/SharedState.h
nclude/private/ui/SurfaceBuffer.h
|
| f2dcfb2be6456a870f1d6c2d4eee00e5a3228ff3 |
04-Sep-2009 |
Andreas Huber <andih@google.com> |
am a19cb68b: Merge change 23908 into eclair
Merge commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8' into eclair-plus-aosp
* commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8':
Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
|
| e07db23c4935e47ecedfec7537ba95163e5836e5 |
04-Sep-2009 |
Andreas Huber <andih@google.com> |
Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
mds/stagefright/stagefright.cpp
|
| f20539dc883506ae0d6d286259ce4165b210bc3f |
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,
|
| 365928e6e1bec6637d10652cce65733557c3be29 |
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.
|
| f482a41c86cf1c28acdd8e0f127b4a628b36535e |
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.
nclude/media/mediascanner.h
|
| bbc68082ad9258606a2c9883a6aad9d8dc93076a |
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.
|
| 1d71746efc2ac9ec83f0673dd7030ef67eedbfb4 |
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.
|
| 7a6b9e2eca7d20457ace3538c689640e5bfda4f3 |
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.
mds/stagefright/record.cpp
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| e5adbeee3401915ff8e1a983396ce3554436b11c |
02-Sep-2009 |
Andreas Huber <andih@google.com> |
Some work to make audio encoding work.
mds/stagefright/Android.mk
mds/stagefright/JPEGSource.cpp
mds/stagefright/SineSource.cpp
mds/stagefright/SineSource.h
mds/stagefright/record.cpp
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 0477639efa74709ebdf413229b5d362ed082093b |
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...
|
| bc327427531dddd3de2e55c093641207c013f0dd |
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...
|
| ffc8a11ea3c1549f41d834b54eb1e519d6699eed |
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:
|
| 104b12d973d365d2ab66b77f638a117bf4496af8 |
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.
edia/libstagefright/HTTPStream.cpp
|
| 37940eefcba982836b579fe1ffec6cada72b0974 |
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...
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| b15a52fbb4240846ded453fbe5e729469490b1ea |
01-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 9a9d3f56362158dbdd1e3e5ffdbcba8604c2d675 |
01-Sep-2009 |
Andreas Huber <andih@google.com> |
am bf1071c0: Merge change 23356 into eclair
Merge commit 'bf1071c07979b03a9f5e8281aba82ed05513185e' into eclair-plus-aosp
* commit 'bf1071c07979b03a9f5e8281aba82ed05513185e':
Temporarily unlock our mutex while fetching a buffer from the upstream source.
|
| 53f2b2ae6417e8a32961e05cf21920c540d8b823 |
01-Sep-2009 |
Andreas Huber <andih@google.com> |
Temporarily unlock our mutex while fetching a buffer from the upstream source.
edia/libstagefright/OMXCodec.cpp
|
| 6740ed8deb799dd21a527b6aac4ea5096ad9045b |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
am 421f5f71: Merge change 23169 into eclair
Merge commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe' into eclair-plus-aosp
* commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe':
More assert => CHECK
|
| 91440855a178365c5074a782831ab219afb9e274 |
28-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 23169 into eclair
* changes:
More assert => CHECK
|
| 16bd73f7979056251aa7c27672eedd39a2b2d297 |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
am 4b027f12: Merge change 23165 into eclair
Merge commit '4b027f128fea32bfcabee55bf4d994400453c00c' into eclair-plus-aosp
* commit '4b027f128fea32bfcabee55bf4d994400453c00c':
Fixes a race condition between entering ERROR state and initial buffer submit.
|
| 6d43768514650d65f4f3695da4f7c3e2eefd483c |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
More assert => CHECK
mds/stagefright/record.cpp
|
| 450bf4b0d25c933431b790d911a5fcae750fe38d |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
Fixes a race condition between entering ERROR state and initial buffer submit.
edia/libstagefright/OMXCodec.cpp
|
| 6a26162f6df757f87fbc42075da5ba1f57a90515 |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
am 01248f0f: Merge change 23103 into eclair
Merge commit '01248f0f18b681b69745ad716deff78a7c9e9adc' into eclair-plus-aosp
* commit '01248f0f18b681b69745ad716deff78a7c9e9adc':
Fixing the build.
|
| a8a371c8a0d88d144d095404673d00cae6464fde |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
Fixing the build.
mds/stagefright/stagefright.cpp
|
| c53a8d33d5bea1ff6d5ef94135cb2a014d1ed46b |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
am bf8ecd7c: Merge change 22991 into eclair
Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp
* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
Apparently setting the preferred role of the OMX component is now required on this platform.
|
| 7f75ced4cdf3a1bbe7ace32e5e806aaaa38c7ad6 |
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.
|
| 7d719af770ddefc3739fd0597634dea553c5569a |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
Apparently setting the preferred role of the OMX component is now required on this platform.
edia/libstagefright/OMXCodec.cpp
|
| 28ef8168eb26a3e53da5f90b2e670f8d2fc41fb3 |
28-Aug-2009 |
Andreas Huber <andih@google.com> |
am c1dccce7: Merge change 22986 into eclair
Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp
* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
Squashed commit of the following:
|
| ab0a5c456a5da571baa4c7f2bc4f3409194f11ba |
28-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 22986 into eclair
* changes:
Squashed commit of the following:
|
| cf17f4e3f389921c38d766bfc4ec36e36643113a |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
am 5352e237: Merge change 22968 into eclair
Merge commit '5352e237cad365f39c87aaeda3822c891c7ca474' into eclair-plus-aosp
* commit '5352e237cad365f39c87aaeda3822c891c7ca474':
Fix a typo.
|
| e0f0b08aa692d15f3bfa19e10abfc84803c099b4 |
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.
mds/stagefright/Android.mk
mds/stagefright/play.cpp
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
nclude/media/IOMX.h
nclude/media/stagefright/OMXClient.h
nclude/media/stagefright/OMXDecoder.h
edia/libstagefright/Android.mk
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXDecoder.cpp
|
| 83dc92f8733a7da4a8addf6075c58d3ddb47aa5c |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
Fix a typo.
edia/libstagefright/SampleTable.cpp
|
| 461280cdd640a4a58f3d8319ba0deb11b6306028 |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
am e18d4d01: Merge change 22938 into eclair
Merge commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851' into eclair-plus-aosp
* commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851':
Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
|
| 152755d265427fb47d836f1022585afab61e0350 |
27-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 22938 into eclair
* changes:
Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
|
| 80011fe130bc966aa357ed2b3dcc80cde2d0bb82 |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
mds/stagefright/stagefright.cpp
|
| 46d39f0b886a88d2de1be46556b767edcc6687c6 |
27-Aug-2009 |
Eric Laurent <elaurent@google.com> |
am bc86bda4: Merge change 22897 into eclair
Merge commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd' into eclair-plus-aosp
* commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd':
Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
|
| 63d88ff95d9c1d5be1850f732c4dd05088abaeee |
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.
|
| c2d94ad5187a85cbd961562a3029856f8b3bc77a |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
am e0daf804: Merge change 22921 into eclair
Merge commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519' into eclair-plus-aosp
* commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519':
An attempt to fix a deadlock between OMXCodec::start and upstream ::read
|
| 284f513a4ce2c5aa0e250c07c873731aedb0be26 |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
An attempt to fix a deadlock between OMXCodec::start and upstream ::read
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 4f64953af06bf69cba13a298c7f2f3ca2575ac11 |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
am 650b872c: Merge change 22830 into eclair
Merge commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0' into eclair-plus-aosp
* commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0':
Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
|
| a9c322e398a1f5fdcace3b8b73967f010b1c31ca |
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.
nclude/media/AudioSystem.h
edia/libmedia/AudioSystem.cpp
|
| 8297cedd12f689167d74de5ddacb514e9f6896ea |
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...
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| e28a36473f350d568f44cd8f69a09ebdbfbf87ad |
27-Aug-2009 |
Andreas Huber <andih@google.com> |
am 2d829928: Merge change 22818 into eclair
Merge commit '2d829928792f99f9cf44ca5d9d1c1eb6cb771c5a' into eclair-plus-aosp
* commit '2d829928792f99f9cf44ca5d9d1c1eb6cb771c5a':
assert => CHECK in stagefright.
|
| 0c89199745bc1bf05b997fc7c342017807676b6f |
26-Aug-2009 |
Andreas Huber <andih@google.com> |
assert => CHECK in stagefright.
nclude/media/stagefright/MediaDebug.h
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/MediaBufferGroup.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/MetaData.cpp
edia/libstagefright/MmapSource.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OMXDecoder.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/QComHardwareRenderer.cpp
edia/libstagefright/omx/SoftwareRenderer.cpp
|
| f694a9b0ffd3c15f75f8c30785552eac2b87e256 |
26-Aug-2009 |
Andreas Huber <andih@google.com> |
am 4b8e3fb5: Merge change 22777 into eclair
Merge commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf' into eclair-plus-aosp
* commit '4b8e3fb51155ab6c990803ff7780cd1b8c8f3dcf':
Disregard the EOS buffer flag while flushing or shutting down the decoder.
|
| 355edcea2f15c0f619c1e1d0f4fa433b0d38098f |
26-Aug-2009 |
Andreas Huber <andih@google.com> |
Disregard the EOS buffer flag while flushing or shutting down the decoder.
edia/libstagefright/OMXCodec.cpp
|
| a99af4ff342040cbc72af10f08351c5cef8ff865 |
26-Aug-2009 |
Andreas Huber <andih@google.com> |
am c27bff91: Merge change 22774 into eclair
Merge commit 'c27bff913a2c9c4a1f42b00951740cf139cb19ad' into eclair-plus-aosp
* commit 'c27bff913a2c9c4a1f42b00951740cf139cb19ad':
Added a commandline option to "stagefright" that limits decoding to a maximum number of frames per iteration.
|
| bddb93a06d329c3d58864713c6e03b606310efb8 |
26-Aug-2009 |
Andreas Huber <andih@google.com> |
am 867bb7c3: Merge change 22773 into eclair
Merge commit '867bb7c3538cc66c378a695996cf8290a8774491' into eclair-plus-aosp
* commit '867bb7c3538cc66c378a695996cf8290a8774491':
Keep up with latest changes to overlay handling on that unnamable platform.
|
| 38b610fe53bb27946826d3f175f6fbe613f270da |
26-Aug-2009 |
Andreas Huber <andih@google.com> |
Added a commandline option to "stagefright" that limits decoding to a maximum number of frames per iteration.
mds/stagefright/stagefright.cpp
|
| ea7d15629752256f6ea1d5c6ea796e59aefd030f |
26-Aug-2009 |
Andreas Huber <andih@google.com> |
Keep up with latest changes to overlay handling on that unnamable platform.
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/TIHardwareRenderer.h
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/TIHardwareRenderer.cpp
|
| 623d005e0cdbe5f1edf321d883ddeb5cc8d0820a |
26-Aug-2009 |
Martin Storsjo <martin@martin.st> |
am 09f4c942: Merge change 22710 into eclair
Merge commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992' into eclair-plus-aosp
* commit '09f4c94233502eeb19d4a4c8f05cd331e64c4992':
Calculate specular lighting correctly
|
| 4e3d2484c96508d5dea5296f41de4e46612fb7c4 |
11-Aug-2009 |
Martin Storsjo <martin@martin.st> |
Calculate specular lighting correctly
Since the lighting calculations are done in object space, the vector
from the object to the viewer also needs to be transformed to object
space.
nclude/private/opengles/gl_context.h
|
| 195c300232df0768dbfcb35dd6877a8ad370422a |
25-Aug-2009 |
Android Code Review <code-review@android.com> |
Merge change 11106
* changes:
Calculate specular lighting correctly
|
| fc753cda6b72ed145cdae22c689fa555e0c0357c |
25-Aug-2009 |
Andreas Huber <andih@google.com> |
am f96d49a2: Merge change 22646 into eclair
Merge commit 'f96d49a277af9ec888bb7d15988b57989ccb39af' into eclair-plus-aosp
* commit 'f96d49a277af9ec888bb7d15988b57989ccb39af':
Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
|
| 1beb760d920561679862ded945a04e370368c7f7 |
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.
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| 6b5ff0798d651bb7ce9fc02a7a9673f5fa8d78d2 |
21-Aug-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| ff5fffd65cb639db5bb7c62a4313c6d3dd777a72 |
21-Aug-2009 |
Android Code Review <code-review@android.com> |
Merge change 10274
* changes:
Ignore pause and seek for live streaming.
|
| 2ea76ead54982376e32ab196093babded80e05e4 |
21-Aug-2009 |
Andreas Huber <andih@google.com> |
Enable specification of http:// urls in stagefright commandline tool.
mds/stagefright/stagefright.cpp
|
| 7530e9c708275c273c134c36c68179f511c1940e |
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.
mds/stagefright/JPEGSource.cpp
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
edia/libstagefright/OMXCodec.cpp
|
| bde3caae211e215e4bbfef1a267f8d680efa4764 |
19-Aug-2009 |
Andreas Huber <andih@google.com> |
Better (proper) parsing of the AVCDecoderConfigurationRecord, respect hardware decoder profile/level limits.
edia/libstagefright/OMXCodec.cpp
|
| dbc03445db2bbf83b64f0c0a5dc62e61408864d7 |
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.
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/OMXDecoder.h
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OMXDecoder.cpp
|
| 6d61edc7110775773d966e688731a80221d7666d |
18-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 21745 into eclair
* changes:
Refactored "stagefright" commandline app, split off JPEGSource.
|
| 2d7d46fb2d7f5f80afbf060f25ed049079fb0fc9 |
18-Aug-2009 |
Andreas Huber <andih@google.com> |
Refactored "stagefright" commandline app, split off JPEGSource.
mds/stagefright/Android.mk
mds/stagefright/JPEGSource.cpp
mds/stagefright/JPEGSource.h
mds/stagefright/stagefright.cpp
nclude/media/stagefright/MediaBufferGroup.h
|
| c1a8d2f170aef7bb7664e25d6a8275f246260d12 |
18-Aug-2009 |
Feng Qian <fqian@google.com> |
Fix missing -lpthread in linux-sim build.
It mimics the behavior in libstagefraight/Android.mk
edia/libstagefright/omx/Android.mk
|
| 3781a13f6853abf2b47b6b8d7f4fcabc10c1c804 |
18-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 21576 into eclair
* changes:
Support for marshalling pointers / intptr_t in Parcel.
|
| c6b59b7c8acf7c6e7fbb93470aecc2c0ebe1b084 |
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.
edia/libmedia/IOMX.cpp
|
| df64839ff6ba7848cf2ae27ed9456cea61dd9714 |
17-Aug-2009 |
Andreas Huber <andih@google.com> |
am ffbd2426: Merge change 21340 into eclair
Merge commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5'
* commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5':
Squashed commit of the following:
|
| 693d271e62a3726689ff68f4505ba49228eb94b2 |
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).
mds/stagefright/Android.mk
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
nclude/media/IOMX.h
nclude/media/stagefright/AudioPlayer.h
nclude/media/stagefright/CachingDataSource.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/MP3Extractor.h
nclude/media/stagefright/MPEG4Extractor.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaBuffer.h
nclude/media/stagefright/MediaDebug.h
nclude/media/stagefright/MediaExtractor.h
nclude/media/stagefright/MediaPlayerImpl.h
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/OMXCodec.h
nclude/media/stagefright/OMXDecoder.h
nclude/media/stagefright/SampleTable.h
edia/libmedia/IOMX.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXCodec.cpp
edia/libstagefright/OMXDecoder.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMX.h
|
| e99fc320b6b15c4508946513deebc4ecbee2a4e4 |
15-Aug-2009 |
Sahil Sachdeva <sahils@google.com> |
am c9706f02: (-s ours) DO NOT MERGE, ALready merged to master. 1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
Merge commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069'
* commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069':
DO NOT MERGE, ALready merged to master.
|
| 59ecb64c9629ab02329f8240c85b820ee0c98a2e |
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.
nclude/media/mediametadataretriever.h
|
| b0ea9ad85b9cb407d560304acdb8da8ba2e86d2d |
14-Aug-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 21018
* changes:
1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
|
| acd2bd7d87745141e0d095988506fce8f939bb58 |
13-Aug-2009 |
Sahil Sachdeva <sahils@google.com> |
1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
nclude/media/mediametadataretriever.h
|
| 806a5fcb30abd2959381774e54f6dec79d6d86f4 |
14-Aug-2009 |
Mathias Agopian <mathias@google.com> |
be more friendly with C
nclude/private/ui/android_natives_priv.h
|
| 5a22b909c9e8fc0d9321dcc014706a790b26b971 |
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.
edia/libmedia/ToneGenerator.cpp
|
| 5db6bca7c05c01c6bc9f7cc759cf1249331dc1a2 |
11-Aug-2009 |
Martin Storsjo <martin@martin.st> |
Calculate specular lighting correctly
Since the lighting calculations are done in object space, the vector
from the object to the viewer also needs to be transformed to object
space.
nclude/private/opengles/gl_context.h
|
| f4148b55c5d6f68b22462e3880015fefa91ae7c6 |
07-Aug-2009 |
Andreas Huber <andih@google.com> |
Expose a variation of the createRenderer API that works on a plain Surface.
nclude/media/IOMX.h
edia/libmedia/IOMX.cpp
edia/libstagefright/MediaPlayerImpl.cpp
|
| 408b8e1073385d0d09bb96b9952f84731a0b4aeb |
07-Aug-2009 |
Andreas Huber <andih@google.com> |
Deprecate/remove now unused socketpair ipc communication in favour of exclusive binder use.
nclude/media/IOMX.h
nclude/media/stagefright/OMXClient.h
edia/libmedia/IOMX.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXDecoder.cpp
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMX.h
|
| 47f59cfe40b0ebb3afd6c39f97dcd1eac2e966f7 |
07-Aug-2009 |
Andreas Huber <andih@google.com> |
Build the stagefright library by default.
mds/stagefright/Android.mk
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/Android.mk
edia/libstagefright/omx/Android.mk
|
| 23aea9771d800ce43ffd8a23ad64ed6cead4b159 |
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.
|
| fa2877b9ea48baed934b866d2ab3658b69c4c869 |
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.
nclude/media/AudioSystem.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
edia/libmedia/AudioSystem.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioPolicyService.cpp
|
| 285ead29c9eee092d367effd89f1c9f4f0bb9d6c |
07-Aug-2009 |
Andreas Huber <andih@google.com> |
The mp3 decoder now correctly uses microseconds to measure time. One less quirk.
edia/libstagefright/OMXDecoder.cpp
|
| bf37f3364804f521cc61845b1f1ce16fe133814b |
04-Aug-2009 |
Andreas Huber <andih@google.com> |
Recording/Export to .mp4/h.263 somewhat works on TI hardware.
mds/stagefright/record.cpp
nclude/media/stagefright/OMXDecoder.h
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/OMXDecoder.cpp
|
| 3302526f6276911b2dc40c731ea7fa0e7972d908 |
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.
edia/libmedia/AudioTrack.cpp
|
| fd6444c51fb985d66ca9aae491759ce750bb173a |
04-Aug-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 8b938cdab5bd3d074d9b41bc2915fcfc11e47f27 |
31-Jul-2009 |
Andreas Huber <andih@google.com> |
The IOMX interface now instantiates IOMXRenderers to hide the details of hardware accelerated blitting.
nclude/media/IOMX.h
nclude/media/stagefright/MediaPlayerImpl.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/SurfaceRenderer.h
edia/libmedia/IOMX.cpp
edia/libstagefright/Android.mk
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/OMXDecoder.cpp
edia/libstagefright/QComHardwareRenderer.cpp
edia/libstagefright/SoftwareRenderer.cpp
edia/libstagefright/SurfaceRenderer.cpp
edia/libstagefright/TIHardwareRenderer.cpp
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMX.h
edia/libstagefright/omx/OMXRenderer.h
edia/libstagefright/omx/QComHardwareRenderer.cpp
edia/libstagefright/omx/SoftwareRenderer.cpp
edia/libstagefright/omx/TIHardwareRenderer.cpp
|
| 81573ec97eaf631cc63eedceb928e123dafd593c |
30-Jul-2009 |
James Dong <jdong@google.com> |
Remove hardcoded maximum frame rate limit from the framework
bug 1993400
nclude/media/mediarecorder.h
|
| 264fb313a0ba1302a6b47dab63b54b5e2fb097fd |
30-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am f4dc9da3: Merge snapshot variant of donut back into the main tree
Merge commit 'f4dc9da3724c20837e3a361060acd139775541ac'
* commit 'f4dc9da3724c20837e3a361060acd139775541ac':
donut snapshot
|
| 5b891948562c99cc44dca5d67f8d4e157ab6255a |
29-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from donut
|
| 3ccdc3efed7008264f23e99ff78f3f99b9b4f185 |
29-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge snapshot variant of donut back into the main tree
|
| 6db15db8cd58f69630f47e66180ab38efa92a634 |
29-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
donut snapshot
edia/libmedia/ToneGenerator.cpp
|
| cfb3bc79a0e4d60ee2512c4ddbb85c424cc96c19 |
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.
nclude/media/stagefright/OMXDecoder.h
edia/libstagefright/OMXDecoder.cpp
|
| 0024245e134467d120b40099da16c467dc365e76 |
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.
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
nclude/media/stagefright/OMXDecoder.h
nclude/media/stagefright/TIHardwareRenderer.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libstagefright/Android.mk
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/OMXDecoder.cpp
edia/libstagefright/TIHardwareRenderer.cpp
|
| 9a92037bd6477533062d635b676a6c9833aab96e |
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.
nclude/media/AudioSystem.h
|
| 805544f3023b0168f5040efe15a8543c0bad6db6 |
26-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
reconcile korg/master into goog/master
|
| 79482780ebb7616db8a36511f595fcfe942f51c1 |
26-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge korg/donut into korg/master
|
| c2f1f07084818942352c6bbfb36af9b6b330eb4e |
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()
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
nclude/media/IAudioPolicyService.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/Android.mk
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioPolicyService.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/mediaserver/main_mediaserver.cpp
|
| a64c8c79af1a15911c55306d83a797fa50969f77 |
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.
nclude/media/MediaPlayerInterface.h
nclude/media/Metadata.h
nclude/media/PVPlayer.h
edia/libmedia/Android.mk
edia/libmedia/Metadata.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libmediaplayerservice/TestPlayerStub.h
edia/libmediaplayerservice/VorbisPlayer.h
|
| 8445fd927053268929125a6a9406ec3b622e2920 |
21-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am db7db69a: Merge snapshot variant of donut back into main tree
Merge commit 'db7db69a2162439bf722d0f1f65429ca3ca19dcd'
* commit 'db7db69a2162439bf722d0f1f65429ca3ca19dcd':
donut snapshot
|
| 54d6a3324203b76b185dcc53f39f245840438efc |
21-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge snapshot variant of donut back into main tree
|
| 6d9d4ac96142880c35d6bee520347a9db74f92ed |
21-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
donut snapshot
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IMediaPlayerService.h
nclude/media/MediaPlayerInterface.h
nclude/media/ToneGenerator.h
nclude/media/mediaplayer.h
nclude/media/mediarecorder.h
nclude/private/media/AudioTrackShared.h
nclude/private/opengles/gl_context.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/VorbisPlayer.cpp
|
| e7656d6494a8cb45daeab03393dcb4fa264502c2 |
20-Jul-2009 |
Andreas Huber <andih@google.com> |
Fixing the build: StagefrightPlayer now implements the newly introduced "getMetadata" pure virtual.
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
|
| d608a813a9d2cbc6e2a5ea81d78d4a9044090c4c |
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.
nclude/media/MediaPlayerInterface.h
nclude/media/PVPlayer.h
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/TestPlayerStub.h
edia/libmediaplayerservice/VorbisPlayer.h
|
| 919f7387f2eafc36223a5cd599fb46871f801b10 |
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.
|
| c8d6c8bdd84464e0c7e511241ede2299cf38fda4 |
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.
edia/libstagefright/MP3Extractor.cpp
|
| 548681f9bd906600ab523b87e045c1e829b0c767 |
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.
edia/libstagefright/omx/OMX.cpp
|
| 72b56ef3d9f164159f58725781b01dd3b052b51a |
17-Jul-2009 |
Marco Nelissen <marcone@google.com> |
Another fix for building libstagefright for the simulator, plus whitespace adjustments.
edia/libstagefright/Android.mk
|
| 361f482fd229c4d0b683d04c93b9da4ab01660b7 |
17-Jul-2009 |
Marco Nelissen <marcone@google.com> |
Fixes to make libstagefright build for the simulator.
nclude/media/stagefright/TimeSource.h
edia/libstagefright/TimeSource.cpp
edia/libstagefright/TimedEventQueue.cpp
|
| 039eaad415ab29945a7f31c0c3fd6b246b0bba47 |
16-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge-ignore changes that were already in or that are not relevant
Merge commit '7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD
|
| 14d2747c7e54037e267bcff78b29e65b2181f0fa |
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.
nclude/media/MediaPlayerInterface.h
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/TestPlayerStub.cpp
edia/libmediaplayerservice/TestPlayerStub.h
|
| 20111aa043c5f404472bc63b90bc5aad906b1101 |
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.
mds/stagefright/Android.mk
mds/stagefright/WaveWriter.h
mds/stagefright/play.cpp
mds/stagefright/record.cpp
mds/stagefright/stagefright.cpp
nclude/media/IMediaPlayerService.h
nclude/media/IOMX.h
nclude/media/MediaPlayerInterface.h
nclude/media/stagefright/AudioPlayer.h
nclude/media/stagefright/AudioSource.h
nclude/media/stagefright/CachingDataSource.h
nclude/media/stagefright/CameraSource.h
nclude/media/stagefright/DataSource.h
nclude/media/stagefright/ESDS.h
nclude/media/stagefright/FileSource.h
nclude/media/stagefright/HTTPDataSource.h
nclude/media/stagefright/HTTPStream.h
nclude/media/stagefright/MP3Extractor.h
nclude/media/stagefright/MPEG4Extractor.h
nclude/media/stagefright/MPEG4Writer.h
nclude/media/stagefright/MediaBuffer.h
nclude/media/stagefright/MediaBufferGroup.h
nclude/media/stagefright/MediaErrors.h
nclude/media/stagefright/MediaExtractor.h
nclude/media/stagefright/MediaPlayerImpl.h
nclude/media/stagefright/MediaSource.h
nclude/media/stagefright/MetaData.h
nclude/media/stagefright/MmapSource.h
nclude/media/stagefright/OMXClient.h
nclude/media/stagefright/OMXDecoder.h
nclude/media/stagefright/QComHardwareRenderer.h
nclude/media/stagefright/SampleTable.h
nclude/media/stagefright/ShoutcastSource.h
nclude/media/stagefright/SoftwareRenderer.h
nclude/media/stagefright/SurfaceRenderer.h
nclude/media/stagefright/TimeSource.h
nclude/media/stagefright/TimedEventQueue.h
nclude/media/stagefright/Utils.h
nclude/media/stagefright/VideoRenderer.h
nclude/media/stagefright/string.h
edia/libmedia/Android.mk
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IOMX.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/StagefrightPlayer.cpp
edia/libmediaplayerservice/StagefrightPlayer.h
edia/libstagefright/Android.mk
edia/libstagefright/AudioPlayer.cpp
edia/libstagefright/CachingDataSource.cpp
edia/libstagefright/CameraSource.cpp
edia/libstagefright/DataSource.cpp
edia/libstagefright/ESDS.cpp
edia/libstagefright/FileSource.cpp
edia/libstagefright/HTTPDataSource.cpp
edia/libstagefright/HTTPStream.cpp
edia/libstagefright/MP3Extractor.cpp
edia/libstagefright/MPEG4Extractor.cpp
edia/libstagefright/MPEG4Writer.cpp
edia/libstagefright/MediaBuffer.cpp
edia/libstagefright/MediaBufferGroup.cpp
edia/libstagefright/MediaExtractor.cpp
edia/libstagefright/MediaPlayerImpl.cpp
edia/libstagefright/MediaSource.cpp
edia/libstagefright/MetaData.cpp
edia/libstagefright/MmapSource.cpp
edia/libstagefright/OMXClient.cpp
edia/libstagefright/OMXDecoder.cpp
edia/libstagefright/QComHardwareRenderer.cpp
edia/libstagefright/SampleTable.cpp
edia/libstagefright/ShoutcastSource.cpp
edia/libstagefright/SoftwareRenderer.cpp
edia/libstagefright/SurfaceRenderer.cpp
edia/libstagefright/TimeSource.cpp
edia/libstagefright/TimedEventQueue.cpp
edia/libstagefright/Utils.cpp
edia/libstagefright/omx/Android.mk
edia/libstagefright/omx/OMX.cpp
edia/libstagefright/omx/OMX.h
edia/libstagefright/string.cpp
|
| 508a3b61c4bce835f721237ddd40922b61f069d7 |
15-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 7150
* changes:
Ignore pause and seek for live streaming.
|
| a25f0fcebaa9fcb550ae2ccd5913085ae48b1018 |
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
|
| 7b115569a3816783bfa7f980e2208a6f9d96daa1 |
04-Jun-2009 |
Ravi K Yenduri <yenduri@pv.com> |
Ignore pause and seek for live streaming.
nclude/media/PVPlayer.h
|
| 2b50fba2b143c2e0597c941d67bea1b8e80c9caf |
14-Jul-2009 |
Mathias Agopian <mathias@google.com> |
first attempt to fix the sim
edia/libmedia/Android.mk
|
| b07c28b90b2d2793be2b8878d813b607f3eebbb7 |
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
nclude/private/ui/SharedState.h
edia/libmedia/AudioTrack.cpp
|
| 43d2c03d8ff8c623391a17b10e01a601d55d5b1e |
14-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 6898
* changes:
implement Mutex and Condition with pthread instead of calling futex directly.
|
| bc30e7ed92f34a1e383ecd1316c8fe4019026314 |
14-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 6812
* changes:
Implemented the tracking of the metadata updates.
|
| 00ee4800348236184d8aaa3b8285a9e2a3df712d |
13-Jul-2009 |
Mathias Agopian <mathias@google.com> |
implement Mutex and Condition with pthread instead of calling futex directly.
internally pthread uses futex. the implementation consists of simple inlines
there are no implementation files anymore.
nclude/private/utils/futex_synchro.h
|
| 4829038419910aa6e75ce8992d45a223452d5c67 |
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.
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| aa37173500f221298fa618b5ca8b4814aff5ef31 |
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.
edia/libmedia/mediaplayer.cpp
|
| 8e1b6cce24574b9ecd5b0300155776bd0b4ef756 |
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
nclude/media/IMediaPlayer.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| a920ee99dc97b54b661d1238d8c26ac07c875bed |
09-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 6636
* changes:
Implemented the metadata changed notification filters.
|
| 699f095c05229c5f3d21c54d55698de4f30eaa35 |
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
|
| a7e0e8b4c429fc68eb1bd5b5a30f5b91352288f9 |
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.
nclude/media/IMediaPlayer.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
|
| c38bb0614dc0b5dee682b9a1de47de5ae7d215d8 |
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.
edia/libmedia/ToneGenerator.cpp
|
| 814914cd0858cafaa6ad625e3012de97d213636d |
07-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 6382
* changes:
add a virtual destructor to region_rasterizer, to be on the safe side
|
| 7c5252ed0a5d8d01d7ad8ce24fdd465e91938d4d |
07-Jul-2009 |
Mathias Agopian <mathias@google.com> |
add a virtual destructor to region_rasterizer, to be on the safe side
nclude/private/ui/RegionHelper.h
|
| 349dba337e07e129f6ba49a132999f0b73fedbe3 |
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
|
| 573266210fb2b2e7d86fbd46d0dfe16763611d91 |
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.
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| 82827d70378961f30077d3a35a06aab58c368d52 |
02-Jul-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
|
| 24a5bdab1a1fb8516c270927b811763510986c8f |
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
|
| 76aa28371e93829927c66f1a48e39e18e01d704d |
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.
edia/libmediaplayerservice/VorbisPlayer.cpp
|
| e35922dc7121ddbd2ec7923e0756adb92046b8ff |
25-Jun-2009 |
Mathias Agopian <mathias@google.com> |
merge master in master_gl
|
| 1d187f1a86855f5f0694d7ec30efc9833bf7c589 |
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.
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerService.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVPlayer.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/VorbisPlayer.h
|
| 3d59a4b99937a7d0dc07eec2574cc8a98cc99fdd |
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
|
| 5e0a3043af16bc71a4211ee00dc00724de6623a7 |
17-Jun-2009 |
David Krause <david.krause@motorola.com> |
Fill in CDMA gaps and clean up ToneGenerator code
nclude/media/ToneGenerator.h
edia/libmedia/ToneGenerator.cpp
|
| e4f071b1f3d2da871a1a05446c32c0f324b52f1e |
23-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 5277103d: Merge change 5035 into donut
Merge commit '5277103db9033226814edc8fcba6f4ba4e846678'
* commit '5277103db9033226814edc8fcba6f4ba4e846678':
add glTexParameteri() and fix glTexParameteriv()
|
| f1bd03d1eb0505a32485b1a52c7c8c5ed4e96765 |
23-Jun-2009 |
Mathias Agopian <mathias@google.com> |
add glTexParameteri() and fix glTexParameteriv()
nclude/private/opengles/gl_context.h
|
| 56f0cc533a38bdb84bc03adcb43515614ab21bae |
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.
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
|
| db8749bce64510d9ca603e5321be7657d3616deb |
16-Jun-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
|
| 4710a1f6c9800dae90f9e2702ba2b5b54c095eae |
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.
|
| 660951867e959ebe98612742ef1f72d33ea7e9a3 |
12-Jun-2009 |
Nicolas Catania <niko@google.com> |
Removed trailing whitespaces.
nclude/media/IMediaPlayerService.h
nclude/media/MediaPlayerInterface.h
nclude/media/mediaplayer.h
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/mediaplayer.cpp
|
| 2ff585f4bdcce8a8db81956c2fba1c12db7f8a9d |
11-Jun-2009 |
Mathias Agopian <mathias@google.com> |
fix a bug where copybit only renders in the first buffer when used with s/w GL
nclude/private/opengles/gl_context.h
|
| 79021f4b514a3847263586df8702a98af3a1d0d1 |
10-Jun-2009 |
Mathias Agopian <mathias@google.com> |
revive the copybit test.
nclude/private/ui/SurfaceBuffer.h
|
| 2a7d5b3c1a3749db7c4ace34bf1253c44967e843 |
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).
|
| 9747c5a1f5e51fab72169767972bf55f73711000 |
08-Jun-2009 |
Jianhong Jiang <jianhong@google.com> |
NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
nclude/media/mediarecorder.h
edia/libmedia/mediarecorder.cpp
|
| 348514d9be0488a1bda9680ea2f5da9ae779faa6 |
05-Jun-2009 |
Mathias Agopian <mathias@google.com> |
cleanup Debug.h a bit
nclude/private/ui/SharedState.h
|
| f853bb74a196b5403482bf8e8cf9429081fa5974 |
04-Jun-2009 |
Ravi K Yenduri <yenduri@pv.com> |
Ignore pause and seek for live streaming.
nclude/media/PVPlayer.h
|
| 6f74b0cc490a3b8523252ded00f7ca55160effd1 |
04-Jun-2009 |
Mathias Agopian <mathias@google.com> |
fix build
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| cf77b16ef9e081baf76877ab7ed99de734fcf2ea |
01-Jun-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
|
| 273d098cc72a88c797d01c7dff0c1350f315f05f |
01-Jun-2009 |
Mathias Agopian <mathias@google.com> |
get rid of utils.h
nclude/media/mediarecorder.h
nclude/media/mediascanner.h
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MetadataRetrieverClient.h
|
| 0b4a2fb7ce6961e27a3cf082297277a53ef2d524 |
27-May-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
|
| 489d60ec36c3927c9ee0bc14a44c1c77b74c09f6 |
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
|
| b7056fc8525e0515c6f46676e3307088f8b64cdc |
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.
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
|
| 172fb9ab347e146642234f0bd6f223d351e9fd0b |
26-May-2009 |
Dave Sparks <davidsparks@android.com> |
setVolume did not check interface descriptor
DO NOT MERGE
edia/libmedia/IMediaPlayer.cpp
|
| 95634c8b6ad5419e310a5196bcc37f5988ed82da |
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
|
| f5879c1448cc6aebc51b26d3ec2399d66144f8f4 |
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.
nclude/media/AudioRecord.h
nclude/media/IAudioFlinger.h
nclude/media/mediarecorder.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/IAudioFlinger.cpp
|
| 794aaef95e1afa06b68a93c9fe9c881cf438c76a |
22-May-2009 |
Mathias Agopian <mathias@google.com> |
merge master to master_gl
|
| 0058db5fae0fecf66ee47aa1c35ddd6e11b6c66f |
21-May-2009 |
Dave Sparks <nobody@android.com> |
am f84d654c: am 4d8adefd: AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder. When we moved the media recorder to the media server process, we lost the permission check that was done at the process boundary in the AudioRecord binder interface because the AudioRecord object is created in the same process. This change adds a permission check in the MediaRecorderClient:setAudioSource() method. BUG=1868334
Merge commit 'f84d654cf9cf7ce3694ebb6913d78edd868d49fb'
* commit 'f84d654cf9cf7ce3694ebb6913d78edd868d49fb':
AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.
|
| 260b80b02d35a29c7010b10e5bea504164441665 |
21-May-2009 |
Dave Sparks <nobody@android.com> |
am 4d8adefd: AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder. When we moved the media recorder to the media server process, we lost the permission check that was done at the process boundary in the AudioRecord binder interface because the AudioRecord object is created in the same process. This change adds a permission check in the MediaRecorderClient:setAudioSource() method. BUG=1868334
Merge commit '4d8adefd35efdea849611b8b02d61f9517e47760' into donut
* commit '4d8adefd35efdea849611b8b02d61f9517e47760':
AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.
|
| 83a1a84c4c50c1003edafe07ba018bb5438f7b8f |
21-May-2009 |
Dave Sparks <nobody@android.com> |
AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.
When we moved the media recorder to the media server process, we lost
the permission check that was done at the process boundary in the
AudioRecord binder interface because the AudioRecord object is created
in the same process. This change adds a permission check in the
MediaRecorderClient:setAudioSource() method.
BUG=1868334
Automated import of CL 149136
edia/libmediaplayerservice/MediaRecorderClient.cpp
|
| 41d23d53e34eaa3c4928ec4a1c7d4a968c3c596e |
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
|
| 44722c6dc80b0bc3710f6a7fea31440988e8e3b6 |
21-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 2163 into donut
* changes:
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
|
| 510d6566bd2494991fac07aee46fcb2ddac99c13 |
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
edia/libmediaplayerservice/MediaRecorderClient.cpp
|
| 7562408b2261d38415453378b6188f74fda99d88 |
20-May-2009 |
Mathias Agopian <mathias@google.com> |
move libbinder's header files under includes/binder
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
nclude/media/IMediaMetadataRetriever.h
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerClient.h
nclude/media/IMediaPlayerService.h
nclude/media/IMediaRecorder.h
nclude/media/mediametadataretriever.h
nclude/media/mediaplayer.h
nclude/private/binder/Static.h
nclude/private/utils/Static.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/mediaserver/main_mediaserver.cpp
|
| 615a9bfbd98b90e09d868c128db84836feb658e4 |
19-May-2009 |
Mathias Agopian <mathias@google.com> |
checkpoint: split libutils into libutils + libbinder
nclude/private/binder/Static.h
nclude/private/binder/binder_module.h
nclude/private/utils/Static.h
nclude/private/utils/binder_module.h
edia/libmedia/Android.mk
edia/libmediaplayerservice/Android.mk
edia/mediaserver/Android.mk
|
| 8bae84582c2836a605d3ec3382a5e2f0b233ca52 |
20-May-2009 |
Jean-Baptiste Queru <jbq@google.com> |
am d3f14a62: reconcile donut snapshot
Merge commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9'
* commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9':
donut snapshot
|
| 3f52b1961f7a7185b204cacba836b8feb1215468 |
20-May-2009 |
Jean-Baptiste Queru <jbq@google.com> |
reconcile donut snapshot
Merge branch 'donut-snapshot' into HEAD
|
| b206b934737c73b2ad243ebcad53f110d464819e |
20-May-2009 |
Jean-Baptiste Queru <jbq@google.com> |
donut snapshot
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/ToneGenerator.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/VorbisPlayer.cpp
|
| a9470ac2bf900f805468b4868aeeb6465b25e02e |
20-May-2009 |
Garret Pick <pickgr@pv.com> |
Change required for OpenCORE 2.04 Update
nclude/media/PVPlayer.h
|
| cde489a26a200a21bcd6a3936435ec29dc389c42 |
11-May-2009 |
Mathias Agopian <mathias@google.com> |
Region now has its own implementation instead of relying on SkRegion, which allows us to break libui's dependency on libcorecg.
nclude/private/ui/RegionHelper.h
|
| f21de663eec5552ce88add84c43d6896f7be564c |
08-May-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
|
| 94787a73363a3fea461443389a6cbb05858923e0 |
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
|
| 4afdfa7fd7e9fe59fb298ef2ac252686e68bc73a |
07-May-2009 |
Dave Sparks <davidsparks@android.com> |
Don't allow negative numbers in ToneGenerator toneType parameter
Bug 1836596
edia/libmedia/ToneGenerator.cpp
|
| d92b6abe662857ac729a9e31576c8fd17e4d725a |
07-May-2009 |
The Android Open Source Project <initial-contribution@android.com> |
manual merge f3af740bdfc261b1cb25c0799af780d3753d4518
Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
|
| 0b62e242d112d46e9357242b0a4e11c720c98ca0 |
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
nclude/media/ToneGenerator.h
edia/libmedia/ToneGenerator.cpp
|
| 376f5614699f088aa458addfdc26fca4c4c63d68 |
06-May-2009 |
Mathias Agopian <mathias@google.com> |
move android_native_buffer_t declaration into its own private/ui/android_native_priv.h header, since user code should never have access to it.
nclude/private/ui/SurfaceBuffer.h
nclude/private/ui/android_natives_priv.h
|
| 81dd9e9f10b3557e8f1b13a5b1466bdcd74e0b56 |
06-May-2009 |
Mathias Agopian <mathias@google.com> |
move opengl/include/EGL/android_natives.h to include/ui/egl/android_natives.h and don't include it from egl.h
the android_native_ types are just forward declared in egl.h
nclude/private/ui/SurfaceBuffer.h
|
| 5c2634b99339eb3b8a2d2c17064774c3c4586651 |
01-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am e117ff6: Merge change 860 into donut
Merge commit 'e117ff6e29df64b5945a4a242434f62abd117a9b'
* commit 'e117ff6e29df64b5945a4a242434f62abd117a9b':
Change 79 in git master branch
|
| 65e5f79102e39cb2e9ab71ced0b62347bf1512a5 |
01-May-2009 |
James Dong <jdong@google.com> |
Change 79 in git master branch
edia/libmediaplayerservice/Android.mk
|
| 2af30c2b584e931bf444d7daed43a01d6a585df6 |
30-Apr-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
Conflicts:
libs/surfaceflinger/Layer.cpp
libs/surfaceflinger/SurfaceFlinger.cpp
opengl/libagl/egl.cpp
opengl/libs/EGL/egl.cpp
opengl/libs/GLES_CM/gl.cpp
opengl/libs/GLES_CM/gl_api.in
opengl/libs/gl_entries.in
opengl/libs/tools/glapigen
|
| eac4d8216b8e26ca18b4c56f105f68595e5c410f |
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.
|
| 124b5234a5110fb14d2114062c04d598cca76dd4 |
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
|
| 8a6234e743862d5f9570c518b967892899799146 |
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.
|
| 577ba8a1ae29cd2ca3b6103ae51530111d3e9b22 |
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
edia/libmediaplayerservice/MidiFile.cpp
|
| 08d949a37fc1d0a7b501a85d4d442975325de093 |
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
edia/libmediaplayerservice/VorbisPlayer.cpp
|
| 4fde27f0b89b3df5e280b648dd6c7968ee864916 |
21-Apr-2009 |
Mathias Agopian <mathias@google.com> |
a brand new MessageQueue for SurfaceFlinger.
nclude/private/ui/SurfaceFlingerSynchro.h
|
| a4495e15248ff9a7024fd2e0a528b3aa8ca46155 |
24-Apr-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
|
| 8b398c3b6095bb35380660b12cc6ec274dc8aa80 |
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge donut into master
|
| ff874ab4b3c7b153a9a9cbb17ecf610b4ebe1127 |
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge cupcake into donut
|
| 45bce6ef3972adf17ad7e2e41f7ceb2b6889cf85 |
23-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge donut into master
|
| 1dd70b9f04961a06fcb73a97fca10a53b3245d3c |
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
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
|
| 7b8743269ebd4aac05deb39bdf3826f406a05221 |
15-Apr-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'korg/cupcake'
|
| 98544b0343ba225935099e3957de2b5a42779a06 |
14-Apr-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into merge_master
|
| 84c18d6459635099d52b63009ef5a007891c4fb6 |
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.
edia/libmediaplayerservice/Android.mk
|
| 818984efef978f0215eb73724ef0d8873354ffd8 |
10-Apr-2009 |
Mathias Agopian <mathias@google.com> |
Merge commit 'goog/master' into master_gl
Conflicts:
libs/utils/Parcel.cpp
|
| b1514c918da830ce959c84ccec553769f227304e |
10-Apr-2009 |
Mathias Agopian <mathias@google.com> |
Integrate from //sandbox/mathias/donut/...@145728
SurfaceFlinger rework for new EGL driver model support.
nclude/private/opengles/gl_context.h
nclude/private/ui/SharedState.h
|
| eb2d3074428defeaff8f2dd44c1f7bcc8d92faac |
08-Apr-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Revert "Enable OpenCORE on master - part 1"
This reverts commit 9f1455fcc2ca8ad5e33b32b8a55c231944f4ff99.
nclude/media/PVPlayer.h
|
| 0adb1685383aef4b2c9158544a22ae40fcc79ffa |
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
edia/libmediaplayerservice/Android.mk
|
| 0df2c0386c09da9e8465afe31e4721654bb840a1 |
02-Apr-2009 |
Eric Laurent <> |
Merge branch 'readonly-p4-master'
|
| 48f7f5e8359909ddfc6492a79a8b9c44759ca6c3 |
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
edia/libmedia/AudioSystem.cpp
|
| ce80c82f58378da72d8a36f520c781cc5cac18a1 |
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
edia/libmedia/AudioSystem.cpp
|
| 15c7247e27ac1a59053856297aef69a0cf049458 |
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
edia/libmedia/AudioSystem.cpp
|
| 96020d9bcfdc228d33fc14e281bf6f416de4bdb8 |
01-Apr-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/base
|
| 1503b07c2619dc520b0b6747f645cebe10cc05a3 |
31-Mar-2009 |
Ravi K Yenduri <yenduri@pv.com> |
Enable OpenCORE on master - part 1
nclude/media/PVPlayer.h
|
| 74bc4f65a75e812835d1091f987977730f713657 |
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
|
| 8f7f2dcd8b975657e3c33befdaed48fc2966ce34 |
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
edia/libmediaplayerservice/MediaRecorderClient.cpp
|
| d1d35e0359cc411b04615813ba4ebefbb33d1933 |
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
edia/libmediaplayerservice/MediaRecorderClient.cpp
|
| 5580d1f0e9eb01fbfb81f2270f2caaa5ae3b47ed |
28-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'goog/cupcake'
|
| 29a65006e517ae5bb164e973b2d805ebfa834a2e |
28-Mar-2009 |
Eric Laurent <> |
AI 143327: am: CL 143177 am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting.
Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound.
The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds.
Original author: elaurent
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143327
nclude/media/AudioSystem.h
|
| a845f672e491ec3567709501f8af8d3661f184e7 |
28-Mar-2009 |
Eric Laurent <> |
AI 143177: am: CL 142889 Fix issue #1736153 Camera shutter sound can be muted by new AlarmClock setting.
Current implementation of Camera service plays the camera shutter sound over the ALARM stream so that it cannot be muted by silent mode in order to comply to some country specific requirement. A recent change made it possible for the user to mute the ALARM stream thus making this stream not suitable any more for the camera shutter sound.
The fix consists in creating a new stream type only accessible by native code and that cannot be muted and use it to play camera sounds.
Original author: elaurent
Merged from: //branches/cupcake/...
Automated import of CL 143177
nclude/media/AudioSystem.h
|
| c918d4ae9d45f3d7d0150e35eae8cd97ec474118 |
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
|
| 3f6fc880d92081fdec1351d219093dc0f7bbfcdd |
27-Mar-2009 |
Dave Sparks <> |
AI 143127: Media recorder service requires android.permission.CAMERA to record video
BUG=1742392
Automated import of CL 143127
edia/libmediaplayerservice/MediaRecorderClient.cpp
|
| e47562d6b22a091c62ad0c7c2d68d0968b5d21af |
26-Mar-2009 |
Eric Laurent <> |
Automated import from //branches/cupcake/...@142889,142889
nclude/media/AudioSystem.h
|
| 5b27b6f5b8073ad4363c89485f64b0ab3027b222 |
25-Mar-2009 |
Eric Laurent <> |
Automated import from //branches/master/...@142066,142066
edia/libmedia/AudioRecord.cpp
|
| cd6725a333395ffeac3215ea4bf834a95aaa8def |
25-Mar-2009 |
Eric Laurent <> |
Automated import from //branches/donutburger/...@142065,142065
edia/libmedia/AudioRecord.cpp
|
| 5cb07aa071b43a214e4c880b3b7852714e06451b |
25-Mar-2009 |
Andreas Huber <> |
Automated import from //branches/master/...@141712,141712
edia/libmedia/mediaplayer.cpp
|
| 4003bf5e4cd948fe7732c16b2a683acdbfa8c44d |
25-Mar-2009 |
Andreas Huber <> |
Automated import from //branches/donutburger/...@141711,141711
edia/libmedia/mediaplayer.cpp
|
| 7f46607934437779720f1099e6b17f4db8c60ba1 |
25-Mar-2009 |
Dave Sparks <> |
Automated import from //branches/master/...@141595,141595
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 3c4b3e3f8927dd149df87bb98646497c7043d0ae |
25-Mar-2009 |
Dave Sparks <> |
Automated import from //branches/donutburger/...@141593,141593
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 7d563247cdac0509009d579bbf849157d47c38a9 |
25-Mar-2009 |
Jean-Michel Trivi <> |
Automated import from //branches/donutburger/...@141200,141200
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| 90ca92cc07596900932aba0dad07457e619ae3da |
25-Mar-2009 |
Jean-Michel Trivi <> |
Automated import from //branches/master/...@141201,141201
nclude/media/AudioRecord.h
edia/libmedia/AudioRecord.cpp
|
| 7c8cfad419b7a6c38435e213ce54e180e296322e |
25-Mar-2009 |
Eric Laurent <> |
Automated import from //branches/cupcake/...@142064,142064
edia/libmedia/AudioRecord.cpp
|
| 06aff807c612d1f3b38168d3abcc67bb19ec8d3d |
25-Mar-2009 |
Jean-Michel Trivi <> |
Automated import from //branches/master/...@140869,140869
edia/libmedia/JetPlayer.cpp
|
| 158857d5a6bb93aa6a135a338f9b6389e0f2b3a5 |
25-Mar-2009 |
Jean-Michel Trivi <> |
Automated import from //branches/donutburger/...@140867,140867
edia/libmedia/JetPlayer.cpp
|
| 1af452f333664e8b0a61d96a9b3bb682d8b9a00f |
25-Mar-2009 |
Jason Sams <> |
Automated import from //branches/master/...@140868,140868
nclude/media/mediaplayer.h
edia/libmedia/mediaplayer.cpp
|
| 7dc112527d77b675d5c0451502b33fe2c552a79e |
25-Mar-2009 |
Jason Sams <> |
Automated import from //branches/donutburger/...@140866,140866
nclude/media/mediaplayer.h
edia/libmedia/mediaplayer.cpp
|
| 8769ce31b4aa1c8342925e514314435c217b0d46 |
25-Mar-2009 |
Andreas Huber <> |
Automated import from //branches/cupcake/...@141708,141708
edia/libmedia/mediaplayer.cpp
|
| 859d22fb31792fd9c2c77fba9be3378774b2cfe9 |
25-Mar-2009 |
Jean-Michel Trivi <> |
Automated import from //branches/master/...@140665,140665
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| 2c22aeb65e801f663a754d043062f85e49f77739 |
25-Mar-2009 |
Jean-Michel Trivi <> |
Automated import from //branches/donutburger/...@140663,140663
nclude/media/AudioTrack.h
edia/libmedia/AudioTrack.cpp
|
| 795fa5848276bab87445fa64fd0941c13ef62398 |
25-Mar-2009 |
Dave Sparks <> |
Automated import from //branches/cupcake/...@141591,141591
edia/libmediaplayerservice/MediaPlayerService.cpp
|
| 6c5b21025f746fcb838499ae01b4d384ab1d2f66 |
21-Mar-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Deal better with situations where OpenCORE is disabled.
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
|
| 87e445b4bed2931b9033aff68878cd4b392e1fab |
20-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@141571
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/mediaplayer.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/mediaplayer.cpp
|
| 1179bc9b0e3d17c984e8f4ad38561c049dd102fa |
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
nclude/media/mediarecorder.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/mediarecorder.cpp
|
| 8374f8fce997c0e1df39f0b515ca494b0a15dbdc |
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
|
| c048cae0367db6fbb4fe1127be5011910713d4ad |
13-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@138607
nclude/media/IMediaRecorder.h
nclude/media/PVMediaRecorder.h
nclude/media/mediarecorder.h
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
|
| 65e731f393f704eedab6fbe0af7f8a580c8d4617 |
11-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137873
nclude/media/PVPlayer.h
nclude/media/mediaplayer.h
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
|
| 8365529381f6284f2d59dcc38e26f73adeec9c67 |
09-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137197
edia/libmedia/ToneGenerator.cpp
|
| 87e06b6ae58d0caca9196e31490f2a5b515a9740 |
06-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136654
nclude/media/thread_init.h
|
| 8555d0867c3e8fe6cc5c7ad40af557fe6b92fa72 |
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
edia/libmedia/AudioTrack.cpp
edia/libmedia/mediarecorder.cpp
|
| 89fa4ad53f2f4d57adbc97ae1149fc00c9b6f3c5 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
nclude/media/IMediaMetadataRetriever.h
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerClient.h
nclude/media/IMediaPlayerService.h
nclude/media/IMediaRecorder.h
nclude/media/JetPlayer.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVMediaRecorder.h
nclude/media/PVMetadataRetriever.h
nclude/media/PVPlayer.h
nclude/media/ToneGenerator.h
nclude/media/mediametadataretriever.h
nclude/media/mediaplayer.h
nclude/media/mediarecorder.h
nclude/media/mediascanner.h
nclude/media/thread_init.h
nclude/private/media/AudioTrackShared.h
nclude/private/media/VideoFrame.h
nclude/private/opengles/gl_context.h
nclude/private/ui/LayerState.h
nclude/private/ui/SharedState.h
nclude/private/ui/SurfaceFlingerSynchro.h
nclude/private/utils/Static.h
nclude/private/utils/binder_module.h
nclude/private/utils/futex_synchro.h
edia/libmedia/Android.mk
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MODULE_LICENSE_APACHE2
edia/libmedia/NOTICE
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/VorbisPlayer.cpp
edia/libmediaplayerservice/VorbisPlayer.h
edia/mediaserver/Android.mk
edia/mediaserver/main_mediaserver.cpp
|
| 15f767b960b38059a74a42a33e16d8df2aec8bc1 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
nclude/media/IMediaMetadataRetriever.h
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerClient.h
nclude/media/IMediaPlayerService.h
nclude/media/IMediaRecorder.h
nclude/media/JetPlayer.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVMediaRecorder.h
nclude/media/PVMetadataRetriever.h
nclude/media/PVPlayer.h
nclude/media/ToneGenerator.h
nclude/media/mediametadataretriever.h
nclude/media/mediaplayer.h
nclude/media/mediarecorder.h
nclude/media/mediascanner.h
nclude/media/thread_init.h
nclude/private/media/AudioTrackShared.h
nclude/private/media/VideoFrame.h
nclude/private/opengles/gl_context.h
nclude/private/ui/LayerState.h
nclude/private/ui/SharedState.h
nclude/private/ui/SurfaceFlingerSynchro.h
nclude/private/utils/Static.h
nclude/private/utils/binder_module.h
nclude/private/utils/futex_synchro.h
edia/libmedia/Android.mk
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/MODULE_LICENSE_APACHE2
edia/libmedia/NOTICE
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/VorbisPlayer.cpp
edia/libmediaplayerservice/VorbisPlayer.h
edia/mediaserver/Android.mk
edia/mediaserver/main_mediaserver.cpp
|
| ad04d9201452001dbaac4349f084cc9316190b89 |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@132589
nclude/media/AudioRecord.h
nclude/media/IMediaRecorder.h
nclude/media/PVMediaRecorder.h
nclude/media/mediarecorder.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
|
| 99ffda877980468a9ae31e013cd10fb3645df1b0 |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@137055
nclude/media/AudioRecord.h
nclude/media/IMediaRecorder.h
nclude/media/PVMediaRecorder.h
nclude/media/mediarecorder.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
|
| eb7dc8939c06a1755d7c82baf0d0d008aa4d5fcb |
02-Mar-2009 |
root <pmerle@kph.uni-mainz.de> |
Fixed typing mistake causing process crashes.
edia/libmedia/AudioRecord.cpp
|
| 925a349b45d1d16eaaca6a1f4827191831271ca0 |
20-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132569
edia/libmedia/AudioRecord.cpp
edia/libmedia/ToneGenerator.cpp
|
| 25658fd43d150a45fb37734a9f9f27f48bb5c133 |
19-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132276
nclude/media/AudioSystem.h
edia/libmedia/AudioTrack.cpp
edia/libmedia/JetPlayer.cpp
|
| 7a2146d5807030b2629f347736be5301b61e8811 |
13-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@131421
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
nclude/media/IMediaRecorder.h
nclude/media/PVMediaRecorder.h
nclude/media/mediarecorder.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/VorbisPlayer.cpp
|
| 5e07b5774c8b376776caa4f5b0a193767697e97e |
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioFlingerClient.h
nclude/media/JetPlayer.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVPlayer.h
nclude/media/ToneGenerator.h
nclude/private/opengles/gl_context.h
edia/libmedia/Android.mk
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioFlingerClient.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/VorbisPlayer.cpp
|
| 74b79edce2638fe87fb4ec8f7702fcd70b72207d |
22-Jan-2009 |
Brock Atchison <batchison@pv.com> |
Changes required to accommodate OpenCORE 2.0
edia/libmediaplayerservice/Android.mk
|
| e5198b620a9a208ec59ea8457282404725f8ff6e |
20-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@127101
nclude/media/AudioRecord.h
nclude/media/AudioTrack.h
nclude/media/ToneGenerator.h
nclude/private/media/AudioTrackShared.h
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioTrack.cpp
|
| 54ffb8abf94365496a2dbf5d792b6977d6a8ef06 |
16-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@126645
nclude/media/PVMediaRecorder.h
nclude/private/opengles/gl_context.h
|
| cce8bd12da6d8419a8770e4552a51ec297c250c2 |
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
nclude/media/JetPlayer.h
nclude/media/ToneGenerator.h
nclude/media/mediametadataretriever.h
edia/libmedia/Android.mk
edia/libmedia/AudioTrack.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/JetPlayer.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediarecorder.cpp
|
| 7b5eb023f8d87cca6d830ae6c11c6aadbe02aca8 |
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IMediaMetadataRetriever.h
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerService.h
nclude/media/IMediaRecorder.h
nclude/media/MediaMetadataRetrieverInterface.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVMediaRecorder.h
nclude/media/PVMetadataRetriever.h
nclude/media/PVPlayer.h
nclude/media/ToneGenerator.h
nclude/media/mediametadataretriever.h
nclude/media/mediaplayer.h
nclude/media/mediarecorder.h
nclude/media/mediascanner.h
nclude/private/media/AudioTrackShared.h
nclude/private/media/VideoFrame.h
nclude/private/opengles/gl_context.h
edia/libmedia/Android.mk
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IMediaMetadataRetriever.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/IMediaRecorder.cpp
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmedia/mediarecorder.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MediaRecorderClient.cpp
edia/libmediaplayerservice/MediaRecorderClient.h
edia/libmediaplayerservice/MetadataRetrieverClient.cpp
edia/libmediaplayerservice/MetadataRetrieverClient.h
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/VorbisPlayer.cpp
|
| fcfe48e7cf461bf4a6314802c0f31f292d87ab95 |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
|
| 2729ea9262ca60d93047e984739887cfc89e82eb |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
nclude/media/AudioRecord.h
nclude/media/AudioSystem.h
nclude/media/AudioTrack.h
nclude/media/IAudioFlinger.h
nclude/media/IAudioRecord.h
nclude/media/IAudioTrack.h
nclude/media/IMediaPlayer.h
nclude/media/IMediaPlayerClient.h
nclude/media/IMediaPlayerService.h
nclude/media/MediaPlayerInterface.h
nclude/media/PVPlayer.h
nclude/media/ToneGenerator.h
nclude/media/mediametadataretriever.h
nclude/media/mediaplayer.h
nclude/media/mediarecorder.h
nclude/media/mediascanner.h
nclude/media/thread_init.h
nclude/private/media/AudioTrackShared.h
nclude/private/opengles/gl_context.h
nclude/private/ui/LayerState.h
nclude/private/ui/SharedState.h
nclude/private/ui/SurfaceFlingerSynchro.h
nclude/private/utils/Static.h
nclude/private/utils/binder_module.h
nclude/private/utils/futex_synchro.h
edia/libmedia/Android.mk
edia/libmedia/AudioRecord.cpp
edia/libmedia/AudioSystem.cpp
edia/libmedia/AudioTrack.cpp
edia/libmedia/IAudioFlinger.cpp
edia/libmedia/IAudioRecord.cpp
edia/libmedia/IAudioTrack.cpp
edia/libmedia/IMediaPlayer.cpp
edia/libmedia/IMediaPlayerClient.cpp
edia/libmedia/IMediaPlayerService.cpp
edia/libmedia/MODULE_LICENSE_APACHE2
edia/libmedia/NOTICE
edia/libmedia/ToneGenerator.cpp
edia/libmedia/mediametadataretriever.cpp
edia/libmedia/mediaplayer.cpp
edia/libmediaplayerservice/Android.mk
edia/libmediaplayerservice/MediaPlayerService.cpp
edia/libmediaplayerservice/MediaPlayerService.h
edia/libmediaplayerservice/MidiFile.cpp
edia/libmediaplayerservice/MidiFile.h
edia/libmediaplayerservice/VorbisPlayer.cpp
edia/libmediaplayerservice/VorbisPlayer.h
edia/mediaserver/Android.mk
edia/mediaserver/main_mediaserver.cpp
|