summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Plumbing to reflect minor changes in the HDCP module API that allow forAndreas Huber2013-01-302-5/+21
| | | | | | support of _decryption_ modules in addition to what we already supported. Change-Id: Ic37b87dc170ba8def3817991d25df798f21e950b
* Add non-blocking event logger NBLogGlenn Kasten2013-01-251-0/+188
| | | | Change-Id: I6c136cf3d7f46a8af84c69ecfc199dab394c10dc
* Merge "Start isolating control block accesses in a proxy"Glenn Kasten2012-12-213-45/+189
|\
| * Start isolating control block accesses in a proxyGlenn Kasten2012-12-123-45/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The proxy object will eventually be the only code that understands the details of the control block. This should make it easier to change the control block in the future. Initial set of control block fields that are isolated: - sample rate - send level - volume Prepare for streaming/static separation by adding a union to the control block for the new fields. Fix bug in handling of max sample rate on a track. It was only checking at re-configuration, not at each mix. Simplify OutputTrack::obtainBuffer. Change-Id: I2249f9d04f73a911a922ad1d7f6197292c74cd92
* | Merge "Remove unnecessary parameter"Glenn Kasten2012-12-212-6/+4
|\ \
| * | Remove unnecessary parameterGlenn Kasten2012-12-182-6/+4
| |/ | | | | | | | | | | Just get the parameter on server side Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
* | Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-1811-28/+28
|/ | | | | | | | | | The C++ class names don't match what the classes do, so rename ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to GLConsumer. Bug 7736700 Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
* am 76143093: am f0ff908d: Logging to investigate a crashGlenn Kasten2012-12-101-1/+11
|\ | | | | | | | | * commit '761430930a7335d714af0f7c1d497feb8f9f0a5a': Logging to investigate a crash
| * am f0ff908d: Logging to investigate a crashGlenn Kasten2012-12-101-1/+11
| |\ | | | | | | | | | | | | * commit 'f0ff908da019a44115109f1b4d1b6864b35a8a29': Logging to investigate a crash
| | * Logging to investigate a crashGlenn Kasten2012-12-071-1/+11
| | | | | | | | | | | | | | | Bug: 6490974 Change-Id: Ib926a9258bde4ee05ed42eea662dff68e426a997
* | | Respect sample aspect ratio in NuPlayer.Andreas Huber2012-12-051-0/+2
| | | | | | | | | | | | | | | related-to-bug: 7569402 Change-Id: I302de95d83b180bd2dc72ddd0c69a665dbce2527
* | | Emphasize distinction between streaming and staticGlenn Kasten2012-12-031-23/+52
| | | | | | | | | | | | | | | | | | Update comments and improve error checks to match Change-Id: I7370d6e59a7ef26dfb284a8b058d5ab2e0a42ccf
* | | flush() comments and checksGlenn Kasten2012-12-031-3/+8
| | | | | | | | | | | | | | | | | | | | | flush() is only useful for streaming mode. It is a no-op if track is active or uses a static buffer. Change-Id: I918ac181ffae3d16a0d67d8a7208f4aec61b5bd6
* | | AudioTrack::mute() is unused so remove itGlenn Kasten2012-12-032-14/+1
| | | | | | | | | | | | | | | | | | | | | If ever needed again, it could be implemented on client side by forcing a track volume of 0. Change-Id: I88a9b4f675b6dca2948549414f9ec2c192d29269
* | | AudioTrack inline short const methodsGlenn Kasten2012-11-301-10/+11
| | | | | | | | | | | | Change-Id: I142917edb454d510bbe545e94e6eaea30b650fae
* | | am ba6b1bc3: am e7550eb2: Merge "Initialize and copy mRotationAngle in ↵Andreas Huber2012-11-301-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | VideoFrame" * commit 'ba6b1bc38e0c355277f69af286469adb5f02e876': Initialize and copy mRotationAngle in VideoFrame
| * | am e7550eb2: Merge "Initialize and copy mRotationAngle in VideoFrame"Andreas Huber2012-11-301-1/+3
| |\ \ | | | | | | | | | | | | | | | | * commit 'e7550eb2805d864253f88ea2ced57014d6140e55': Initialize and copy mRotationAngle in VideoFrame
| | * | Initialize and copy mRotationAngle in VideoFrameChrister Fletcher2012-11-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When thumbnails were generated they could be generated at random angles as the mRotationAngle variable was not initialized to any value. This variable would have to be explicitly overwritten to not cause random rotation. Changed the implementation to initialize the value to 0 (no rotation). mRotationAngle was also missing in the copy constructor. Change-Id: I67a5340fdd807c6ab3a3da5eecb09b5b9d5f4666
* | | | am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by ↵Andreas Huber2012-11-291-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | triggering PAUSE/RESUME." into jb-mr1.1-dev * commit '2f6107ec8e67eea1f73b9558a5ad34caec52867f': [wfd] Support a low(er) power state by triggering PAUSE/RESUME.
| * | | am b64def9a: Merge "[wfd] Support a low(er) power state by triggering ↵Andreas Huber2012-11-291-0/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | PAUSE/RESUME." into jb-mr1.1-dev * commit 'b64def9a555bfbf533a2da41ba0189b9842a76fb': [wfd] Support a low(er) power state by triggering PAUSE/RESUME.
| | * | [wfd] Support a low(er) power state by triggering PAUSE/RESUME.Andreas Huber2012-11-291-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe42bfa73816bbfeb7e652d435254d0171b89727 related-to-bug: 7638150
* | | | am 296cb9dd: am 0dbe5a93: Added optional intra macroblock refresh support ↵James Dong2012-11-291-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | for encoding * commit '296cb9ddd916c43983bfb4ddab9c69ed555d4cc4': Added optional intra macroblock refresh support for encoding
| * | | am 0dbe5a93: Added optional intra macroblock refresh support for encodingJames Dong2012-11-291-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0dbe5a9321b24b6883fbb2fe97cd9d525128b0b5': Added optional intra macroblock refresh support for encoding
| | * | Added optional intra macroblock refresh support for encodingJames Dong2012-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 7524791 Change-Id: I95ac4ee925e2dbeb00b3cfb2e29c611698c5cc9f
* | | | am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-282-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7': Add support for HLS playlists of type 'event'.
| * | | am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-282-1/+5
| |\ \ \ | | |/ / | | | / | | |/ | |/| * commit 'b7c8e91880463ff4981e3e53e98e45d68e2fe374': Add support for HLS playlists of type 'event'.
| | * Add support for HLS playlists of type 'event'.Andreas Huber2012-11-272-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 6870049 Squashed commit of the following: commit eee2f3ba6bb7335f4e285632726db85645669929 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 15:02:01 2012 -0800 Make everything a lot less verbose by default. Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3 commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:34:46 2012 -0800 HLS now properly signals media time changes at discontinuities including the start of playback (which may not necessarily be at time 0 if the playlist is of type 'event' and hasn't completed yet). Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e commit 1555589832b1878a144a976a643e1af4d61f877c Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:32:28 2012 -0800 As part of a time discontinuity, clients of IStreamListener can now signal the corresponding media time after the discontinuity, i.e. the first PTS timestamp following the discontinuity will be considered equivalent to the specified media time and media buffers timestamped accordingly. Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92 commit 5c24c605c073a11c426d025b1e7478fc1ad8365a Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 13:00:56 2012 -0800 NuPlayer sources now expose flags() and can announce that duration may change (increase) dynamically, in which case duration will be polled at 1 second intervals and communicated to the upper layers. Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea commit ecb71de8e281e61971a2cd73e7161a97540bc357 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 12:57:47 2012 -0800 Stop caching duration in MediaPlayer, duration could increase dynamically. Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791 commit 544aec5823e6d7a3e97e15b6b23546616bcd343e Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 08:46:28 2012 -0800 An attempt to add support for "event" style HLS playlists. Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60 Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
* | | am 9abbd0fb: am 3eb46d17: Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '9abbd0fb822aa0076f6de03f2092db47760b924d': Fix of uninitialized mIsDrm variable.
| * | Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
| |\ \
| | * | Fix of uninitialized mIsDrm variable.Henrik B Andersson2012-11-271-1/+1
| | |/ | | | | | | | | | | | | | | | | | | The mIsDrm is a bool that isn't initialized. This causes it to be true in most default cases. Change-Id: I41b534514bf6a3ca88a9f0994b814d55fcd7453b
* | | am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the ↵Andreas Huber2012-11-261-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | component name" * commit '5bc5bf39120ae27ef46a8b13f85bf44ea19c7d5e': MediaCodec: Add a method for getting the component name
| * | MediaCodec: Add a method for getting the component nameMartin Storsjo2012-11-191-0/+4
| |/ | | | | | | | | | | | | | | | | If the codec was chosen based on mime type, the caller does not know what component actually was chosen. This allows getting essential information (such as supported color formats, for a video encoder) for this component. Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
* | Clean up channel count and channel maskGlenn Kasten2012-11-192-4/+2
| | | | | | | | | | | | | | | | Channel count is uint32_t. Remove redundant mask parameter to AudioTrack::createTrack_l() and AudioRecord::openRecord_l(). Change-Id: I5dc2b18eb609b2c0dc3091994cbaa4628062c17f
* | Don't use control block frame count after createGlenn Kasten2012-11-162-12/+21
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: I7f4cb05aef63053f8e2ab05b286d302260ef4758
* | Merge "Add GSM 6.10 decoder"Marco Nelissen2012-11-161-0/+1
|\ \
| * | Add GSM 6.10 decoderMarco Nelissen2012-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Supports Microsoft frame packing only, since that's what the sample file used. b/6620569 Change-Id: Ia89d95bcbf0f8dcbaad42148a7401728f60e079d
* | | Use size_t for frame countsGlenn Kasten2012-11-154-16/+16
| | | | | | | | | | | | | | | | | | Also fix typo: bufferCount should be frameCount. Change-Id: Ibed539504db75ef99dc21c8ff1bf2987122063a5
* | | Clean up frame size in AudioTrack and AudioFlingerGlenn Kasten2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TrackBase::mFrameSize, mChannelMask, and mChannelCount are now const. Use TrackBase::mFrameSize instead of re-calculating frame size. AudioFlinger only sees 16-bit PCM format, conversion from 8-bit is now entirely on the client side. Previously a small part of the responsibility was on server side also. size_t is unsigned, so use %u in logs. Fix theoretical bug where TrackBase constructor was over-allocating space for non-linear AudioTrack or 8-bit PCM AudioRecord (probably benign). Change-Id: I7cbbba0bf4dba29ea751d8af341ab8e5cbbdc206
* | | Use uint32_t for sample rateGlenn Kasten2012-11-144-6/+8
| | | | | | | | | | | | Change-Id: Ie240b48fb54b08359f69ecd4e5f8bda3d15cbe80
* | | Merge "Update audio comments"Glenn Kasten2012-11-142-2/+10
|\ \ \
| * | | Update audio commentsGlenn Kasten2012-11-142-2/+10
| |/ / | | | | | | | | | Change-Id: I85d7d2f6381b251db5695202fec75128883a8662
* | | Remove deprecated AudioSystem methodsGlenn Kasten2012-11-131-6/+0
|/ / | | | | | | Change-Id: I952d504e03af9a1d3e1e0aa379c82dfb00197d9f
* | Simplify AudioRecord::restoreTrack_l()Glenn Kasten2012-11-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Finish removing CBLK_RESTORING and CBLK_RESTORED from control block flags, and remove constant RESTORE_TIMEOUT_MS. Also minor cleanup: - Cache mCblk in local variable cblk and make cblk allocatable in a register. - Use "iMem" for sp<IMemory>. - Add missing error log to AudioRecord; it was already in AudioTrack. This is part of a series to clean up the control block. Change-Id: Ia5f5ab4763c392bc06a45851b167ddaee29e3455
* | Move frame size out of the control blockGlenn Kasten2012-11-123-7/+12
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ifab1c42ac0f8be704e571b292713cd2250d12a3f
* | Move buffers pointer out of the control blockGlenn Kasten2012-11-083-4/+7
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ie474557db7cb360f2d9a0f11600a68f5a3d46f07
* | Simplify AudioTrack::restoreTrack_l()Glenn Kasten2012-11-082-2/+3
| | | | | | | | | | | | | | | | | | Remove CBLK_RESTORING and CBLK_RESTORED from control block flags, for AudioTrack only. They are still used by AudioRecord. This is part of a series to clean up the control block. Change-Id: Iae4798f5b527c492bdaf789987ff3a1dadd0cb37
* | Merge "Add all-channel AudioTrack::setVolume() API"Glenn Kasten2012-11-081-1/+6
|\ \
| * | Add all-channel AudioTrack::setVolume() APIGlenn Kasten2012-11-051-1/+6
| | | | | | | | | | | | | | | | | | | | | Add combined channel APIs setVolume to AudioTrack, and remove obsolete getVolume. Change-Id: I0c87bfdbff4f4292259fa33e65f67badbafd270b
* | | Merge "Fix call to restoreTrack_l() without lock held"Glenn Kasten2012-11-081-0/+7
|\ \ \
| * | | Fix call to restoreTrack_l() without lock heldGlenn Kasten2012-11-071-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Also document lock order Change-Id: I2c1f273a0a51fa79ee3dd766de8d23083e270051