4391 Commits

Author SHA1 Message Date
Andreas Huber
970d7dd95f am e2c32e9f: If nothing is to be copied, return right away.
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
  If nothing is to be copied, return right away.
2011-03-21 16:21:29 -07:00
James Dong
f84433fb0a Add read and write option in opening file for output in the writers
Change-Id: Ibfba0aacd3c8587c04a2e903b636de337cc30104
2011-03-21 14:27:30 -07:00
Andreas Huber
e2c32e9f96 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
2011-03-21 14:16:03 -07:00
Eric Laurent
7a4b8bd588 Merge "Fix issue 3483718: audio streaming and A2DP." 2011-03-21 14:06:33 -07:00
Andreas Huber
5bb357f4cc Fixing the build.
Change-Id: I89daa503029491e6f1a8321f7e45c9439315ad23
2011-03-21 11:55:01 -07:00
Eric Laurent
6667ac33f4 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
2011-03-21 11:49:00 -07:00
Andreas Huber
14a80afa51 Merge "Support passing headers to MediaMetadataRetriever's setDataSource API" 2011-03-21 11:23:15 -07:00
Andreas Huber
5b7ced6a4e Support passing headers to MediaMetadataRetriever's setDataSource API
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
2011-03-21 11:13:59 -07:00
James Dong
9f2cde3cdb Scale the thumbnail if display dimension is different from the actual buffer size
bug - 3379293

Change-Id: I31c08010c97387716433da99d648bd364847b6aa
2011-03-20 14:46:30 -07:00
Andreas Huber
c42faa1e61 Merge "Squashed commit of the following:" 2011-03-18 16:03:40 -07:00
James Dong
c8fcf93249 Merge "Better organize media recorder error and information event and types" 2011-03-18 15:33:11 -07:00
Andreas Huber
8885e679fc 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
2011-03-18 15:11:52 -07:00
Eric Laurent
264990d2ea Merge "Fix issue 4111672: AudioTrack control block flags" 2011-03-18 14:43:41 -07:00
James Dong
01f20f6b37 Merge "Handle display dimension scaling event due to SAR embedded in AVC videos" 2011-03-18 13:45:37 -07:00
James Dong
7e91d91a4f Handle display dimension scaling event due to SAR embedded in AVC videos
bug - 3379293

Change-Id: I03cb548e61d31bc0a2fb40916d207aaf840fafce
2011-03-18 13:43:45 -07:00
Yu Shan Emily Lau
75afb97c4d Add the mem logging into test utility.
Bug# 4108259

Change-Id: Ifc8091490beef1430a1a0ab297e514b605da56f6
2011-03-18 13:27:51 -07:00
James Dong
7fc8b4f5ff Better organize media recorder error and information event and types
Change-Id: I45f1f953596985494725525c1fabf57eccc19175
2011-03-18 13:27:39 -07:00
Andreas Huber
7af86edfe1 Merge "Signal a runtime error if the AVCDecoder encounters an invalid frame." 2011-03-18 13:22:25 -07:00
Andreas Huber
b8fdab2b70 Signal a runtime error if the AVCDecoder encounters an invalid frame.
Instead of asserting.

Change-Id: I4c89f5fef92e5adb11d1ea6b564a67e99fc96595
related-to-bug: 4109304
2011-03-18 11:40:20 -07:00
shailendra
0e898b59d8 am e21bbd24: am a5eaf2ea: am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
* commit 'e21bbd24a107c3286e8c6f3eca069ebb12ef13da':
  Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:27:09 -07:00
shailendra
a5eaf2eae0 am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
  Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:02:35 -07:00
shailendra
d0c2813289 Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
Change-Id: I0a7081f901684ff7c7388b830afc6ae2f2ce7bcd
2011-03-18 10:45:29 -07:00
shailendra
0d922ec92d Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1 2011-03-18 09:35:37 -07:00
Eric Laurent
913af0b48f 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
2011-03-18 08:56:45 -07:00
Eino-Ville Talvala
ce06ebfda4 Merge "Add support for timestamps into SurfaceTexture." 2011-03-17 15:52:34 -07:00
shailendra
c8b4efdd74 Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
Change-Id: Iab523e666c11b7f99aac71c761a4295d32ca026c
2011-03-17 14:53:20 -07:00
Eino-Ville Talvala
c5f94d8a47 Add support for timestamps into SurfaceTexture.
API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().

Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp().  For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.

