summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2012-08-10Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong
This patch enables the drm framework to avoid opening files directly. As a result, the drm framework no longer needs the sdcard read permision. o related-to-bug: 6426185 Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
2012-08-10am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT ↵Jean-Baptiste Queru
and PMT" * commit '3ca352c4cd01f6df3b691f835efc68a5771e724e': MPEG2TSWriter: Write a proper CRC in PAT and PMT
2012-08-10am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru
* commit '24893fef8e0f816a8a21749fa3eb9eed9173a0fd': MPEG2TSWriter: Write a proper CRC in PAT and PMT
2012-08-10Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru
2012-08-10am 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity ↵Jean-Baptiste Queru
counters for PAT and PMT" * commit '31a593b901eeb924ae5214962c628397dd0197f2': MPEG2TSWriter: Write proper continuity counters for PAT and PMT
2012-08-10am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT ↵Jean-Baptiste Queru
and PMT" * commit '2001d2ac01e36c13c1abda5f73b6404cba2648e1': MPEG2TSWriter: Write proper continuity counters for PAT and PMT
2012-08-10Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru
2012-08-08am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 ↵Jean-Baptiste Queru
files" * commit '51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4': Store correct time stamps in recorded mp4 files
2012-08-08am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru
* commit 'e28df5b996af3480b457c7a9908dbb9d52ad8d7c': Store correct time stamps in recorded mp4 files
2012-08-07Revert "Swap the order of creating IAudioTrack and thread"Glenn Kasten
This reverts commit 5d464eb0b8cffb994a754ff108795e858a882414. It caused the wrong thread ID -1 to be passed to IAudioFlinger::createTrack(). Change-Id: Ic221d2bb4af572d3d2d752af19238c52f6728e3a
2012-08-07Make sure codec names and corresponding quirks are returned together.Andreas Huber
Previously they were returned in separate vectors and only one of them was sorted if software codecs were preferred, leaving the quirks no longer matching the codec name at the same index. Change-Id: Id3f1e6f9f7f8c9cc4b6ebfb86a203b4d59de8604 related-to-bug: 6737884
2012-08-06Remove obsolete hack for TI specific codeJames Dong
o related-to-bug: 6566886 Change-Id: I39aad214cbf7b748a95a9d22db50cd8f421931e6
2012-08-03Merge "experimental support for fragmented mp4 playback in nuplayer" into ↵Marco Nelissen
jb-mr1-dev
2012-08-03experimental support for fragmented mp4 playback in nuplayerAndreas Huber
cherry picked from change 170999 Change-Id: I407775f0290154ad4961134839a15c9f296424c0
2012-08-02Dynamically configure the number of video buffers used by camera source, if ↵James Dong
supported o related-to-bug: 6920805 Change-Id: I413bb50954cc84e32ed40bcb713842dc7b58e2b6
2012-08-02Allocate buffers before calling start on its source in OMXCodec::start() for ↵James Dong
encoder case o This makes it possible to configure the source to use the same number of input buffers as requested by the video encoder, before the source starts. As a result, hardcoded number of video buffers for camera source, for instance, can be avoided. o related-to-bug: 6920805 Change-Id: I13d2c308dce34967768cd407f02988e92ef10a89
2012-08-02Unifying TimedTextDriver's resume() and start().Insun Kang
(cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425) Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
2012-08-02Adds resume() functionInsun Kang
o Revived resume() function to fix pause/resume bug. (Bug: 6663740) o Mannually cherry-picked from GTV change. (commit: ad1197226d1c6745959f0e469f510ca06f99489f) Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
2012-07-31Allows MediaMetadataRetriever to retrieve video rotation angleJames Dong
o related-to-bug: 6872687 Change-Id: I34e74b0756f8269edefdf3a25d8806c76fd1e2f8
2012-07-30Store correct time stamps in recorded mp4 filesJohannes Carlsson
According to the specification (ISO_IEC_14496-12_2008 page 17, 19 and 21) the time is "in seconds since midnight, Jan. 1, 1904, in UTC time" which is not the same as Unix epoch time. This is already correctly handled in MPEG4Extractor.cpp when reading files. The specification also supports 64 bit timestamps which would make it a bit more future proof, but unfortunately it seems like support for this in players are poor (tested both Windows media player and Quicktime player). Change-Id: I102d728f098b8b0a21013956f017b0c4f2d69112
2012-07-27Swap the order of creating IAudioTrack and threadGlenn Kasten
Simplifies the error recovery in case IAudioTrack fails. Change-Id: I6aee41a2ac747a5689fb4836b04174e6107bf32f
2012-07-27Clean up start() parametersGlenn Kasten
Document where int is used instead of AudioSystem::sync_event_t (probably because of a header file dependency). TrackBase::start() and RecordTrack::start() don't need default parameters. Change-Id: I82f4a4d078be900f3aa4bd926697e32f5ed68ec8
2012-07-25effect_descriptor_t const correctnessGlenn Kasten
Change-Id: Iad008f20d35a18acf500f773900164552fd0c19e
2012-07-20Merge "Camera: Add OPAQUE pixel format to CameraParameters"Eino-Ville Talvala
2012-07-20Added a callback to signal when the rendering of the video frame just occurredJames Dong
Change-Id: Ifbd78606ffc33483aecebf02cb18e0e52af9624d related-to-bug: 6851811
2012-07-18Camera: Add OPAQUE pixel format to CameraParametersEino-Ville Talvala
This is only used to support recording with HAL 2 in the KEY_VIDEO_FRAME_FORMAT parameter, and is not exposed to applications. Bug: 6243944 Change-Id: I5976a748d199ae98189bd03af5bbd9e18cbd6bf0
2012-07-17AudioRecord lockingGlenn Kasten
Fix race conditions for EVENT_MARKER and EVENT_NEW_POS callbacks. Marker and new position update fields are protected by lock. getSampleRate() doesn't need a lock because it reads from shared memory control block. Enforce that the parameter passed with EVENT_MARKER and EVENT_NEW_POS cannot not be changed by the callback handler, and will not change during the call by another thread. Session ID should never change; log if it does. Change-Id: Ia2c63cf1a71b10bb06c37981bd76437f83fffa91
2012-07-17Use audio_channel_mask_t for channel maskGlenn Kasten
Change-Id: I1c1896da48983aa9f1462a4b471f910498816f60
2012-07-16Merge "AudioRecord::stop() return void"Glenn Kasten
2012-07-13am 190313ec: am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec ↵Edwin Wong
mode." into jb-dev * commit '190313ec68e81c10d200ff3c20ac152cf90760d6': Fixed sample video corrupted in MediaCodec mode.
2012-07-13AudioRecord::stop() return voidGlenn Kasten
like AudioTrack::stop() Change-Id: Iab62f4665151345f1ad5874c97a21d1a331f0154
2012-07-13am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into ↵Edwin Wong
jb-dev * commit '65e8d62a5b243518795cdafa498df4a49baf6940': Fixed sample video corrupted in MediaCodec mode.
2012-07-13AudioRecord client threading cleanupGlenn Kasten
Rename ClientRecordThread to AudioRecordThread to be more similar to AudioTrack naming. Only create the thread once, and use resume() and pause() for start() and stop(). This will allow us to have a known client callback thread tid that we can pass to AudioFlinger before start(). mActive: Made mActive a bool not int. mActive is protected by mLock; volatile is meaningless. Fixed a few places where mActive was accessed without a lock: - stopped() - processAudioBuffer() These aren't used internally, so no need for _l() versions. Change-Id: I4b8a5c90f3a22d3894b344564cb1c5aef4f1fda2
2012-07-13Fixed sample video corrupted in MediaCodec mode.Edwin Wong
Change-Id: I50c5660072d40f6e297e58fd026ea04c89d6a70a related-to-bug: 6732061
2012-07-13Merge "Remove dead code in libmedia"Glenn Kasten
2012-07-12Add tid parameter to IAudioFlinger::openRecordGlenn Kasten
Not yet implemented Change-Id: I35523fb15ad71727ecc9f4bb870f07e4b7397dc4
2012-07-12Remove dead code in libmediaGlenn Kasten
Change-Id: I7d8201590cda29c9fa99662a4fdba222091febfe
2012-07-12Simplify AudioRecord::getInputFramesLost()Glenn Kasten
This also fixes a benign race in reading mActive without a lock. Change-Id: I19e953d4f275e5c266ca1ca3fece7b6c02ad1707
2012-07-10Use audio_channel_mask_t more placesGlenn Kasten
Use it in AudioSystem::getOutput(), AudioSystem::getInput(), IAudioPolicyService::getOutput(), IAudioPolicyService::getInput(), and various other places in AudioFlinger. Not done: AudioTrack and OutputDescriptor. Change-Id: I70e83455820bd8f05dafd30c63d636c6a47cd172
2012-07-10MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello
Change-Id: I6ec8039b176878da6f02691194d96b0a1e894055
2012-07-10MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello
Change-Id: If94e31e51c563867db6d2376ad771f9751416084
2012-07-03Use audio_channel_mask_t more consistentlyGlenn Kasten
In IAudioFlinger::createTrack() and IAudioFlinger::openRecord(), declare input parameter to use correct type audio_channel_mask_t. In IAudioFlinger::getInputBufferSize(), input parameter is now channel mask instead of channel count. Remove unused IAudioFlinger::channelCount(audio_io_handle_t). In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(), input parameter is channel mask instead of channel count. Change-Id: Ib2f1c29bea70f016b3cfce83942ba292190ac965
2012-06-25Merge "AudioRecord comments"Glenn Kasten
2012-06-25AudioRecord commentsGlenn Kasten
Group the private fields according to how they are used Change-Id: I7ce3d0939510c10f34bd91a55f6e03afc8e7d43c
2012-06-25Remove acoustics from AudioSystem::getInput()Glenn Kasten
Change-Id: I29fb3ee5664c1f0ee0409c1bb2be087ecca637db
2012-06-25Use audio_channel_mask_t in AudioRecordGlenn Kasten
Change-Id: I9e1b918b2635d961604a4a9d88eb1c7179a167a7
2012-06-25Remove unused AudioRecord::channels()Glenn Kasten
It was declared but never implemented or called. Change-Id: If5846147fcbd7f6d4187971e2044dd6fd3252b42
2012-06-25Include what you useGlenn Kasten
Change-Id: I12ef9367d05dbe069c037b1b4acd6347a8cf3ece
2012-06-25Merge "Remove AudioRecord record_flags"Glenn Kasten
2012-06-22am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into ↵Jamie Gennis
jb-dev * commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7': SurfaceMediaSource: keep refs to current buffers