OSDN Git Service

android-x86/frameworks-av.git
13 years agoHandle setDataSource failures properly. #5261671
Dave Burke [Tue, 6 Sep 2011 19:39:47 +0000 (20:39 +0100)]
Handle setDataSource failures properly. #5261671

Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9

13 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 5 Sep 2011 13:34:19 +0000 (06:34 -0700)]
merge in ics-release history after reset to master

13 years agomerge in ics-release history after reset to master
The Android Automerger [Fri, 2 Sep 2011 23:02:32 +0000 (16:02 -0700)]
merge in ics-release history after reset to master

13 years agoFix issue 5252593: any app can restart the runtime
Eric Laurent [Fri, 2 Sep 2011 21:20:56 +0000 (14:20 -0700)]
Fix issue 5252593: any app can restart the runtime

Replace null device address string by empty sting.

Change-Id: I285c35f3345334e6d2190493b1a8a5aca1a361a4

13 years agoProperly serialize access to FileSource::getSize by acquiring the mutex
Andreas Huber [Fri, 2 Sep 2011 16:34:51 +0000 (09:34 -0700)]
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

13 years agoRequire INTERNET permission for network-based content.
Dave Burke [Tue, 30 Aug 2011 13:39:17 +0000 (14:39 +0100)]
Require INTERNET permission for network-based content.
Bug #1870981

Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f

13 years agoMerge "Guard the audio notifications with a separate lock to avoid deadlocks during...
Andreas Huber [Thu, 1 Sep 2011 19:20:23 +0000 (12:20 -0700)]
Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset."

13 years agoGuard the audio notifications with a separate lock to avoid deadlocks during reset.
Andreas Huber [Thu, 1 Sep 2011 18:39:11 +0000 (11:39 -0700)]
Guard the audio notifications with a separate lock to avoid deadlocks during reset.

Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392
related-to-bug: 5179827

13 years agoSignal an error when encountering a malformed .ts stream.
Andreas Huber [Thu, 1 Sep 2011 18:04:43 +0000 (11:04 -0700)]
Signal an error when encountering a malformed .ts stream.

Change-Id: I3ab0215419214b652573945403eb45eb09d41aff
related-to-bug: 5114811

13 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 1 Sep 2011 13:33:57 +0000 (06:33 -0700)]
merge in ics-release history after reset to master

13 years agoAdd video snapshot camera parameter.
Wu-cheng Li [Tue, 30 Aug 2011 13:33:10 +0000 (21:33 +0800)]
Add video snapshot camera parameter.

The API is still hidden.

bug:5187868

Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb

13 years agoMerge "Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource"
Pannag Sanketi [Thu, 1 Sep 2011 05:00:35 +0000 (22:00 -0700)]
Merge "Incr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource"

13 years agoIncr. MIN_UNDEQUEUED_BUFFERS in SurfaceMediaSource
Pannag Sanketi [Tue, 30 Aug 2011 02:53:51 +0000 (19:53 -0700)]
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

13 years agoMerge "I have one HLS stream that switches stream PIDs from one bandwidth to the...
Andreas Huber [Wed, 31 Aug 2011 23:44:49 +0000 (16:44 -0700)]
Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next"

13 years agoMerge "Discontinuities are only signalled on streams that have been identified, i.e."
Andreas Huber [Wed, 31 Aug 2011 23:44:43 +0000 (16:44 -0700)]
Merge "Discontinuities are only signalled on streams that have been identified, i.e."

13 years agoI have one HLS stream that switches stream PIDs from one bandwidth to the next
Andreas Huber [Wed, 31 Aug 2011 23:29:05 +0000 (16:29 -0700)]
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

13 years agoDiscontinuities are only signalled on streams that have been identified, i.e.
Andreas Huber [Wed, 31 Aug 2011 22:04:25 +0000 (15:04 -0700)]
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

13 years agoMerge "Update SurfaceMediaSource_test to not use pbuffer configs"
Pannag Sanketi [Wed, 31 Aug 2011 22:09:26 +0000 (15:09 -0700)]
Merge "Update SurfaceMediaSource_test to not use pbuffer configs"

