summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* AudioRecord JAVA: expose audio session IdEric Laurent2011-07-181-3/+21
| | | | | | | Added getAudioSessionId() method to AudioRecord class so that applications can retrieve the AudioRecord's session ID and attach audio pre processes. Change-Id: I1914770f0e54d97c9aef6a9eb36fff69b6d31552
* Audio framework: support for audio pre processingEric Laurent2011-07-188-30/+114
| | | | | | | | | | | | | | | | | | | | | | | | | Audio effect framework is extended to suport effects on output and input audio path. AudioFlinger: Support for audio effects and effect chains is moved from PlaybackThread class to ThreadBase class so that RecordThread can manage effects. Effects of type pre processing are allowed on record thread only. When a pre processing is enabled, the effect interface handle is passed down to the input stream so that the audio HAL can call the process function. The record thread loop calls the effect chain process function that will only manage the effect state and commands and skip the process function. AudioRecord: The audio session is allocated before calling getInput() into audio policy serice so that the session is known before the input theead is created and pre processings can be created on the correct session. AudioPolicyService: default pre processing for a given input source are loaded from audio_effects.conf file. When an input is created, corresponding effects are created and enabled. Change-Id: Id17119e0979b4dcf189b5c7957fec30dc3478790
* Merge "Always consider playlists corresponding to different bandwidths ↵Andreas Huber2011-07-181-0/+6
|\ | | | | | | different."
| * Always consider playlists corresponding to different bandwidths different.Andreas Huber2011-07-151-0/+6
| | | | | | | | Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
* | Merge "Fix seek behaviour at startup and teardown of media session that ↵Andreas Huber2011-07-182-3/+11
|\ \ | |/ | | | | hasn't been started"
| * Fix seek behaviour at startup and teardown of media session that hasn't been ↵Andreas Huber2011-07-152-3/+11
| | | | | | | | | | | | | | | | started Nuplayer specific. Change-Id: I7b0be52c29bdb7032414d63c503d686df7844bf6
* | Merge "MTP: Use a single packet for the data phase"Mike Lockwood2011-07-183-80/+66
|\ \
| * | MTP: Use a single packet for the data phaseMike Lockwood2011-07-173-80/+66
| | | | | | | | | | | | | | | | | | | | | | | | instead of sending 12 byte header in a separate packet. PTP on the Mac is much happier with this approach. Change-Id: I7d1ca498f6346afd88876d24332187b466fc469c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Audio preprocessing wrapper for webrtc.Eric Laurent2011-07-172-0/+1641
|/ / | | | | | | | | | | | | | | This wrapper implements the interworking layer between the audio effect interface defined by the effect framework for audio preprocessing and the native interface of webrtc audio processing module. Change-Id: I3f9319730c102599cdf0dda520a53d90b4165114
* | Merge "Fix for issue 5007510 AssertionFailed for ↵Rajneesh Chowdury2011-07-151-4/+12
|\ \ | |/ |/| | | MediaPropertiesTest#testPropertiesH263QCIF"
| * Fix for issue 5007510 AssertionFailed for ↵Rajneesh Chowdury2011-07-151-4/+12
| | | | | | | | | | | | MediaPropertiesTest#testPropertiesH263QCIF Change-Id: I1c7c32fee491871223ad12df4696363415902377
* | Merge "Use unsigned char to store table of contents retrieved from XING ↵Gloria Wang2011-07-152-4/+4
|\ \ | | | | | | | | | 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."
| * | Use unsigned char to store table of contents retrieved from XING header.Gloria Wang2011-07-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Refetch playlists according to the HLS specs, varying delay if ↵Andreas Huber2011-07-152-15/+124
|\ \ \ | |/ / |/| | | | | playlists unchanged"
| * | Refetch playlists according to the HLS specs, varying delay if playlists ↵Andreas Huber2011-07-152-15/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | unchanged since the previous fetch. Change-Id: I75e167a650c65a23e284381db5203beba7be7420 related-to-bug: 4983546
* | | Merge "Bug 5031179 possible fix for assert in join"Glenn Kasten2011-07-151-2/+7
|\ \ \
| * | | Bug 5031179 possible fix for assert in joinGlenn Kasten2011-07-141-2/+7
| | | | | | | | | | | | | | | | Change-Id: Id3a24c152579b8fdcfb9d66a11aa11579406a7ec
* | | | MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia filesMike Lockwood2011-07-151-1/+3
| |/ / |/| | | | | | | | | | | | | | | | | Bug: 5025615 Change-Id: Ia910cd1c063292599a03b878755edb2e3cdbbb57 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Merge "Revert "Add some logging to track down where ANR happens during ↵James Dong2011-07-142-6/+1
|\ \ \ | | | | | | | | | | | | MediaPlayer._release().""
| * | | Revert "Add some logging to track down where ANR happens during ↵James Dong2011-07-142-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer._release()." This reverts commit a5293d1ca4459293f4993ea39c09ea703a022844. Conflicts: media/libstagefright/AwesomePlayer.cpp Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
* | | | Merge "If audio startup fails while executing MediaPlayer::start() do NOT ↵Andreas Huber2011-07-142-5/+12
|\ \ \ \ | | | | | | | | | | | | | | | post an error"
| * | | | If audio startup fails while executing MediaPlayer::start() do NOT post an errorAndreas Huber2011-07-142-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notification, the error returned by MediaPlayer::start() will suffice. Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a related-to-bug: 5020200
* | | | | Merge "Minor documentation updates for the AudioTrack class."Narayan Kamath2011-07-141-16/+32
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Minor documentation updates for the AudioTrack class.Narayan Kamath2011-07-141-16/+32
| | | | | | | | | | | | | | | | | | | | Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
* | | | | Merge "Support profile and level query for SW video decoders"James Dong2011-07-143-0/+125
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Support profile and level query for SW video decodersJames Dong2011-07-113-0/+125
| | | | | | | | | | | | | | | | | | | | Change-Id: I9c20db128be96cd36cf2083e08e8c21f5e6d1fdf
* | | | | Merge "Remove legacy http support from stagefright, chromium is the new ↵Andreas Huber2011-07-1410-1560/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | hotness."
| * | | | | Remove legacy http support from stagefright, chromium is the new hotness.Andreas Huber2011-07-1310-1560/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
* | | | | | Merge "OMX CallbackDispatcher uses C++ Thread not pthread"Glenn Kasten2011-07-142-28/+36
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | OMX CallbackDispatcher uses C++ Thread not pthreadGlenn Kasten2011-07-122-28/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This permits leveraging future improvements to Thread. Change-Id: I45e25a309e7edd1d4f0dacc5ec987329afa497d9
* | | | | | Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator buildMike Lockwood2011-07-132-55/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | Merge "Remove old-style software decoders."Andreas Huber2011-07-1322-3139/+7
|\ \ \ \ \ \
| * | | | | | Remove old-style software decoders.Andreas Huber2011-07-1322-3139/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
* | | | | | MediaScanner: fix breakage in updatesMike Lockwood2011-07-131-5/+18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Enable signalling of a stream discontinuity involving a format-changeAndreas Huber2011-07-132-2/+14
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | through IStreamListener. Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a related-to-bug: 5022434
* | | | Merge "MTP: Clean up MtpServer initialization and threading:"Mike Lockwood2011-07-133-181/+77
|\ \ \ \
| * | | | MTP: Clean up MtpServer initialization and threading:Mike Lockwood2011-07-133-181/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move thread from native to Java code Remove the stop() method (the thread will exit on its own) Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
* | | | | Merge "Add support for TI H264 encoder"Iliyan Malchev2011-07-123-3/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add support for TI H264 encoderDandawate Saket2011-07-123-3/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge "Remove the simulator target from all makefiles. Bug: 5010576"Jeff Brown2011-07-129-77/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Remove the simulator target from all makefiles.Jeff Brown2011-07-119-77/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* | | | Merge "Audio Effect API: process reverse stream function"Eric Laurent2011-07-116-7/+51
|\ \ \ \ | |/ / / |/| | |
| * | | Audio Effect API: process reverse stream functionEric Laurent2011-07-116-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Eliminate single-process mode. Bug: 5010576"Jeff Brown2011-07-111-4/+0
|\ \ \ \
| * | | | Eliminate single-process mode.Jeff Brown2011-07-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: Id450dc83efed4897d1e4ff451530fed14457aace
* | | | | Merge "Do not wait for unlaunched threads in stop()"James Dong2011-07-111-9/+24
|\ \ \ \ \
| * | | | | Do not wait for unlaunched threads in stop()James Dong2011-07-111-9/+24
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: If681749753bb96ee98c1539658cfd919eeb0cb65
* | | | | Merge "Release camera if CameraSource::start() has not been called"James Dong2011-07-111-2/+23
|\ \ \ \ \
| * | | | | Release camera if CameraSource::start() has not been calledJames Dong2011-07-101-2/+23
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
* | | | | Merge "Remove unnecessary locking from MediaScanner JNI code"Mike Lockwood2011-07-112-7/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |