drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,305 Commits 1 Branch 0 Tags
Commit Graph

4726 Commits

Author SHA1 Message Date
Jeff Brown
501c4671e7 Merge "Eliminate single-process mode. Bug: 5010576" 2011-07-11 13:37:53 -07:00
James Dong
9b40a61ce9 Merge "Do not wait for unlaunched threads in stop()" 2011-07-11 12:56:11 -07:00
James Dong
0e27fce923 Do not wait for unlaunched threads in stop() 
Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
 2011-07-11 12:51:21 -07:00
James Dong
6e65a4a4ff Merge "Release camera if CameraSource::start() has not been called" 2011-07-11 12:46:35 -07:00
Mike Lockwood
a59a1bad85 Merge "Remove unnecessary locking from MediaScanner JNI code" 2011-07-11 12:15:21 -07:00
Mike Lockwood
af16d0b30e Remove unnecessary locking from MediaScanner JNI code 
There is nothing in this file that requires a global lock.
Furthermore, the lock can cause timeouts in native_finalize if one instance
is being garbage collected while another is busy in processDirectory

Bug: 5002520

Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-11 15:07:10 -04:00
Mike Lockwood
e6d24ab6a9 Merge "MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system" 2011-07-11 10:41:08 -07:00
Mike Lockwood
7a59dd2ce3 MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system 
Bug: 4561836

Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-11 13:40:02 -04:00
Mike Lockwood
bd682b0408 MediaScanner: Use bulk inserts when in batch mode 
To do this we need to move the logic for determining media type to MediaProvider
Make some things in MediaFile public so they can be used from MediaProvider

Bug: 4948188

Change-Id: I6ab168b6b4d45b2fc91ea8bd52ca58283b0efc14
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-07-11 11:55:26 -04:00
James Dong
8d19d3ae1e Release camera if CameraSource::start() has not been called 
Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
 2011-07-10 14:19:26 -07:00
Jeff Brown
10e8971286 Eliminate single-process mode. 
Bug: 5010576

Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
 2011-07-08 19:54:07 -07:00
Rajneesh Chowdury
bc2861fdbb Merge "Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn" 2011-07-08 17:00:08 -07:00
Rajneesh Chowdury
559bb7951f Fix for issue 5007228 IllegalArgumentException when testing VideoEditorAPITest#testEffectKenBurn 
Change-Id: Ic8b4360cdabb157fa7739552b73e3c3daab88129
 2011-07-08 14:56:06 -07:00
James Dong
be650872f8 Use advertised h264 encoding parameters by default if the profile is not baseline 
o Force to use AVC baseline profile for camcorder low quality videos

Change-Id: I3424c57dd0c55fc4991f5767b57695c8f3420ecb
 2011-07-08 10:44:05 -07:00
Eric Laurent
5cc0526339 Moved and renamed effect API header files 
Moved specific effect header files to
system/media/audio_effects/include/audio_effects
and renamed to lower case (effect_xxx.h).

Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
 2011-07-07 15:25:51 -07:00
