4804 Commits

Author SHA1 Message Date
Conley Owens
644f36eab4 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
  stagefright aacenc/amrwbenc: Convert line breaks to Unix style
2011-06-09 12:14:11 -07:00
James Dong
2488a94350 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."
2011-06-09 12:03:52 -07:00
James Dong
e3b80c8387 Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2 2011-06-09 11:56:09 -07:00
Marco Nelissen
6a91953cc9 am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds
* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
  Make sure we don't read from invalid fds
2011-06-09 11:41:57 -07:00
James Dong
3731e1bdf6 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
2011-06-09 11:39:36 -07:00
Conley Owens
d8b027b18f Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
Marco Nelissen
90dc22fa09 am a02d9bf9: Make sure we don\'t read from invalid fds
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
2011-06-09 10:36:24 -07:00
Marco Nelissen
a02d9bf9c3 Make sure we don't read from invalid fds
b/4580570

Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
2011-06-09 09:39:52 -07:00
Andreas Huber
fddf5d9f48 Make dumpsys(media.player) more useful by having AwesomePlayer populate it.
Change-Id: I12ba7d542331a8293d67a0d47378b8be4f777759
2011-06-08 16:04:26 -07:00
Andreas Huber
762b6d001a 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
2011-06-08 15:00:14 -07:00
James Dong
7d6143a9f0 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
2011-06-08 10:38:26 -07:00
Mike Lockwood
aa48835ce9 MTP: Remove obsolete setPtpMode support
PTP mode will be implemented as a separate USB function instead.

Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-08 09:19:23 -07:00
Yu Shan Emily Lau
d1d17b1651 Cleaned up the old test cases and test media files.
Change-Id: Icc3c04c69b11b2bb91588a8bb916baf69594e8d3
2011-06-07 12:08:13 -07:00
Kristian Monsen
7c37c1cf37 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
2011-06-07 16:09:33 +01:00
James Dong
6564c3c6ab Merge "Fix the comment for the location box @xyz" 2011-06-06 15:54:10 -07:00
Glenn Kasten
a093ca9c73 Merge "Remove dead code related to gettid" 2011-06-06 09:12:05 -07:00
Marco Nelissen
5ca271efe9 Merge "Add WebP Mime-Type support in Android Media File" 2011-06-06 08:21:07 -07:00
James Dong
d4c6a5be80 Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h" 2011-06-03 17:43:20 -07:00
James Dong
b571a7a053 Merge "Initial-checkin for ON2 Software AVC/H264 decoder" 2011-06-03 17:42:31 -07:00
James Dong
86f8b98e76 Add timestamp and data pointer checks in CameraSource
Change-Id: I99e188f631df2257813aa7ec657d6ecfc8859d9e
2011-06-03 17:21:16 -07:00
James Dong
0741f0054d Fix the comment for the location box @xyz
Change-Id: I5347e346eef40a8ba90e7a3fa786b4654d18606b
2011-06-03 17:09:26 -07:00
Glenn Kasten
6af763bec7 Remove dead code related to gettid
The gettid system call is always available now.

Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
2011-06-03 16:12:37 -07:00
James Dong
38c07129c4 Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h
Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
2011-06-03 12:44:48 -07:00
Andreas Huber
bd24eb5507 Merge "Don't advertise the (old-style) software decoders unless they're actually present." 2011-06-02 14:24:20 -07:00
Andreas Huber
2541c5af17 Don't advertise the (old-style) software decoders unless they're actually present.
Change-Id: I3753a21e1a7de86432c9c087be9d52028e3a1e1b
2011-06-02 13:25:12 -07:00
James Dong
bebc99d6fa 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
2011-06-02 12:32:46 -07:00
Vikas Arora
d0881d95e2 Add WebP Mime-Type support in Android Media File
Change-Id: Ifaa64c8fc55d1f1ad14db3057821696b565e0c26
2011-06-03 00:13:36 +05:30
James Dong
6c2cb3061d Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based" 2011-06-02 10:22:50 -07:00
James Dong
443287068b Do not call getEstimatedBandwidth if the streaming is not HTTP-based
Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
2011-06-02 10:13:52 -07:00
Andreas Huber
8e97372913 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.
2011-06-02 07:37:52 -07:00
Glenn Kasten
d3092e3157 Merge "Remove unnecessary level of priority indirection" 2011-06-02 07:24:14 -07:00
Glenn Kasten
993fccec5b Remove unnecessary level of priority indirection
Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
2011-06-01 16:46:29 -07:00
Yu Shan Emily Lau
fa22e62589 Convert the video editor performance
test suite output from float to int.

Change-Id: I62fada18a4c34d06b8d0ed91885e5bd98f12523f
2011-06-01 16:33:35 -07:00
Andreas Huber
8050a02b01 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
2011-06-01 15:54:07 -07:00
Glenn Kasten
e46a86fcb6 Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
2011-06-01 15:20:35 -07:00
Glenn Kasten
2225e4b704 Use AudioTrack::event_type not int in callback
Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
2011-06-01 13:50:23 -07:00
Jean-Michel Trivi
d0bbdb02b2 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Jean-Michel Trivi
5439223b56 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
2011-06-01 10:55:29 -07:00
James Dong
7c2cb0c583 Merge "Send estimated bandwidth value as informational event when cache fetcher pauses" 2011-05-31 17:25:47 -07:00
James Dong
a9d0febdd0 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
2011-05-31 15:23:25 -07:00
James Dong
c51e224b0a Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)" 2011-05-31 14:33:20 -07:00
Eric Laurent
8f18cf5574 Removed interface to load audio effects libraries
Removed unused functions allowing dynamic loading of audio effects libraries
from effects factory API.

Change-Id: I06cc5a51dc10aca87c7a8687bbb874babd711eca
2011-05-27 17:51:52 -07:00
Eric Laurent
c32c0093a4 Merge "New effect library API" 2011-05-27 15:26:25 -07:00
Eric Laurent
0fb66c2b83 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
2011-05-27 15:15:00 -07:00
James Dong
22bf7a7ea7 Add some comment to MediaRecorder.stop() about the stop() failure (-1007)
o The intended failure happens if stop() call comes immediately after start() call
  before any media data from the output of the encoder is received.

Change-Id: I62fad123ac67e2f566ba555e84c0c3faf2adfd99
2011-05-26 17:45:00 -07:00
Huahui Wu
18773812cf Merge "b/4452171 Dumping video playbacks to files." 2011-05-26 16:31:28 -07:00
James Dong
03edf6b364 Merge "Extract embedded cover art (aka poster frame) in mp4 files" 2011-05-26 12:00:51 -07:00
James Dong
0be123918e 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."
2011-05-26 11:41:30 -07:00
James Dong
e8b26dcec7 Extract embedded cover art (aka poster frame) in mp4 files
Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
2011-05-26 11:31:16 -07:00
Andreas Huber
73a4b2b3be Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams." 2011-05-26 08:52:55 -07:00