summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * The presence of the kKeyAACProfile is optional, we should not mandate its ↵James Dong2012-05-021-1/+5
| | | | | | | | | | | | | | | | presence in AACWriter. o related-to-bug: 6421833 Change-Id: Ia1d75e73270430177d3010e8024b48c88eb7b430
* | Fix build, WAVExtractor typoJean-Michel Trivi2012-05-021-1/+1
| | | | | | | | Change-Id: I6885f3f259619526165c6e76364bfe9a4ce49f97
* | Merge "Fix race in AudioTrack destruction" into jb-devGlenn Kasten2012-05-021-1/+1
|\ \
| * | Fix race in AudioTrack destructionGlenn Kasten2012-05-021-1/+1
| |/ | | | | | | | | Bug: 6427369 Change-Id: Id3b4487406235b881f6f0b4b95c5a02a9b797e75
* | Merge "Tolerate 0 valid bits value in WAV_EXT" into jb-devJean-Michel Trivi2012-05-021-3/+9
|\ \ | |/ |/|
| * Tolerate 0 valid bits value in WAV_EXTJean-Michel Trivi2012-05-021-3/+9
| | | | | | | | | | | | | | | | Some WAV_EXT writers don't properly set the "valid bits per sample" value and set it to 0. Don't return an error when such a header is parsed. Change-Id: I21763087af4f3fc8c62a24b883aae53b23ae71d4
* | No warning on using channel order in AudioPlayerJean-Michel Trivi2012-05-011-1/+3
| | | | | | | | | | | | | | | | Don't log a warning when an AudioPlayer derives a channel mask from the channel count, only info-log when channel count is higher than 2. Change-Id: Ia1cbced660903483654eede300ef72f7f17dcf78
* | Merge "Impl for supporting two video scaling modes" into jb-devJames Dong2012-05-013-15/+29
|\ \
| * | Impl for supporting two video scaling modesJames Dong2012-05-013-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | o allows the video scaling mode to change at any time o also remove the scaling mode logic in OMXCodec.cpp o related-to-bug: 5454345 Change-Id: I6f1714eb0c2774591ce650d56c1e779b8afd085f
* | | Disable fast track log spamGlenn Kasten2012-05-011-2/+2
| | | | | | | | | | | | | | | | | | except for "denied by client" and "denied by server" Change-Id: I133ab747933729cc1f386813ee06ece055bdb294
* | | Merge "Enable fast track for SoundPool" into jb-devGlenn Kasten2012-05-011-1/+1
|\ \ \
| * | | Enable fast track for SoundPoolGlenn Kasten2012-05-011-1/+1
| |/ / | | | | | | | | | Change-Id: Ia80b3a7738e4c5dbe2bd5b0f55f0ca49943e2f64
* | | Merge "Fix assertion triggered when mediaserver dies at roughly the same" ↵Andreas Huber2012-05-011-1/+5
|\ \ \ | | | | | | | | | | | | into jb-dev
| * | | Fix assertion triggered when mediaserver dies at roughly the sameAndreas Huber2012-05-011-1/+5
| |/ / | | | | | | | | | | | | | | | | | | time that a client attempts to explicitly free an OMX node. Change-Id: I767e6af402801357da20b328611cc7cddeed0260 related-to-bug: 6012750
* | | Properly handle the case where a pending connection process is disconnectedAndreas Huber2012-05-012-1/+13
|/ / | | | | | | | | | | | | just at the time when the connection is established. Change-Id: Icbae5a61edfd6a1336e4b8d3ee513337363c09ea related-to-bug: 6154825
* | Merge "Fix a bug on subtitle (SRT)." into jb-devJames Dong2012-04-302-7/+17
|\ \
| * | Fix a bug on subtitle (SRT).Insun Kang2012-05-012-7/+17
| | | | | | | | | | | | | | | | | | Bug: 6375542 Change-Id: Ic5dd5a1826b9f78ccbbddc4dec33b0e915b9329f
* | | Re-enable fast track for ToneGeneratorGlenn Kasten2012-04-301-1/+1
| | | | | | | | | | | | Change-Id: If4152169778df124c750dc45023322ee23c80587
* | | Removed software video encoders that are not OMX-based.James Dong2012-04-309-1295/+0
| | | | | | | | | | | | | | | | | | o related-to-bug: 5933287 Change-Id: I63635375e2bef00733b61adc3fa12c29df7e2155
* | | Merge "Make the transport stream extraction code output ADTS AAC frames." ↵Andreas Huber2012-04-301-34/+12
|\ \ \ | | | | | | | | | | | | into jb-dev
| * | | Make the transport stream extraction code output ADTS AAC frames.Andreas Huber2012-04-301-34/+12
| | |/ | |/| | | | | | | | | | Change-Id: I145f4b1265045750f1b0425269f3ffe5fb055f61 related-to-bug: 6419102
* | | Merge "Added support for HE-AAC recording" into jb-devDave Burke2012-04-304-30/+66
|\ \ \
| * | | Added support for HE-AAC recordingDave Burke2012-04-304-30/+66
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug in decoder related to sample rates / channel counts Made decoder follow Fraunhofer pattern Log if bitrate not available Bug: 6275957 Change-Id: I47a8e29358fa4a88ebc73fe02d46a2bfb96c64fe
* | | Merge "Notify the client about an initial size of (0, 0) instead of (320, ↵Andreas Huber2012-04-301-1/+1
|\ \ \ | | | | | | | | | | | | 240)." into jb-dev
| * | | Notify the client about an initial size of (0, 0) instead of (320, 240).Andreas Huber2012-04-301-1/+1
| |/ / | | | | | | | | | | | | | | | | | | which is documented as "we don't have that information just yet". Change-Id: I158a53af83d526f713cd30372fce28558894b857 related-to-bug: 6293020
* | | Fix mono gapless playback for decoders that output stereoMarco Nelissen2012-04-306-46/+44
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Opt in to the WVM extractor's secondary (cryptoPlugin) mode." into jb-devAndreas Huber2012-04-271-0/+14
|\ \
| * | Opt in to the WVM extractor's secondary (cryptoPlugin) mode.Andreas Huber2012-04-261-0/+14
| | | | | | | | | | | | | | | Change-Id: If0abec6e34b20b59ee2fc5bd97573a73d68465f0 related-to-bug: 6276111
* | | Merge "Expose an API to run the WV extractor in crypto plugin mode." into jb-devJeff Tinker2012-04-272-0/+13
|\ \ \
| * | | Expose an API to run the WV extractor in crypto plugin mode.Jeff Tinker2012-04-262-0/+13
| |/ / | | | | | | | | | | | | | | | | | | Provides compatibility with the MediaCodec model. Change-Id: I76f2c7d1e9d2cfc3e76b531ac9b2cf66aa6a4327 related-to-bug: 5986621
* | | Merge "Bug fix : enqueue one next subtitle for each subtitle." into jb-devJames Dong2012-04-261-3/+2
|\ \ \
| * | | Bug fix : enqueue one next subtitle for each subtitle.Insun Kang2012-04-261-3/+2
| | |/ | |/| | | | | | | | | | | | | | | | o Do not enqueue another subtitle when notifying a null message. related-to-bug: 6401574 Change-Id: I366e643ffa1601c11a12e46fcf7c00a469c77448
* | | Merge "Handle the case when there is no timed text track" into jb-devJames Dong2012-04-262-23/+29
|\ \ \
| * | | Handle the case when there is no timed text trackJames Dong2012-04-262-23/+29
| | |/ | |/| | | | | | | | | | | | | | | | | | | o also replaced mTimedTextLock with mLock, since there is no particular reason to use a separate lock for timed text o related-to-bug: 6110705 Change-Id: Ia687e96956692c42d492e57992e5721ca1e8e18b
* | | Account for new AAC decoder's delayMarco Nelissen2012-04-262-1/+19
|/ / | | | | | | | | | | | | | | This drops the first block of decoded samples, and flushes the decoder at the end of the stream to get the last bit of valid data. b/774846 Change-Id: I1ae61b3e0619444441d160f33903eb61f57c6d31
* | Merge "NuMediaExtractor API to unselect tracks and finer control over ↵Andreas Huber2012-04-261-4/+47
|\ \ | | | | | | | | | seeking." into jb-dev
| * | NuMediaExtractor API to unselect tracks and finer control over seeking.Andreas Huber2012-04-261-4/+47
| | | | | | | | | | | | | | | Change-Id: I44d5a2b01d34b771bb0ff48b12829e33314c2374 related-to-bug: 6276111
* | | Merge "Software MPEG4/H263 video encoder is now OMX-based" into jb-devJames Dong2012-04-264-0/+833
|\ \ \ | |/ / |/| |
| * | Software MPEG4/H263 video encoder is now OMX-basedJames Dong2012-04-254-0/+833
| |/ | | | | | | | | | | o related-to-bug: 6401068 Change-Id: If8eccea060f38e42ad31eb6e91aaa832e67c5559
* | Handle reconfiguration properly.Dave Burke2012-04-251-1/+1
| | | | | | | | | | | | Bug 6388957. Change-Id: I61a86ed6fdad99497535249acda5e4a325911918
* | Add Fraunhofer AAC encoder with AAC-ELD support.Dave Burke2012-04-259-43/+727
| | | | | | | | Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
* | Move frame count calculations for fast tracksGlenn Kasten2012-04-251-44/+84
|/ | | | | | | | | | | | | | | | | | | | | For fast tracks: move the default and minimum frame count calculations from client to server. If accepted, the default and minimum frame count is the fast mixer (HAL) frame count. If denied, the default and minimum frame count is the same as it currently is for normal tracks. For normal tracks: there is no change yet, preserve legacy behavior for now but add a FIXME to change this later. Bug fix: the test for buffer alignment matches channelCount was wrong. Bug fix: check for 8-bit data in shared memory, which isn't supported. Optimizations: - in set(), only call AudioSystem::getOutputSamplingRate() when needed - in createTrack_l(), only call AudioSystem::getSamplingRate() and AudioSystem::getFrameCount() when needed Change-Id: I79d2fe507db1a8f7bb094c71da8a129951dbb82f
* Bump up the max number of items in an AMessage, remove overly stringentAndreas Huber2012-04-252-6/+2
| | | | | | | CHECK() limiting us to just audio/* or video/* tracks. related-to-bug: 6399405 Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
* Merge "Software AVC encoder is now OMX-based"James Dong2012-04-244-0/+1037
|\
| * Software AVC encoder is now OMX-basedJames Dong2012-04-244-0/+1037
| | | | | | | | | | | | o related-to-bug: 6383440 Change-Id: I0b1ae50a704b0979857ea447585eabe86602149a
* | Make sure OMXCodec and ACodec both accept more than 2 channels of audioAndreas Huber2012-04-242-15/+67
| | | | | | | | | | | | and fill in the OMX channel mask properly. Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
* | Use C APIs instead of C++ APIs for policyGlenn Kasten2012-04-232-11/+11
|/ | | | | | | | | The C++ APIs are going away. Note: we use tid == 0 which is not supported yet by the C APIs, do not submit this until that is added. Change-Id: I0e90789e6c81c69f2544e899c52421ea5d1342be
* Merge "Downmix support for 5.1 and quad with side channels"Jean-Michel Trivi2012-04-231-5/+28
|\
| * Downmix support for 5.1 and quad with side channelsJean-Michel Trivi2012-04-231-5/+28
| | | | | | | | | | | | | | | | | | In DOWNMIX_TYPE_FOLD mode, add support for variants of quad and 5.1 channel masks where the "side" channels are used instead of the "back" channels. These variants have the same channel order, so they can share the same downmix function. Change-Id: I5f9cb7cb120927189de680c2a968d6136dc1fc43
* | Merge "Fix regression in AudioTrack::pause()"Glenn Kasten2012-04-231-1/+4
|\ \ | |/ |/|