13 years agoMerge "Fix a crash where the EOS was signalled but some output buffer were still...
James Dong [Wed, 31 Aug 2011 21:17:18 +0000 (14:17 -0700)]
Merge "Fix a crash where the EOS was signalled but some output buffer were still pending."

13 years agoMerge "Fix SurfaceMediaSource timestamp handling."
Eino-Ville Talvala [Wed, 31 Aug 2011 20:41:06 +0000 (13:41 -0700)]
Merge "Fix SurfaceMediaSource timestamp handling."

13 years agoMerge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL...
Gloria Wang [Wed, 31 Aug 2011 17:37:48 +0000 (10:37 -0700)]
Merge "Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL and AudioPlayer was not started. Fix for 5236419."

13 years agoStop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL
Gloria Wang [Wed, 31 Aug 2011 17:24:18 +0000 (10:24 -0700)]
Stop the AudioSource in reset() of AwesomePlayer if AudioSource is not NULL
and AudioPlayer was not started.
Fix for 5236419.

Change-Id: I5eadd069118c3533a19b5d6f6dca2ce16d8505fb

13 years agoMerge "ATSParser now supports a mode in which PTS is considered to be absolute time"
Andreas Huber [Wed, 31 Aug 2011 16:44:57 +0000 (09:44 -0700)]
Merge "ATSParser now supports a mode in which PTS is considered to be absolute time"

13 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 31 Aug 2011 13:34:02 +0000 (06:34 -0700)]
merge in ics-release history after reset to master

13 years agoUpdate SurfaceMediaSource_test to not use pbuffer configs
Pannag Sanketi [Wed, 31 Aug 2011 02:10:54 +0000 (19:10 -0700)]
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

13 years agoMerge "fix Surface positions are not floats"
Mathias Agopian [Wed, 31 Aug 2011 02:24:04 +0000 (19:24 -0700)]
Merge "fix Surface positions are not floats"

13 years agofix Surface positions are not floats
Mathias Agopian [Wed, 31 Aug 2011 01:51:54 +0000 (18:51 -0700)]
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

13 years agoFix a crash where the EOS was signalled but some output buffer were still pending.
James Dong [Wed, 31 Aug 2011 00:06:10 +0000 (17:06 -0700)]
Fix a crash where the EOS was signalled but some output buffer were still pending.

Change-Id: Ide111264501441b51bb10629ae2021accf9e1fb5
related-to-bug: 5234126

13 years agoATSParser now supports a mode in which PTS is considered to be absolute time
Andreas Huber [Tue, 30 Aug 2011 23:06:28 +0000 (16:06 -0700)]
ATSParser now supports a mode in which PTS is considered to be absolute time

i.e. PTS 0 <=> media time 0

Change-Id: If10a0f98c129b95e8430dc419664b1def92e547e

13 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 20:42:46 +0000 (13:42 -0700)]
merge in ics-release history after reset to master

13 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 19:45:34 +0000 (12:45 -0700)]
merge in ics-release history after reset to master

13 years agoMerge "226483: A2DP connected, but music out to speaker"
Eric Laurent [Tue, 30 Aug 2011 17:51:54 +0000 (10:51 -0700)]
Merge "226483: A2DP connected, but music out to speaker"

13 years agoFix SurfaceMediaSource timestamp handling.
Eino-Ville Talvala [Tue, 30 Aug 2011 01:16:03 +0000 (18:16 -0700)]
Fix SurfaceMediaSource timestamp handling.

Was not basing timestamps on startTimeUs.
Now synchronizes properly with audio.

Bug: 4510826
Change-Id: I613db0aa91e51fc75d120e65540e742d8ab2ae43

13 years ago226483: A2DP connected, but music out to speaker
Eric Laurent [Tue, 30 Aug 2011 17:18:54 +0000 (10:18 -0700)]
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

13 years agoMerge "Bug 5156756 Fix AAC ADTS header size computation"
Jean-Michel Trivi [Tue, 30 Aug 2011 16:06:36 +0000 (09:06 -0700)]
Merge "Bug 5156756 Fix AAC ADTS header size computation"

