4167 Commits

Author SHA1 Message Date
Gloria Wang
94f4019994 Merge "Add AAC extractor" 2011-02-15 17:22:01 -08:00
Gloria Wang
c5b0abf900 Add AAC extractor
Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
2011-02-15 17:16:22 -08:00
Andreas Huber
7ff893979a Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
This reverts commit e7c83d4a711241923854d6bbd5de0e24f9192f93.

Change-Id: I5151c7c72d79154528c55aa01bf006c8e38e7af7
2011-02-15 15:34:34 -08:00
Andreas Huber
f040d7dfc5 Merge "Derive the Transport "source" attribute from the RTSP endpoint address if necessary" 2011-02-15 14:12:56 -08:00
Andreas Huber
27db53de35 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
2011-02-15 13:49:32 -08:00
Andreas Huber
284ff954f0 Merge "Work around several issues with non-compliant RTSP servers." 2011-02-15 13:31:14 -08:00
Andreas Huber
0407269ae3 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
2011-02-15 12:00:07 -08:00
Mike Lockwood
8c553b9003 MTP host: disable some test code
Change-Id: I2237ad88f73b03a2c324f17267c52cc42b8a0d5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-15 14:55:51 -05:00
Basavapatna Dattaguru
0554f32afd VideoEditor:IssueID:3396697: Added Preview Test code
This has dependency on Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
Removed trailing space in xml file
Removed dependency on test cases other than Preview & API

Change-Id: I835c0ca17d6ff15819407eb930cca8a08b095287
2011-02-14 20:59:51 -08:00
Basavapatna Dattaguru
e77345966c Merge "VideoEditor:Inconsistance defines:Issue ID:3419090" 2011-02-14 20:14:38 -08:00
Basavapatna Dattaguru
046dc1ea81 Merge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes" 2011-02-14 19:31:52 -08:00
Basavapatna Dattaguru
c0171d3e7b VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes
Updated with review comments: code cleaning in MP.

Change-Id: Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
2011-02-14 18:00:57 -08:00
Basavapatna Dattaguru
699587da4b VideoEditor:Inconsistance defines:Issue ID:3419090
Assigned with MediaProperties array values

Change-Id: I97efa98954eb1be3b21a9e42b989def6bb657d77
2011-02-14 17:50:32 -08:00
Basavapatna Dattaguru
09f18d0503 Merge "VideoEditor: Issue ID:3396697 Missing Files added" 2011-02-14 16:12:13 -08:00
Andreas Huber
cb218793c3 Enable cancelling the rtsp connection process early.
Change-Id: Ie2059c54541ad8c675944d71b39c772b0f6f04c8
related-to-bug: 3452699
2011-02-14 14:14:23 -08:00
Mike Lockwood
321aa99762 MTP host: Use usb_device_bulk_transfer for synchronous transfers
Change-Id: Icf42ea0e5a848cee1565da49713ee9ad0db9f1a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-14 08:17:44 -05:00
Basavapatna Dattaguru
fc04c1d67e VideoEditor: Issue ID:3396697 Missing Files added
IMG_640x480_Overlay2: dimension correction done

Change-Id: I40960a44584fb27538d7e22829d293a34c654df7
2011-02-13 16:54:51 -08:00
Basavapatna Dattaguru
b27a1ca53e Merge "VideoEditor: Fixes Issue ID:3448077" 2011-02-11 18:11:21 -08:00
Basavapatna Dattaguru
4eb7a98342 VideoEditor: Fixes Issue ID:3448077
Updated with review comments. checks width & height

Change-Id: I79bd28862f511e7653e7e7a63c88772834ee6559
2011-02-11 18:03:01 -08:00
Basavapatna Dattaguru
656055866a Merge "VideoEditor: Populate profile&level: Issue:3419090" 2011-02-11 17:48:45 -08:00
Basavapatna Dattaguru
2b06e56031 VideoEditor: Populate profile&level: Issue:3419090
Updated with new values for Profiles and levels

Change-Id: Ib0abcab1be741c151ce44b54eb1deff64828af00
2011-02-11 17:18:54 -08:00
Yu Shan Emily Lau
4d0e920c4f Merge "Add the open source test media contents." 2011-02-11 16:16:06 -08:00
Yu Shan Emily Lau
bd508bdbe4 Add the open source test media contents.
Change-Id: I956e06712454287f502bffb22e10612e980b936d
2011-02-11 15:47:00 -08:00
James Dong
fe84cf13cd Make available h263 DSI information from MPEG4Extractor
bug - 3446863

Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
2011-02-11 15:25:03 -08:00
Basavapatna Dattaguru
4c030b5616 Merge "Video Editor CTS Test Code: annotation suppress" 2011-02-11 15:17:06 -08:00
Basavapatna Dattaguru
e69ce38903 Merge "VideoEditor Test contents: Issue ID:3396697" 2011-02-11 15:08:28 -08:00
Basavapatna Dattaguru
31d19c80c7 VideoEditor Test contents: Issue ID:3396697
Moved to folder contents/media_api/videoeditor