Gloria Wang
2da9eb7175 Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager" 2011-07-06 09:22:05 -07:00
Vikas Arora
7f61f5919d Associate WebP Mime-Type with FILE_TYPE_WEBP. 
The last change for adding WEBP Mime-Type
(https://android-git.corp.google.com/g/#change,112919) had this bug.
Fixing the bug in this change.

Change-Id: I084b66de4aabb3892fb0e6fa36062a52d4dcc224
 2011-07-06 16:48:18 +05:30
Gloria Wang
82428a862f - Retrieve is_drm in MediaMetadataRetriever. 
- Add one more column in MediaStore to indicate whether a
  media file is drm-protected.
- Remove old DRM code from Ringtone
- Use the new DRM code in RingtoneManager

Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
 2011-07-01 16:52:28 -07:00
Glenn Kasten
03f9435273 Merge "Bug 4571308 Provide correct video frame timestamps" 2011-07-01 15:02:33 -07:00
Andreas Huber
dfba1773c9 Merge "Charge network traffic to the uid of the process using the MediaPlayer." 2011-07-01 14:28:10 -07:00
Andreas Huber
e02dd02bb8 Merge "Ignore all flush-complete notifications with port == OMX_ALL" 2011-07-01 14:27:37 -07:00
Andreas Huber
603d739b5a Charge network traffic to the uid of the process using the MediaPlayer. 
Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067
related-to-bug: 4517282
 2011-07-01 13:18:43 -07:00
Andreas Huber
919a7ae9b4 Ignore all flush-complete notifications with port == OMX_ALL 
Use of this notification is not consistent across
implementations. We'll drop this notification and rely
on flush-complete notifications on the individual port
indices instead.

Change-Id: I76c0dfdcfc92a7c9acf57abf3027d2638d77efca
 2011-07-01 13:13:02 -07:00
Andreas Huber
091b248538 Merge "Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec." 2011-07-01 09:48:05 -07:00
Andreas Huber
42fb5d64b9 Support a "secure input buffer" mode for use by Widevine DRM in OMXCodec. 
Change-Id: Ie03b285265099dbac9b12f3f41d9ad758d0b50ad
 2011-07-01 09:28:51 -07:00
Edwin Wong
27ac0ac360 Merge "Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video."" 2011-07-01 08:52:28 -07:00
James Dong
5367190fdd Merge "Return ERROR_END_OF_STREAM when the input source reaches eos" 2011-07-01 08:35:25 -07:00
Kristian Monsen
5faaadffbf Merge changes I7e8401a4,I412ddf36 
* changes:
  Merge Chromium at r11.0.696.0: New autofill strings
  Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
 2011-07-01 08:04:11 -07:00
Jeff Tinker
73104111d6 Revert "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video." 
This reverts commit d63d947d406977c7c307f69369908b4342c98ef3
 2011-07-01 07:13:42 -07:00
Andreas Huber
e9a4188119 Seeking/duration in HLS content is based on the individual segments' duration 
not target-duration.

Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10
related-to-bug: 4983285
 2011-06-30 16:52:33 -07:00
Andreas Huber
04deb7bb7b Merge "Revert "Parse RTP-Info even for live streams."" 2011-06-30 11:21:14 -07:00
Andreas Huber
d4a6cac34d Revert "Parse RTP-Info even for live streams." 
This reverts commit d873413ff9f742f259c29d7d0b58265db6b24529.
 2011-06-30 10:59:19 -07:00
Andreas Huber
4f0205f6a3 Some (most) OMX decoders do not send a OMX_CmdComplete/Flush OMX_ALL notification 
Change-Id: I1bdcc7be5f12dab301891a5f9ee5cc981e09ba82
 2011-06-30 09:34:25 -07:00
Chih-Chung Chang
ff90212a3c Remove curtain effect (it's unused). 
Change-Id: I2addf390aaa5aa514238b1f98eea67f27745cbf1
 2011-06-30 14:41:20 +08:00
James Dong
d39e8f4c23 Return ERROR_END_OF_STREAM when the input source reaches eos 
Change-Id: I334313b054dcf388d2e05d56efb10ceea4980638
 2011-06-29 22:35:59 -07:00
Andreas Huber
2d700947db Merge "Fix a format string that triggered a compile-time warning in OMXCodec.cpp" 2011-06-29 10:23:14 -07:00
Andreas Huber
9fb64a250c Fix a format string that triggered a compile-time warning in OMXCodec.cpp 
Change-Id: Ib4b6cce1b4102034605da8edfb0dd8bc9a578168
 2011-06-29 09:19:19 -07:00
Andreas Huber
2bcc183cab Instantiate a NetworkChangeNotifier to have chromium transparently handle interface 
changes.

Change-Id: If48d2934ce29d68b9c31a1d120fe8f134f277a33
 2011-06-29 09:17:59 -07:00
Kristian Monsen
d2a1ebc356 Merge Chromium at r11.0.696.0: Using setter instead of direct variable access 
Members in UrlRequestContext was made private in upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165

Change-Id: I412ddf36b0818e59b9b3ae428407d562facd4785
 2011-06-29 16:00:27 +01:00
Wu-cheng Li
528b084be2 Unlock the camera if media recorder fails to start recording. 
bug:4965716

Change-Id: Icb1f7f18e9ea6c4f0427ade2ed338e7d56be5e01
 2011-06-29 16:53:37 +08:00
Andreas Huber
068dbbf7ee Support for writing output data to a provided callback function instead of a file 
in MPEG2TSWriter

Change-Id: Ie54a5677c7b789a973aa50b7f197c6db238425bc
 2011-06-28 14:44:57 -07:00
Andreas Huber
d11eccf3a8 Merge "Multiple changes to ACodec/codec tools:" 2011-06-28 12:48:01 -07:00
Andreas Huber
e366f52b15 Multiple changes to ACodec/codec tools: 
Make sure sf2 does not coalesce input buffers, generalize ACodec's codec
instantiation based on OMXCodec's list of eligible component names.

Some changes/additions to the "sf2" commandline tool

Make surface options consistent with stagefright tool, i.e. use '-S' instead of '-s'
New option '-R' renders surface-allocated buffers.

Also fixes a longstanding bug introduced when generalizing from surfaces to native windows that never used surface-allocated buffers in sf2 even when the option was specified.

Change-Id: I59fd533f0f6ef0337ebe2806ddc81a46878eb3ae
 2011-06-28 10:51:41 -07:00
Jeff Tinker
f65d59bdd3 Merge "Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video." 2011-06-28 10:12:08 -07:00
James Dong
88f7194f6d Add a testcase to test PNG files support for KenBurn effect. 
Change-Id: I1d0b3ff7b5aa21c25c141b440521e64b4a82043d
related-to-bug: 4861071
 2011-06-27 13:42:55 -07:00
Jeff Tinker
d63d947d40 Fix for b/4165024: Serious Memory leak when playing a WV protected streaming video. 
This change allows the WVM extractor to close and reopen when not in use which resolves
the issue with heap fragmentation between plays.

Change-Id: I160ee1e98aada2bfdd0818eeb6300ad50644fb75
 2011-06-27 12:42:39 -07:00
Andreas Huber
b5cc1f1e21 Merge "Fix the new color converter to respect the destination crop rect." 2011-06-27 11:14:19 -07:00
Andreas Huber
e67e99a9fb Merge "Log video dimensions and crop rectangle." 2011-06-27 11:14:12 -07:00
Andreas Huber
f7ee6692a5 Merge "Update paths to test content used to run the omx_tests." 2011-06-27 11:14:05 -07:00
Glenn Kasten
5c2faf3dc3 Bug 4571308 Provide correct video frame timestamps 
Change-Id: I0f726817fc02d3e2a4cf82ed801ef977994e6bcc
 2011-06-27 11:09:33 -07:00