13 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 30 Aug 2011 13:33:59 +0000 (06:33 -0700)]
merge in ics-release history after reset to master

13 years agoBug 5156756 Fix AAC ADTS header size computation
Jean-Michel Trivi [Mon, 29 Aug 2011 21:06:51 +0000 (14:06 -0700)]
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

13 years agoMerge "Audioflinger: reverse logic of BT NREC indication"
Eric Laurent [Mon, 29 Aug 2011 22:12:41 +0000 (15:12 -0700)]
Merge "Audioflinger: reverse logic of BT NREC indication"

13 years agoAudioflinger: reverse logic of BT NREC indication
Eric Laurent [Mon, 29 Aug 2011 19:42:48 +0000 (12:42 -0700)]
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

13 years agoReturn an error to the client instead of asserting if decoder instantiation fails
Andreas Huber [Mon, 29 Aug 2011 20:01:23 +0000 (13:01 -0700)]
Return an error to the client instead of asserting if decoder instantiation fails

after a surface change.

Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug: 5212725

13 years agoMerge "Signal errors to the client instead of asserting in ACodec."
Andreas Huber [Mon, 29 Aug 2011 15:10:56 +0000 (08:10 -0700)]
Merge "Signal errors to the client instead of asserting in ACodec."

13 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 29 Aug 2011 13:33:59 +0000 (06:33 -0700)]
merge in ics-release history after reset to master

13 years agoMerge "Default W, H allowed in SurfaceMediaSource dequeue"
Pannag Sanketi [Sun, 28 Aug 2011 21:40:26 +0000 (14:40 -0700)]
Merge "Default W, H allowed in SurfaceMediaSource dequeue"

13 years agoMerge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
Pannag Sanketi [Sat, 27 Aug 2011 03:05:58 +0000 (20:05 -0700)]
Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"

13 years agoMerge "Fixing small syntax error in MPEG4 logging"
Pannag Sanketi [Sat, 27 Aug 2011 03:01:46 +0000 (20:01 -0700)]
Merge "Fixing small syntax error in MPEG4 logging"

13 years agoModify enum value of OMX_COLOR_FormatAndroidOpaque
Pannag Sanketi [Sat, 27 Aug 2011 02:34:49 +0000 (19:34 -0700)]
Modify enum value of OMX_COLOR_FormatAndroidOpaque

The enum value chosen earlier had a conflict with one of the vendors.

Change-Id: I47832dd1157447f89324d56e8ab146260cd7927c

13 years agoFixing small syntax error in MPEG4 logging
Pannag Sanketi [Sat, 27 Aug 2011 02:17:20 +0000 (19:17 -0700)]
Fixing small syntax error in MPEG4 logging

Found that the build was breaking when the logging was enabled in
MPEG4Writer. Fixed.

Change-Id: I62c5e6d16b2ecf5644c8d46b9bbcca68a797b223

13 years agoSignal errors to the client instead of asserting in ACodec.
Andreas Huber [Fri, 26 Aug 2011 23:02:19 +0000 (16:02 -0700)]
Signal errors to the client instead of asserting in ACodec.

Also make sure NuPlayer can properly shutdown in certain edge cases.

Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453

13 years agoMerge "Support for posting messages and synchronously waiting for a response."
Andreas Huber [Fri, 26 Aug 2011 20:47:26 +0000 (13:47 -0700)]
Merge "Support for posting messages and synchronously waiting for a response."

13 years agoProperly reset the number of frames we think we've written to the audio sink
Andreas Huber [Fri, 26 Aug 2011 18:26:25 +0000 (11:26 -0700)]
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

13 years agoMerge "Bug 4364249 Play position is 0 after flushing AudioTrack"
Jean-Michel Trivi [Fri, 26 Aug 2011 00:41:46 +0000 (17:41 -0700)]
Merge "Bug 4364249 Play position is 0 after flushing AudioTrack"