Change-Id: I809b684931130badca1c5bbf91178b142ba5017f
2011-02-11 15:00:17 -08:00
Andreas Huber
990909242c Merge "Start playing (and decoding) audio only after the first video frame has been decoded." 2011-02-11 13:50:12 -08:00
Basavapatna Dattaguru
86e9e9be1e Video Editor CTS Test Code: annotation suppress
Fix for Issue: ID:3396697
Updated with review comments

Change-Id: Ie20e60598f046b23ed49b2533e9d500607a23c17
2011-02-11 13:30:07 -08:00
Andreas Huber
ce8a1013f3 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
2011-02-11 13:09:36 -08:00
James Dong
94738e40c2 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
2011-02-11 13:05:19 -08:00
Santosh Madhava
9ee9aad809 Fix for issue 3444358 : Movie studio is broken in Master-TOT
Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
2011-02-11 11:34:26 -08:00
Dheeraj Sharma
1d830165a0 Merge "Fix for issue : 3439708 Last frame is missing effect" 2011-02-11 10:57:31 -08:00
Mike Lockwood
540380fb0a Add MTP/PTP host support to the public API
Needed for unbundling the Gallery app

Change-Id: I57e6b76ee5c9e57cb8c055329ac13251879baafd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 09:09:11 -05:00
Mike Lockwood
bc20c93863 Merge "MTP: Fix JNI warnings in MtpDevice" 2011-02-11 05:21:26 -08:00
Mike Lockwood
40304e2272 MTP: Fix JNI warnings in MtpDevice
Needed to add a global ref to the classse to avoid
"not a valid JNI reference" errors when calling the constructor.

Change-Id: Ieb7e69f5d19fd5a090c53d32f69a201040c49112
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 08:19:11 -05:00
Dheeraj Sharma
fb4e92c4ed Fix for issue : 3439708 Last frame is missing effect
Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
2011-02-10 18:05:20 -08:00
Glenn Kasten
8132a8caf3 Merge "Bug 3352047 Wrong message when adjusting volume" 2011-02-10 15:27:59 -08:00
Glenn Kasten
8b4b97a14a Bug 3352047 Wrong message when adjusting volume
Add hidden AudioManager.getDevicesForStream and output device codes.

Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
2011-02-10 14:37:42 -08:00
Eric Laurent
04f7861cfa Merge "Fix issue 3435692" 2011-02-10 14:01:27 -08:00
Eric Laurent
a25c5d88d1 Fix issue 3435692
The problem is that the AudioService is not notified of the death of
IAudioFlinger binder interface because no methods was called on AudioFlinger
from system_server since the device booted. Therefore, AudioSystem did not created any
IAudioFlinger interface in the system_server process.
The root cause was always present but more likely to happen on a tablet than on a phone
as for instance no beeps are played when volume is adjusted.

The fix consists in having AudioSystem explicitly call a method on AudioFlinger when a
callback is installed to make sure that an IAudioFlinger binder interface is created
regardless of any other activity in the client process.

Change-Id: I9df34a36825af0b25cd0246dd02edbd712263f41
2011-02-10 13:24:04 -08:00
Andreas Huber
8cdc31f76a Merge "Fix the build." 2011-02-10 12:35:06 -08:00
Andreas Huber
c2f9a26b1e Fix the build.
Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
2011-02-10 12:34:25 -08:00
Marco Nelissen
4fd18e6310 Merge "Better genre support." 2011-02-10 12:23:11 -08:00
Marco Nelissen
cb613a04c1 Better genre support.
Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415

Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
2011-02-10 12:09:16 -08:00
Andreas Huber
8e6f60d9bb Merge "Change timestamp handling in RTSP, remove unused, experimental, gtalk support" 2011-02-10 11:55:22 -08:00
Andreas Huber
b2934b16ea 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
2011-02-10 11:53:54 -08:00
Santosh Madhava
adca6840e3 Merge "Fix for 3431967: Memory leak from video editor engine in JNI" 2011-02-10 09:41:27 -08:00
Santosh Madhava
91ba3a0033 Fix for 3431967: Memory leak from video editor engine in JNI
Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
2011-02-09 19:25:17 -08:00
James Dong
f6a2bff0c9 Reduce blocking time in file write
bug - 3418787

Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
2011-02-09 15:44:32 -08:00