summaryrefslogtreecommitdiffstats
path: root/include/media/stagefright
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Fixed a native crash due to unexpected state at destroy time when ↵James Dong2012-08-271-0/+2
|\ | | | | | | encoder component's source fails to start" into jb-mr1-dev
| * Fixed a native crash due to unexpected state at destroy time when encoder ↵James Dong2012-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | component's source fails to start o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to bring the state of the encoder component back to the expected state. o related-to-bug: 7045494 Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
* | SurfaceMediaSource: a few fixes / cleanupsJamie Gennis2012-08-261-6/+3
| | | | | | | | | | | | | | | | - Remove the setting of mStopped to true in onBuffersReleased - Cleaned up a few function call logs - Removed the 'reset' method. Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f
* | Allow directly setting a DataSource for NuMediaExtractorMarco Nelissen2012-08-241-0/+2
|/ | | | | | | | This adds NuMediaExtractor::setDataSource(const sp<DataSource> &source), which some new code under frameworks/av will use to let applications provide a custom data source for extractors. Change-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2
* am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT ↵Jean-Baptiste Queru2012-08-101-0/+3
|\ | | | | | | | | | | | | and PMT" * commit '3ca352c4cd01f6df3b691f835efc68a5771e724e': MPEG2TSWriter: Write a proper CRC in PAT and PMT
| * Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-101-0/+3
| |\
| | * MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello2012-07-101-0/+3
| | | | | | | | | | | | Change-Id: I6ec8039b176878da6f02691194d96b0a1e894055
* | | am 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity ↵Jean-Baptiste Queru2012-08-101-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | counters for PAT and PMT" * commit '31a593b901eeb924ae5214962c628397dd0197f2': MPEG2TSWriter: Write proper continuity counters for PAT and PMT
| * | Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru2012-08-101-0/+2
| |\ \ | | |/
| | * MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello2012-07-101-0/+2
| | | | | | | | | | | | Change-Id: If94e31e51c563867db6d2376ad771f9751416084
* | | am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 ↵Jean-Baptiste Queru2012-08-081-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | files" * commit '51af4af2414cdaaf0185b971a41fc0b4f8c0b7e4': Store correct time stamps in recorded mp4 files
| * | Store correct time stamps in recorded mp4 filesJohannes Carlsson2012-07-301-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Make sure codec names and corresponding quirks are returned together.Andreas Huber2012-08-071-2/+6
| | | | | | | | | | | | | | | | | | 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
* | Remove obsolete hack for TI specific codeJames Dong2012-08-061-5/+2
| | | | | | | | | | | | o related-to-bug: 6566886 Change-Id: I39aad214cbf7b748a95a9d22db50cd8f421931e6
* | Merge "experimental support for fragmented mp4 playback in nuplayer" into ↵Marco Nelissen2012-08-031-1/+5
|\ \ | | | | | | | | | jb-mr1-dev
| * | experimental support for fragmented mp4 playback in nuplayerAndreas Huber2012-08-031-1/+5
| | | | | | | | | | | | | | | | | | cherry picked from change 170999 Change-Id: I407775f0290154ad4961134839a15c9f296424c0
* | | Dynamically configure the number of video buffers used by camera source, if ↵James Dong2012-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | supported o related-to-bug: 6920805 Change-Id: I413bb50954cc84e32ed40bcb713842dc7b58e2b6
* | | Allocate buffers before calling start on its source in OMXCodec::start() for ↵James Dong2012-08-021-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | 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
* | Unifying TimedTextDriver's resume() and start().Insun Kang2012-08-021-1/+1
| | | | | | | | | | | | (cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425) Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
* | Adds resume() functionInsun Kang2012-08-021-0/+1
|/ | | | | | | | o Revived resume() function to fix pause/resume bug. (Bug: 6663740) o Mannually cherry-picked from GTV change. (commit: ad1197226d1c6745959f0e469f510ca06f99489f) Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
* SurfaceMediaSource: keep refs to current buffersJamie Gennis2012-06-221-12/+6
| | | | | | | | | This change fixes a bug in SurfaceMediaSource where it would not keep a reference to all of the Gralloc buffers that the video encoder is currently using. Bug: 6655597 Change-Id: Ifd99976cc7ae57ed724bbf2bbcff357a39497391
* Tell surface flinger that we want to protect output buffers from beingAndreas Huber2012-05-221-0/+2
| | | | | | | | sent to HDMI (without HDCP) and push a few black frames on IDLE->LOADED similar to OMXCodec's behaviour. Change-Id: Iea6055a115151ca881220a70a31af6ade2c58cb3 related-to-bug: 6537187
* Merge "Stop extrapolating audio time from the anchor if we're paused or ↵Andreas Huber2012-05-171-0/+1
|\ | | | | | | reached eos." into jb-dev
| * Stop extrapolating audio time from the anchor if we're paused or reached eos.Andreas Huber2012-05-151-0/+1
| | | | | | | | | | Change-Id: I55903ba625d9c075a9a6e7bcd5ff95d450b915b2 related-to-bug: 6479613
* | Speed up stsz box write in MPEG4WriterJames Dong2012-05-151-1/+1
|/ | | | | | | | With this patch, the write time for 30+ minutes recording session is reduced from 10+ seconds down to around 2-3 seconds. related-to-bug: 6435176 Change-Id: I83b705cea42d8de798e7032c770c5c7b033e267e
* Smoothen audio "real" time by compensating with system_time()Andreas Huber2012-05-141-0/+1
| | | | | | | for the delay since the last buffer submission to the audio sink. Change-Id: Ib1a8672f96ba8bbef07d23372f1076fbb1f0bdcc related-to-bug: 6479613
* Merge "Remove unused VideoSourceDownSampler class" into jb-devJames Dong2012-05-111-97/+0
|\
| * Remove unused VideoSourceDownSampler classJames Dong2012-05-111-97/+0
| | | | | | | | | | Change-Id: I2faf5962ff4cc366c688ef5bb27f53596f08fe0a related-to-bug: 6484217
* | Increase AAC software decoder's buffer count. Refactor how clientsAndreas Huber2012-05-111-0/+17
|/ | | | | | | of ACodec get notified about codec buffers and buffer ids. Change-Id: I962f873262dae7aa7b43f5f68a6d60268282f91e related-to-bug: 6478823
* Merge "Properly connect/disconnect to/from the native window in MediaCodec." ↵Andreas Huber2012-05-101-0/+3
|\ | | | | | | into jb-dev
| * Properly connect/disconnect to/from the native window in MediaCodec.Andreas Huber2012-05-101-0/+3
| | | | | | | | | | Change-Id: Ib5bf90a3b81fca8ff2346235bc28a2bd0bc7bfb1 related-to-bug: 6472161
* | OMX IL wrapper for FLAC encoderJean-Michel Trivi2012-05-091-0/+3
|/ | | | | | | | | | Add wrapper around libFLAC for FLAC encoding in OpenMAX IL. Declare FLAC encoder in OMX component roles. Bug 5525503 Change-Id: I19bbce41c216870669d09365693f4ea89f8bc0f7
* Submit codec specific data automaticallyAndreas Huber2012-05-081-0/+5
| | | | | | | if it is contained in the format passed to MediaCodec::configure. Change-Id: I8ef6755e8389ec47b44a9c70904ea6c03a00f4f2 related-to-bug: 6364139
* Respect channel mask in ACodec and NuPlayer.Andreas Huber2012-05-032-2/+13
| | | | | | | Refactor conversion from MetaData into AMessage while we're at it. Change-Id: I5479129836ea4316e8de28cf1b472bf19e3ac4ab related-to-bug: 6439076
* Fix mono gapless playback for decoders that output stereoMarco Nelissen2012-04-303-3/+9
| | | | | | | | | | | | | The old AAC decoder always outputs stereo, even for mono source material, so we need to use the number of channels of the output when calculating the number of bytes to skip, not the number of channels in the source. This makes OMXCodec skip the right amount of data, and prevents NuPlayer from writing half a frame and then asserting when the AudioSink doesn't accept it. Also move use of the SkipCutBuffer from NuPlayer to ACodec, so that it also works when using the new Java APIs, and make SkipCutBuffer derive from RefBase. b/774846 Change-Id: I34df9fea3e6730617eae559afaa556f4085ef0a0
* NuMediaExtractor API to unselect tracks and finer control over seeking.Andreas Huber2012-04-261-2/+11
| | | | | Change-Id: I44d5a2b01d34b771bb0ff48b12829e33314c2374 related-to-bug: 6276111
* Add Fraunhofer AAC encoder with AAC-ELD support.Dave Burke2012-04-254-2/+4
| | | | Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
* Bump up the max number of items in an AMessage, remove overly stringentAndreas Huber2012-04-251-1/+1
| | | | | | | CHECK() limiting us to just audio/* or video/* tracks. related-to-bug: 6399405 Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
* Make sure OMXCodec and ACodec both accept more than 2 channels of audioAndreas Huber2012-04-241-0/+4
| | | | | | and fill in the OMX channel mask properly. Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
* Make sure NuMediaExtractor is thread safe.Andreas Huber2012-04-231-0/+3
| | | | Change-Id: If261c4d87d5569a0d7cfd75afe311803a6ce0109
* Merge "Add support for deep audio buffers"Eric Laurent2012-04-201-0/+3
|\
| * Add support for deep audio buffersEric Laurent2012-04-201-0/+3
| | | | | | | | | | | | | | | | | | | | Allow AudioSink to use deep audio buffering when the source is audio only and its duration is more than a certain threshold. This helps improve battery life but implies higher audio latency. Change-Id: Ie79915b61c370292f05aabda9779356570e03cbb
* | Add the ability to query the amount of cached data to NuMediaExtractor.Andreas Huber2012-04-191-0/+11
|/ | | | | Change-Id: I0966270a2bd36698330beaa03f47d02fc6a40c44 related-to-bug: 6364341
* Merge "Allow propagation of error information and description from the ↵Andreas Huber2012-04-192-4/+11
|\ | | | | | | CryptoPlugin to"
| * Allow propagation of error information and description from the CryptoPlugin toAndreas Huber2012-04-192-4/+11
| | | | | | | | | | | | | | the higher layers. Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330 related-to-bug: 6365261
* | Merge "Make timed text source type explicit in TimedTextDriver"James Dong2012-04-191-1/+6
|\ \ | |/ |/|
| * Make timed text source type explicit in TimedTextDriverJames Dong2012-04-181-1/+6
| | | | | | | | | | | | o related-to-bug: 5542712 Change-Id: Ifdc730e616336e8b16783e8a5766f27df62a0592
* | Some refactoring and cleanup of now obsolete crypto fields.Andreas Huber2012-04-182-6/+3
|/ | | | | | codec commandline tool no longer supports decryption. Change-Id: I7b10be6524631b20ac5d361d47949b00addf4a93
* Merge "Fix for multiple audio/timed track feature implementation - part one"James Dong2012-04-171-10/+20
|\
| * Fix for multiple audio/timed track feature implementation - part oneJames Dong2012-04-161-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o getTrackInfo now returns all tracks, rather than just the timed text tracks. o the index of the track info is kept to the same as the track index if the track is not from an external source o correctly maps the selectTrack() and unselectTrack() calls to the right track index o TODO: 1) note that the selectTrack() and unselectTrack() only works for timed text track at present; 2) the lock is timed text specific o related-to-bug: 6110705 Change-Id: Ib1feeef2184bc992930ace0d1197b6c00a2636d7
generated by cgit v1.1 at 2024-09-12 11:14:14 +0000