13 years agoBug 4364249 Play position is 0 after flushing AudioTrack
Jean-Michel Trivi [Thu, 25 Aug 2011 23:47:23 +0000 (16:47 -0700)]
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

13 years agoSupport for posting messages and synchronously waiting for a response.
Andreas Huber [Thu, 25 Aug 2011 23:09:06 +0000 (16:09 -0700)]
Support for posting messages and synchronously waiting for a response.

Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c

13 years agoMerge "When encountering a discontinuity, flush(clear) all content enqueued up to...
Andreas Huber [Thu, 25 Aug 2011 20:40:16 +0000 (13:40 -0700)]
Merge "When encountering a discontinuity, flush(clear) all content enqueued up to that"

13 years agoWhen encountering a discontinuity, flush(clear) all content enqueued up to that
Andreas Huber [Thu, 25 Aug 2011 19:21:26 +0000 (12:21 -0700)]
When encountering a discontinuity, flush(clear) all content enqueued up to that

point except previously enqueued discontinuities.

Change-Id: Id04a559dc062fa4a5c80c599ad74bf81a543de01
related-to-bug: 5201378

13 years agoMerge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug 5208736."
Gloria Wang [Thu, 25 Aug 2011 17:28:50 +0000 (10:28 -0700)]
Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug 5208736."

13 years agoSet mSeekNotificationSent as false for RTSP seeking.
Gloria Wang [Thu, 25 Aug 2011 17:09:34 +0000 (10:09 -0700)]
Set mSeekNotificationSent as false for RTSP seeking.
Fix for bug 5208736.

Change-Id: Ib1d74608ec289509082d8dcad080769f48098853

13 years agoMerge "When Camera is launched by media recording framework, stagefright controls...
James Dong [Thu, 25 Aug 2011 15:12:11 +0000 (08:12 -0700)]
Merge "When Camera is launched by media recording framework, stagefright controls the stop and release."

13 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 25 Aug 2011 13:34:23 +0000 (06:34 -0700)]
merge in ics-release history after reset to master

13 years agoWhen Camera is launched by media recording framework, stagefright controls the stop...
James Dong [Thu, 25 Aug 2011 02:50:36 +0000 (19:50 -0700)]
When Camera is launched by media recording framework, stagefright controls the stop and release.

Change-Id: Ic79a60dad0f617a845211d3fbe146c1648a71da3
related-to-bug: 5205804

13 years agoMerge "Port setting change should happen before receiving any filled frame."
Chih-Chung Chang [Thu, 25 Aug 2011 01:57:35 +0000 (18:57 -0700)]
Merge "Port setting change should happen before receiving any filled frame."

13 years agoDefault W, H allowed in SurfaceMediaSource dequeue
Pannag Sanketi [Thu, 25 Aug 2011 00:39:09 +0000 (17:39 -0700)]
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

13 years agoMerge "Testing the GL/ CPU encoding w/ Gralloc buffers"
Pannag Sanketi [Wed, 24 Aug 2011 22:18:07 +0000 (15:18 -0700)]
Merge "Testing the GL/ CPU encoding w/ Gralloc buffers"

13 years agoTesting the GL/ CPU encoding w/ Gralloc buffers
Pannag Sanketi [Fri, 19 Aug 2011 04:53:02 +0000 (21:53 -0700)]
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

13 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 24 Aug 2011 13:33:54 +0000 (06:33 -0700)]
merge in ics-release history after reset to master

13 years agoMerge "To make SniffMP3() more concrete so that we can remove false-positve responses...
James Dong [Wed, 24 Aug 2011 01:06:16 +0000 (18:06 -0700)]
Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."

13 years agoMerge "We were accidentally sending out an output buffer before the final port settin...
Andreas Huber [Tue, 23 Aug 2011 17:32:35 +0000 (10:32 -0700)]
Merge "We were accidentally sending out an output buffer before the final port settings change"

13 years agoWe were accidentally sending out an output buffer before the final port settings...
Andreas Huber [Tue, 23 Aug 2011 17:21:34 +0000 (10:21 -0700)]
We were accidentally sending out an output buffer before the final port settings change

Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6
related-to-bug: 5122512