bug:3300707

Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7
2011-03-17 13:10:03 -07:00
James Dong
be3c82f25d 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
2011-03-17 12:38:58 -07:00
James Dong
9c0c5b5638 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
2011-03-17 11:56:05 -07:00
James Dong
2f1f2248c8 Fix missing AOSP copyright headers for a bunch of media framework files
bug - 4119349

Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
2011-03-17 11:10:40 -07:00
Mike Lockwood
630e6d7d26 am 132b23f8: am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
* commit '132b23f84905060163be6a30d718074cd4e1770d':
  MtpServer: Do not attempt to stop MTP if it has not been started
2011-03-17 07:30:53 -07:00
Mike Lockwood
c97022e7ac am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
  MtpServer: Do not attempt to stop MTP if it has not been started
2011-03-17 07:26:44 -07:00
Mike Lockwood
a3f8514492 MtpServer: Do not attempt to stop MTP if it has not been started
Fixes an ANR that occurred if we got a USB disconnected event
before the MTP service had started.

Bug: 4118033

Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-17 09:43:50 -04:00
Yu Shan Emily Lau
f916a5537c am 0af00ebc: am 797f5b0c: am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into ho
* commit '0af00ebc178a90d53a2aba92b8f8c11cfca8c1f4':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:47:08 -07:00
Yu Shan Emily Lau
797f5b0c00 am fd5c1f7c: Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1
* commit 'fd5c1f7c575451cf3566d1a8290b0b001bddfa39':
  Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:43:04 -07:00
Yu Shan Emily Lau
fd5c1f7c57 Merge "Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit. Add the media test util for capturing the memory usage. Bug# 4108259 Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6" into honeycomb-mr1 2011-03-16 16:40:46 -07:00
Yu Shan Emily Lau
9dab784705 Suppress the 1 hour video editor export test case which exceed the 5 mins large test limit.
Add the media test util for capturing the memory usage.
Bug# 4108259
Change-Id: I751a622ff5dfbb1d563f63a2cbc9db71d194a0f6
2011-03-16 16:36:17 -07:00
Rajneesh Chowdury
0b8fe2012d am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
* commit 'ce254e8613ddc4d57a8a5a8a2763b22690f451a4':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
2011-03-16 16:10:32 -07:00
Rajneesh Chowdury
69d0549034 am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
* commit '0edefea88e975613bca9f0227614de91434ade11':
  Fix for 4087846 Crash reported by monkey report (Java/Jni)
2011-03-16 16:05:54 -07:00
Andreas Huber
93668dfdd6 Merge "Don't send the seek-complete notification twice." 2011-03-16 16:03:19 -07:00
Rajneesh Chowdury
0edefea88e Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1 2011-03-16 16:03:15 -07:00
James Dong
9fe05b7bc1 resolved conflicts for merge of 1cbf8493 to master
Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4
2011-03-16 15:53:03 -07:00
Andreas Huber
f8a5b55740 Don't send the seek-complete notification twice.
Change-Id: Ie994de2d57e20dde12b8d59af4968d03569c7efa
related-to-bug: 3489432
2011-03-16 15:42:45 -07:00
James Dong
28fc2037bf 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.
2011-03-16 15:11:03 -07:00
James Dong
6ec0ca9e8e Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
bug - 4109530

Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
2011-03-16 14:11:32 -07:00
Andreas Huber
7532ae7f79 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.
2011-03-16 13:18:42 -07:00
Andreas Huber
5bd3bb46b1 DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
2011-03-16 12:04:56 -07:00
Andreas Huber
498422f4a2 Fix a race condition when playing an audio-only stream and seeking before starting.
Change-Id: Id3883293caf316ce492f5eb16428c15ced82da38
related-to-bug: 4039068
2011-03-16 10:50:18 -07:00
Rajneesh Chowdury
8e7991a52e Fix for 4087846 Crash reported by monkey report (Java/Jni)
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
2011-03-15 16:20:17 -07:00
James Dong
005de48cfb Fix an issue where the timestamp provided by WAVExtractor does not start with 0
Change-Id: Ie8eb86e26f026c07a3c3be43e35027b19de4a2c3
2011-03-15 09:45:22 -07:00