OSDN Git Service
The Android Automerger [Tue, 23 Aug 2011 13:33:58 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Mon, 22 Aug 2011 20:21:26 +0000 (13:21 -0700)]
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
The Android Automerger [Mon, 22 Aug 2011 13:31:38 +0000 (06:31 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Mon, 22 Aug 2011 02:19:01 +0000 (19:19 -0700)]
Merge "Remove useAndroidNativeBuffer(2) warning message."
Rajneesh Chowdury [Fri, 19 Aug 2011 22:01:11 +0000 (15:01 -0700)]
Merge "Fix for
4142219 Don't hard code platform-specific limitations (Jni/ Java)"
Jamie Gennis [Fri, 19 Aug 2011 21:36:10 +0000 (14:36 -0700)]
Merge "Stagefright: fix a compiler warning"
Rajneesh Chowdury [Fri, 12 Aug 2011 23:43:37 +0000 (16:43 -0700)]
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
Andreas Huber [Fri, 19 Aug 2011 17:30:58 +0000 (10:30 -0700)]
Raise the maximum input buffer size for the vpx video decoder to 256KB
Change-Id: I0411763829bf186d1b3b679fa72c9051524506b4
related-to-bug:
5169641
Gloria Wang [Thu, 18 Aug 2011 22:14:36 +0000 (15:14 -0700)]
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."
Gloria Wang [Thu, 18 Aug 2011 21:52:36 +0000 (14:52 -0700)]
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
Andreas Huber [Thu, 18 Aug 2011 18:46:18 +0000 (11:46 -0700)]
Merge "Some decoders require more gentle treatment"
James Dong [Fri, 12 Aug 2011 00:38:35 +0000 (17:38 -0700)]
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
Andreas Huber [Thu, 18 Aug 2011 17:53:23 +0000 (10:53 -0700)]
Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording.
Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec
related-to-bug:
5179033
The Android Automerger [Thu, 18 Aug 2011 13:34:09 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Thu, 18 Aug 2011 08:56:36 +0000 (16:56 +0800)]
Remove useAndroidNativeBuffer(2) warning message.
Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7
Wu-cheng Li [Thu, 18 Aug 2011 05:24:53 +0000 (22:24 -0700)]
Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."
Andreas Huber [Wed, 17 Aug 2011 20:21:40 +0000 (13:21 -0700)]
Merge "Make sure we have all the sample table metadata before declaring a track valid."
Andreas Huber [Wed, 17 Aug 2011 20:03:51 +0000 (13:03 -0700)]
Make sure we have all the sample table metadata before declaring a track valid.
Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31
related-to-bug:
5178976
James Dong [Wed, 17 Aug 2011 18:14:49 +0000 (11:14 -0700)]
Merge "Don't time out prematurely for video encoding waiting for output buffers"
Wu-cheng Li [Tue, 16 Aug 2011 13:14:16 +0000 (21:14 +0800)]
Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.
The API is still hidden.
bug:
5086125
Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
The Android Automerger [Wed, 17 Aug 2011 13:31:47 +0000 (06:31 -0700)]
merge in ics-release history after reset to master
Kristian Monsen [Wed, 17 Aug 2011 09:41:00 +0000 (02:41 -0700)]
Merge "Testing for bug
5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
Andreas Huber [Tue, 16 Aug 2011 21:37:51 +0000 (14:37 -0700)]
Merge "Error handling in ACodec and Nuplayer."
Andreas Huber [Tue, 16 Aug 2011 20:48:44 +0000 (13:48 -0700)]
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
Andreas Huber [Tue, 16 Aug 2011 19:41:41 +0000 (12:41 -0700)]
Properly initialize some instance variables.
Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34
James Dong [Sun, 14 Aug 2011 23:14:12 +0000 (16:14 -0700)]
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
Kristian Monsen [Tue, 16 Aug 2011 15:31:05 +0000 (16:31 +0100)]
Testing for bug
5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2
Reenabling chromium as a shread lib
Change-Id: I5f7abe61624d812c5781c4a453f587e744bc082d
The Android Automerger [Mon, 15 Aug 2011 13:34:03 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Eric Laurent [Wed, 3 Aug 2011 00:41:11 +0000 (17:41 -0700)]
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
Marco Nelissen [Fri, 12 Aug 2011 21:14:39 +0000 (14:14 -0700)]
Don't remove effects on session 0
b/
5159902
Change-Id: Id6f29fb1c687069f7480dd81d4745a558f202226
Jason Simmons [Fri, 12 Aug 2011 20:46:55 +0000 (13:46 -0700)]
Add a null check to handle failure of android::createPlayer
Change-Id: Id56bd0c16104e46d8dc71f13d8a44aefe251fad4
Andreas Huber [Fri, 12 Aug 2011 18:38:24 +0000 (11:38 -0700)]
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
Jamie Gennis [Fri, 12 Aug 2011 00:59:24 +0000 (17:59 -0700)]
Stagefright: fix a compiler warning
Change-Id: Ia6b2027dfe80960450156d918bdd7fe1567cafea
Eric Laurent [Thu, 11 Aug 2011 21:40:04 +0000 (14:40 -0700)]
Merge "Audio effects: track CPU and memory use separately"
Eric Laurent [Wed, 10 Aug 2011 17:37:50 +0000 (10:37 -0700)]
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
The Android Automerger [Thu, 11 Aug 2011 13:33:58 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Kristian Monsen [Thu, 11 Aug 2011 10:02:29 +0000 (03:02 -0700)]
Merge "Testing for bug
5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
Gloria Wang [Wed, 10 Aug 2011 21:52:36 +0000 (14:52 -0700)]
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."
Gloria Wang [Wed, 10 Aug 2011 21:19:05 +0000 (14:19 -0700)]
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
Andreas Huber [Wed, 10 Aug 2011 20:03:29 +0000 (13:03 -0700)]
Merge "When using "secure input buffer mode" we instantiate a different OMX component"
Andreas Huber [Wed, 10 Aug 2011 20:03:24 +0000 (13:03 -0700)]
Merge "Revert "Notify the OMX component that it's going to be used in "secure" mode.""
Andreas Huber [Wed, 10 Aug 2011 19:53:59 +0000 (12:53 -0700)]
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
Andreas Huber [Wed, 10 Aug 2011 19:45:24 +0000 (12:45 -0700)]
Revert "Notify the OMX component that it's going to be used in "secure" mode."
This reverts commit
7616178271e95f009452a21ea45e7225997dc27a.
James Dong [Wed, 10 Aug 2011 18:47:38 +0000 (11:47 -0700)]
Merge "Fix initial 0 duration video sample in the recorded videos"
Gloria Wang [Wed, 10 Aug 2011 16:28:50 +0000 (09:28 -0700)]
Merge "To support for switching from a non-null surface/ surface texture to a null one, and vice versa. Fix for bug
5137445."
Kristian Monsen [Wed, 10 Aug 2011 14:08:27 +0000 (15:08 +0100)]
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
The Android Automerger [Wed, 10 Aug 2011 13:33:53 +0000 (06:33 -0700)]
merge in ics-release history after reset to master
Ashish Sharma [Wed, 10 Aug 2011 06:21:11 +0000 (23:21 -0700)]
Merge "Network traffic accounting for chromium stack support in mediaserver."
Gloria Wang [Tue, 9 Aug 2011 22:29:34 +0000 (15:29 -0700)]
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
Mathias Agopian [Tue, 9 Aug 2011 22:23:19 +0000 (15:23 -0700)]
Merge changes Ie06e73e5,I7ac6b5b0
* changes:
free all buffers when ANativeWindow::disconnect is called
return correct value from query after connecting a surface
James Dong [Tue, 9 Aug 2011 18:14:57 +0000 (11:14 -0700)]
Fix initial 0 duration video sample in the recorded videos
o Patch suggested by pmehendale@nvidia.com
Change-Id: Ibf516ba83b721b0d0ab55bb7637fe9b7b2958214
related-to-bug:
5117434
James Dong [Tue, 9 Aug 2011 18:14:06 +0000 (11:14 -0700)]
Merge "Do not release recording frames if camera is gone"
Marco Nelissen [Tue, 2 Aug 2011 20:33:41 +0000 (13:33 -0700)]
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
The Android Automerger [Tue, 9 Aug 2011 13:34:12 +0000 (06:34 -0700)]
merge in ics-release history after reset to master
Mathias Agopian [Tue, 9 Aug 2011 02:14:03 +0000 (19:14 -0700)]
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
Andreas Huber [Mon, 8 Aug 2011 22:28:21 +0000 (15:28 -0700)]
Notify the OMX component that it's going to be used in "secure" mode.
Change-Id: Id87c4b295eb38f7d24045918e73df298d7b842f9
related-to-bug:
5137212
Eric Laurent [Mon, 8 Aug 2011 16:31:42 +0000 (09:31 -0700)]
Merge "AudioFlinger: protect input/output stream access"
Eric Laurent [Sun, 7 Aug 2011 23:32:26 +0000 (16:32 -0700)]
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
James Dong [Sat, 6 Aug 2011 00:19:29 +0000 (17:19 -0700)]
Do not release recording frames if camera is gone
Change-Id: Ia6038c1a3ca17207e43a955ec47c42cdff1f5a76
related-to-bug:
5129465
Ashish Sharma [Fri, 8 Jul 2011 00:57:05 +0000 (17:57 -0700)]
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
The Android Automerger [Fri, 5 Aug 2011 18:17:03 +0000 (11:17 -0700)]
merge in ics-release history after reset to master
Gloria Wang [Thu, 4 Aug 2011 23:32:10 +0000 (16:32 -0700)]
Merge "Close the DRM session in the destructor of ChromiumHTTPDataSource. Fix for bug
5015079."
Gloria Wang [Thu, 4 Aug 2011 23:01:35 +0000 (16:01 -0700)]
Close the DRM session in the destructor of ChromiumHTTPDataSource.
Fix for bug
5015079.
Change-Id: I45fcf6ff8b50e62f2812930eaf68c00206cb7e52
Gloria Wang [Thu, 4 Aug 2011 22:33:12 +0000 (15:33 -0700)]
Merge "resolved conflicts for merge of
845fdba7 to master"
Gloria Wang [Thu, 4 Aug 2011 22:13:14 +0000 (15:13 -0700)]
resolved conflicts for merge of
845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
Andreas Huber [Thu, 4 Aug 2011 22:05:17 +0000 (15:05 -0700)]
Eliminate superfluous memcpys by wrapping an ABuffer in a MediaBuffer
Change-Id: I1313f117cd7cdfaf7d6ec25413a0b4b8ea495037
related-to-bug:
5122973
Gloria Wang [Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)]
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
Andreas Huber [Thu, 4 Aug 2011 19:02:47 +0000 (12:02 -0700)]
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
The Android Automerger [Thu, 4 Aug 2011 13:51:53 +0000 (06:51 -0700)]
merge in ics-release history after reset to master
Henrik B Andersson [Mon, 21 Feb 2011 13:22:08 +0000 (14:22 +0100)]
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
Wu-cheng Li [Thu, 4 Aug 2011 08:46:56 +0000 (01:46 -0700)]
Merge "Add camera bayer image format."
Wu-cheng Li [Tue, 2 Aug 2011 09:49:50 +0000 (17:49 +0800)]
Add camera bayer image format.
The API are hidden.
bug:
5086073
Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
Gloria Wang [Wed, 3 Aug 2011 22:37:24 +0000 (15:37 -0700)]
Merge "Check the syncword for each frame. Fix for bug
5117233."
Gloria Wang [Wed, 3 Aug 2011 22:06:35 +0000 (15:06 -0700)]
Check the syncword for each frame.
Fix for bug
5117233.
Change-Id: I714c9b671832c9606cabdfe6bb21697c08de2eff
Eric Laurent [Mon, 1 Aug 2011 16:52:20 +0000 (09:52 -0700)]
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
Eric Laurent [Wed, 3 Aug 2011 17:38:04 +0000 (10:38 -0700)]
Merge "Audio Effect Framework: add effect suspend/restore"
The Android Automerger [Wed, 3 Aug 2011 13:35:34 +0000 (06:35 -0700)]
merge in ics-release history after reset to master
Eric Laurent [Thu, 28 Jul 2011 02:49:51 +0000 (19:49 -0700)]
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
Sarthak Aggarwal [Tue, 2 Aug 2011 04:49:04 +0000 (10:19 +0530)]
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>
James Dong [Tue, 2 Aug 2011 17:36:44 +0000 (10:36 -0700)]
Merge "Start thread pool for binder calls"
Gloria Wang [Tue, 2 Aug 2011 16:56:51 +0000 (09:56 -0700)]
Merge "Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have called Resync() which changes mCurrentPos. For bug
4869063."
Gloria Wang [Tue, 2 Aug 2011 16:22:05 +0000 (09:22 -0700)]
Merge "Fix ordering assumption of argument evaluation."
Gloria Wang [Tue, 2 Aug 2011 16:21:53 +0000 (09:21 -0700)]
Merge "Fix ordering assumption of argument evaluation."
The Android Automerger [Tue, 2 Aug 2011 13:53:22 +0000 (06:53 -0700)]
merge in ics-release history after reset to master
Wu-cheng Li [Fri, 29 Jul 2011 21:00:37 +0000 (05:00 +0800)]
Pass camera frame metadata from camera service to Java.
bug:
4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
Wu-cheng Li [Tue, 2 Aug 2011 05:20:36 +0000 (13:20 +0800)]
Add camera recording hint parameter.
The API is still hidden.
bug:
4266229
Change-Id: I5e4c24e9e2808582aecb55ac4f1d5be3ed7e36a2
James Dong [Tue, 2 Aug 2011 01:21:00 +0000 (18:21 -0700)]
Start thread pool for binder calls
Change-Id: Ie67f54ba06d7fdb42bcb041c1e0a50d8477ae423
related-to-bug:
5095635
Mathias Agopian [Mon, 1 Aug 2011 23:36:02 +0000 (16:36 -0700)]
Merge "connect/disconnect is now called from our EGL wrapper"
Jean-Baptiste Queru [Mon, 1 Aug 2011 21:12:43 +0000 (14:12 -0700)]
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.
Jean-Baptiste Queru [Mon, 1 Aug 2011 21:10:39 +0000 (14:10 -0700)]
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.
Mathias Agopian [Sat, 30 Jul 2011 00:55:48 +0000 (17:55 -0700)]
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
Gloria Wang [Mon, 1 Aug 2011 21:01:29 +0000 (14:01 -0700)]
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
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:43:07 +0000 (13:43 -0700)]
Merge "Stagefright: Return error if codec takes too long to return a buffer."
Andreas Huber [Mon, 1 Aug 2011 20:26:11 +0000 (13:26 -0700)]
Merge "Fix NALU extraction of unit starts with a 0x00 nalType"
Andreas Huber [Mon, 1 Aug 2011 20:22:26 +0000 (13:22 -0700)]
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
Gloria Wang [Mon, 1 Aug 2011 17:31:24 +0000 (10:31 -0700)]
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
Andreas Huber [Fri, 22 Jul 2011 16:36:24 +0000 (09:36 -0700)]
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
The Android Automerger [Mon, 1 Aug 2011 14:00:00 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Eric Laurent [Thu, 28 Jul 2011 20:59:02 +0000 (13:59 -0700)]
Fix issue
5090721: audio record broken
Commit
6dbdc40 introduced a deadlock when exiting the
AudioFlinger RecordThread.
Change-Id: I1f63e54c5aeff05da4e4d028b53f734c62c78677
Kristian Monsen [Fri, 29 Jul 2011 10:37:49 +0000 (03:37 -0700)]
Merge "Part of fix for bug
5065047 build libchromium as a shared lib"