13 years agoMerge "AudioFlinger: add check for audio HAL init failure"
Eric Laurent [Tue, 23 Aug 2011 15:42:59 +0000 (08:42 -0700)]
Merge "AudioFlinger: add check for audio HAL init failure"

13 years agoAudioFlinger: add check for audio HAL init failure
Eric Laurent [Tue, 23 Aug 2011 15:25:03 +0000 (08:25 -0700)]
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

13 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 23 Aug 2011 13:33:58 +0000 (06:33 -0700)]
merge in ics-release history after reset to master

13 years agoPort setting change should happen before receiving any filled frame.
Chih-Chung Chang [Mon, 22 Aug 2011 12:11:31 +0000 (20:11 +0800)]
Port setting change should happen before receiving any filled frame.

Change-Id: I12a54b80e7ef958b6d451b7add110d38f05ec439

13 years agoThe MatroskaExtractor will now publish a different mime-type "video/webm" if
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

13 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 22 Aug 2011 13:31:38 +0000 (06:31 -0700)]
merge in ics-release history after reset to master

13 years agoMerge "Remove useAndroidNativeBuffer(2) warning message."
Chih-Chung Chang [Mon, 22 Aug 2011 02:19:01 +0000 (19:19 -0700)]
Merge "Remove useAndroidNativeBuffer(2) warning message."

13 years agoMerge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)"
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)"

13 years agoMerge "Stagefright: fix a compiler warning"
Jamie Gennis [Fri, 19 Aug 2011 21:36:10 +0000 (14:36 -0700)]
Merge "Stagefright: fix a compiler warning"

13 years agoFix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)
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

13 years agoRaise the maximum input buffer size for the vpx video decoder to 256KB
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

13 years agoMerge "When switching surface, do not set mSeekNotificationSent as true, because...
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."

13 years agoWhen switching surface, do not set mSeekNotificationSent as true,
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

13 years agoMerge "Some decoders require more gentle treatment"
Andreas Huber [Thu, 18 Aug 2011 18:46:18 +0000 (11:46 -0700)]
Merge "Some decoders require more gentle treatment"

13 years agoSome 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

13 years agoDisable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording.
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

13 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 18 Aug 2011 13:34:09 +0000 (06:34 -0700)]
merge in ics-release history after reset to master

13 years agoRemove useAndroidNativeBuffer(2) warning message.
Chih-Chung Chang [Thu, 18 Aug 2011 08:56:36 +0000 (16:56 +0800)]
Remove useAndroidNativeBuffer(2) warning message.

Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7

13 years agoTo make SniffMP3() more concrete so that we can remove false-positve responses from...
Dongwon Kang [Thu, 18 Aug 2011 06:24:27 +0000 (15:24 +0900)]
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

13 years agoMerge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."
Wu-cheng Li [Thu, 18 Aug 2011 05:24:53 +0000 (22:24 -0700)]
Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."

13 years agoMerge "Make sure we have all the sample table metadata before declaring a track valid."
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."

13 years agoMake 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

13 years agoMerge "Don't time out prematurely for video encoding waiting for output buffers"
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"

13 years agoAdd new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.
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

13 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 17 Aug 2011 13:31:47 +0000 (06:31 -0700)]
merge in ics-release history after reset to master

13 years agoMerge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS...
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"

13 years agoMerge "Error handling in ACodec and Nuplayer."
Andreas Huber [Tue, 16 Aug 2011 21:37:51 +0000 (14:37 -0700)]
Merge "Error handling in ACodec and Nuplayer."

13 years agoError 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

13 years agoProperly initialize some instance variables.
Andreas Huber [Tue, 16 Aug 2011 19:41:41 +0000 (12:41 -0700)]
Properly initialize some instance variables.

Change-Id: I190b889be343dca14fe8109528be14cc3cdd4c34

13 years agoDon't time out prematurely for video encoding waiting for output buffers
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

13 years agoTesting for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2
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

13 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 15 Aug 2011 13:34:03 +0000 (06:34 -0700)]
merge in ics-release history after reset to master