James Dong
d9ac621f59
Do not wait forever for output buffers in OMXCodec.cpp and error out in case time out happens
...
o Deal with vendor codec hang bug
Change-Id: Ic8449afd43045f09a9e0bd3d1be9a320e59ccabe
2011-07-15 15:32:21 -07:00
Rajneesh Chowdury
aea7d6cdfb
Fix for issue 5007510 AssertionFailed for MediaPropertiesTest#testPropertiesH263QCIF
...
Change-Id: I1c7c32fee491871223ad12df4696363415902377
2011-07-15 15:11:48 -07:00
Gloria Wang
e1ea88c573
Merge "Use unsigned char to store table of contents retrieved from XING header. Our compiler treats char default to unsigned (trygon-eng on master branch). If I force "signed char" for the table of contents array, some MediaFramework tests for VBR mp3 would fail."
2011-07-15 14:20:45 -07:00
Andreas Huber
698a5e0806
Merge "Refetch playlists according to the HLS specs, varying delay if playlists unchanged"
2011-07-15 14:16:15 -07:00
Gloria Wang
c2e5ca3cac
Use unsigned char to store table of contents retrieved from XING header.
...
Our compiler treats char default to unsigned (trygon-eng on master branch).
If I force "signed char" for the table of contents array, some MediaFramework
tests for VBR mp3 would fail.
Change-Id: I725e2d4dfe57ff36fdb1d65fe3184f7ab41ad695
2011-07-15 12:08:00 -07:00
Andreas Huber
cc0b9f139f
Refetch playlists according to the HLS specs, varying delay if playlists unchanged
...
since the previous fetch.
Change-Id: I75e167a650c65a23e284381db5203beba7be7420
related-to-bug: 4983546
2011-07-15 11:30:16 -07:00
Glenn Kasten
2aa6c4b515
Merge "Bug 5031179 possible fix for assert in join"
2011-07-15 09:23:33 -07:00
Mike Lockwood
92e1314ad9
MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files
...
Bug: 5025615
Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-15 12:17:33 -04:00
Jamie Gennis
c85ca5d6b5
MediaPlayer: add ANativeWindow (dis)connect calls
...
This change makes MediaPlayer connect to the ANativeWindow to which it
is going to render video frames and disconnect when it is done.
Change-Id: I88ab5c2fe62493aabdc84a283ff31634f795d415
2011-07-14 17:48:33 -07:00
James Dong
8a65e1fb57
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
2011-07-14 16:42:34 -07:00
James Dong
2c17f05a81
Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."
...
This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844.
Conflicts:
media/libstagefright/AwesomePlayer.cpp
Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
2011-07-14 16:22:47 -07:00
Glenn Kasten
2c751a8416
Bug 5031179 possible fix for assert in join
...
Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
2011-07-14 16:16:54 -07:00
Andreas Huber
c1df573aed
Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
2011-07-14 13:22:45 -07:00
Andreas Huber
232d5f2aa2
If audio startup fails while executing MediaPlayer::start() do NOT post an error
...
notification, the error returned by MediaPlayer::start() will suffice.
Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a
related-to-bug: 5020200
2011-07-14 13:02:47 -07:00
Narayan Kamath
d1435e998b
Merge "Minor documentation updates for the AudioTrack class."
2011-07-14 11:13:07 -07:00
Narayan Kamath
88bde0ce37
Minor documentation updates for the AudioTrack class.
...
Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
2011-07-14 18:10:47 +01:00
James Dong
ad07457ece
Merge "Support profile and level query for SW video decoders"
2011-07-14 09:59:24 -07:00
Andreas Huber
1a54107562
Merge "Remove legacy http support from stagefright, chromium is the new hotness."
2011-07-14 09:09:07 -07:00
Glenn Kasten
d86934ae0f
Merge "OMX CallbackDispatcher uses C++ Thread not pthread"
2011-07-14 07:54:34 -07:00
Mike Lockwood
c1b9bbb21c
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
...
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 19:45:44 -04:00
Andreas Huber
c3119330a5
Remove legacy http support from stagefright, chromium is the new hotness.
...
Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
2011-07-13 15:45:01 -07:00
Andreas Huber
2d912dd5ea
Merge "Remove old-style software decoders."
2011-07-13 15:19:44 -07:00
Andreas Huber
a8ccc50175
Remove old-style software decoders.
...
Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
2011-07-13 14:14:08 -07:00
Mike Lockwood
45aaa2a345
MediaScanner: fix breakage in updates
...
To facilitate bulk inserts, we changed the media scanner to use the file URI
instead of the audio, video or image media URIs.
However we should still use the media URIs for updating existing records
Bug: 5021925
Change-Id: I6143dc1d00350192170428a5e951b52ef9223734
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-13 16:50:29 -04:00
Andreas Huber
67d464f47e
Enable signalling of a stream discontinuity involving a format-change
...
through IStreamListener.
Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a
related-to-bug: 5022434
2011-07-13 09:47:09 -07:00
Mike Lockwood
9cba686366
Merge "MTP: Clean up MtpServer initialization and threading:"
2011-07-13 08:07:59 -07:00
Mike Lockwood
dcc31946f2
MTP: Clean up MtpServer initialization and threading:
...
Move thread from native to Java code
Remove the stop() method (the thread will exit on its own)
Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
2011-07-13 09:44:42 -04:00
Iliyan Malchev
d420b18c43
Merge "Add support for TI H264 encoder"
2011-07-12 17:40:25 -07:00
Dandawate Saket
e641dc502b
Add support for TI H264 encoder
...
Add support for TI H264 encoder and quirks for buffer allocation.
Temporary switching to baseline profile till ctts patch is defaulted
as per profile detection.
Change-Id: I1d56184b9c5d5f00d6c63aef7e058f3d56b84cef
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-07-12 15:50:28 -07:00
Jeff Brown
8c55a9a57e
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
2011-07-12 12:15:07 -07:00
Glenn Kasten
d28848b5b6
OMX CallbackDispatcher uses C++ Thread not pthread
...
This permits leveraging future improvements to Thread.
Change-Id: I45e25a309e7edd1d4f0dacc5ec987329afa497d9
2011-07-12 07:49:40 -07:00
Jeff Brown
bd882b1c87
Remove the simulator target from all makefiles.
...
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
2011-07-11 22:12:16 -07:00
Eric Laurent
c478f13535
Merge "Audio Effect API: process reverse stream function"
2011-07-11 15:20:27 -07:00
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
James Dong
fbb170ca9c
Support profile and level query for SW video decoders
...
Change-Id: I9c20db128be96cd36cf2083e08e8c21f5e6d1fdf
2011-07-11 12:29:10 -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
Eric Laurent
325b8e83a6
Audio Effect API: process reverse stream function
...
Added function to audio effect interface for processing of
a reverse stream.
This is necessary for audio pre processes like echo cancellation.
Change-Id: I6e12d79dbbed6376acdfc79304b8c0ab3f705eae
2011-07-11 12:00:53 -07: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