summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Limit maximum equalizer gain." into jb-mr1-devEric Laurent2012-09-112-40/+68
|\
| * Limit maximum equalizer gain.Eric Laurent2012-09-102-40/+68
| | | | | | | | | | | | | | | | Limit maximum gain in all EQ bands according to current volume so that total gain (current volume + band gain) does not exceed a certain limit. The gain difference between bands is preserved. Change-Id: Ice5a9705a0b3353e8778b4c539a29ca9cdf60390
* | Merge "audio effects: no audio preprocessing by default" into jb-mr1-devEric Laurent2012-09-101-15/+24
|\ \
| * | audio effects: no audio preprocessing by defaultEric Laurent2012-09-101-15/+24
| |/ | | | | | | | | | | | | | | | | | | | | The audio preprocessings are not included in the default audio_effect.conf file anymore as the audio HAL has to provide support for them. Each product implementing one or more audio pre processing must provide a specific audio_effects.conf file. Change-Id: I3b2f636f7a8748829798d4b9057d269db9424d62
* | Merge "Enable audio streaming to a wifi display. Remove startup delay hack." ↵Andreas Huber2012-09-102-11/+4
|\ \ | | | | | | | | | into jb-mr1-dev
| * | Enable audio streaming to a wifi display. Remove startup delay hack.Andreas Huber2012-09-102-11/+4
| |/ | | | | | | Change-Id: I2e163db1595bb504de3a2e99cace191aa90708ca
* | am f755a506: am d81be6d6: Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
|\ \ | |/ |/| | | | | * commit 'f755a506335df3bfb32c062096deceaf045044ed': aacenc: Mark some global arrays const
| * am d81be6d6: Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
| |\ | | | | | | | | | | | | * commit 'd81be6d670f0d89aa6048a82fbbff82c584e9922': aacenc: Mark some global arrays const
| | * Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
| | |\
| | | * aacenc: Mark some global arrays constMartin Storsjo2012-09-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This gets rid of initialized writeable data in the library. Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
* | | | am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get ↵Elliott Hughes2012-09-094-4/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | expat header files from the approved location." * commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3': Fix libmedia and libstagefright to get expat header files from the approved location.
| * | | am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header ↵Elliott Hughes2012-09-094-4/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | files from the approved location." * commit '5abc91d61718e334e05c6d4858bd868bd5a5769c': Fix libmedia and libstagefright to get expat header files from the approved location.
| | * | Fix libmedia and libstagefright to get expat header files from the approved ↵Elliott Hughes2012-09-094-4/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | location. Found during a libexpat upgrade. Change-Id: I9e5abd502a884975d898486edde374fb2519164e
| * | am 8b152566: Merge "OMXCodec: enhance error handling of OMX IL client"Jean-Baptiste Queru2012-08-311-2/+6
| |\ \ | | |/ | | | | | | | | | * commit '8b1525663322685ff34d9c09176feebd102e1c3d': OMXCodec: enhance error handling of OMX IL client
| | * OMXCodec: enhance error handling of OMX IL clientWeian Chen2012-08-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original design doesn't handle event EMPTY_BUFFER_DONE and FILL_BUFFER_DONE which leads to buffer status mess issue, and in turn leads to mediaserver crash. Here we will handle those 2 events anyway to fix this. Change-Id: Ia90b46ea7ec6026d6fda5d33fef6773435788b04 Author: Tianmi Chen<tianmi.chen@intel.com> Signed-off-by: Tianmi Chen<tianmi.chen@intel.com> Signed-off-by: Weian Chen <weian.chen@intel.com> Signed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ: 49066, 27054
* | | Fix buffer size issue for multichannel HE-AACJean-Michel Trivi2012-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | Decoding of HE-AAC fails due to output buffer size being too small. Size output buffer size according to maximum number of channels. Change-Id: I6b10842cf7ba3da1f4b4075b1f7f5404bf76be41
* | | Revert max buffers change.Jeff Brown2012-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | Attempting to use 31 buffers crashes on Prime. Bug: 7131413 Change-Id: Ib85aef9b1da01f7243bd781a0efa47de2970412d
* | | Add a permission for controlling wifi display.Jeff Brown2012-09-071-0/+9
| | | | | | | | | | | | Change-Id: I321b6c1a0223e0c3d5df04fde7a13ab91c08c7bc
* | | Merge "Fix headroom management in equalizer" into jb-mr1-devEric Laurent2012-09-071-3/+8
|\ \ \
| * | | Fix headroom management in equalizerEric Laurent2012-09-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug resetting the headroom parameters when calling the bundle process function for the first time. Change-Id: Ie05f97606f415954340ff2a4e48cd7b0a97a063b
* | | | Merge "Less verbose logging, lots of references." into jb-mr1-devAndreas Huber2012-09-073-3/+5
|\ \ \ \
| * | | | Less verbose logging, lots of references.Andreas Huber2012-09-073-3/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Idcb76848883b113e956d7e6266da882771a053b8
* | | | | Merge "Make wfd code work with both old and new dongles." into jb-mr1-devAndreas Huber2012-09-072-24/+26
|\ \ \ \ \ | |/ / / /
| * | | | Make wfd code work with both old and new dongles.Andreas Huber2012-09-072-24/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc750dc334c47a171791587dd7e7281d565ff566
* | | | | Merge "audioflinger: changes for new audio devices enums" into jb-mr1-devEric Laurent2012-09-071-0/+4
|\ \ \ \ \
| * | | | | audioflinger: changes for new audio devices enumsEric Laurent2012-09-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ThreadBase class now has a separate member for input and output devices (mInDevice, mOutDevice). Only query get_supported_devices() from audio HAL if the function is exposed and if the audio policy manager did not specify the audio module to open. Also fixed bug in AEC preprocessing that would reset to default output device when an input device was given. Change-Id: I19d4d06aeb920b068e3ef31e6e6be6345ce5d67a
* | | | | | Fix iTunSMPB parsing for AAC tracks encoded with NeroJohn Grossman2012-09-071-8/+19
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to clear out the mean/name/data state when parsing apple-style metadata from tracks every time we have a full set, not just when we find an iTunSMPB set. AAC tracks encoded from WAV by Nero tend to put in an additional apple style metadata tag (cdec) before the iTunSMPB tag. The sequence in the file goes something like mean : "com.apple.iTunes" name : "cdec" data : "ndaudio 1.5.4.0 / -2pass -br 320000" mean : "com.apple.iTunes" name : "iTunSMPB" data : " 00000000 00000A40 000000B8 <etc...>" If the internal state was not cleared after the first set, then when the second instance of "name" is encountered, an attempt is made to parse the previous data entry as an iTunSMPB tag when it is actually a cdec tag. Afterwards, mean, name and data are all cleared, and when the second data is encountered there is no current mean or name present, so the gapless metadata gets skipped. By clearing the metadata state every time we have a full set of mean/name/data, we make sure that we are always interpreting the data field as the proper type. Change-Id: I196e2e3f83e434f15d5ee55ae40a74a92d5a1845
* | | | | Merge "AudioRecord: Fix minimum frame count calculation." into jb-mr1-devEric Laurent2012-09-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | AudioRecord: Fix minimum frame count calculation.Eric Laurent2012-09-061-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord::set() was calling getMinFrameCount() with a channel count instead of a channel mask. Change-Id: Iabace7686426430fd53deac0c71b0c36aa64171c
* | | | Add a small hook to support gapless in AAH.John Grossman2012-09-061-5/+12
| | | | | | | | | | | | | | | | Change-Id: Ie07eca6b45142bdd83412ee0e38d732a4c355630
* | | | Merge "Fix calculations for an obscure combo of MPEG audio options." into ↵John Grossman2012-09-062-3/+11
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | Fix calculations for an obscure combo of MPEG audio options.John Grossman2012-09-062-3/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEGv2 and MPEGv2.5 Layer 2 audio payloads should 1152 samples per access unit, not 576. Adjust the frame size and samples out calculations accordingly. Also, adjust the max frame size in the MP3Extractor's MediaSource to be closer to the theoretical worst case max frame size. The theoretical worst case for MPEG audio is 2881 bytes per frame, but the max frame size being used was 32kB. It has been changed to be 4kB in order to remain a power of 2 allocation, but to be the power of 2 closest to the worst case. Change-Id: If11f5a843b06e70151bbe8298cc54f954938d9d7
* | | | Merge "Update remote display API." into jb-mr1-devJeff Brown2012-09-064-9/+9
|\ \ \ \
| * | | | Update remote display API.Jeff Brown2012-09-054-9/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed disconnect() to dispose() to emphasize the fact that this method is intended to clean up the IRemoteDisplay completely, not just temporarily disconnect the current client (which might be useful someday). Other minor tweaks. Change-Id: I1209639eb0cd8af09c724206642d7e52aab48257
* | | | Merge "To make mimetype for WAV file consistent over SF." into jb-mr1-devMarco Nelissen2012-09-052-3/+2
|\ \ \ \
| * | | | To make mimetype for WAV file consistent over SF.Dongwon Kang2012-09-052-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (audio/x-wav is chosen because it was also used in MediaFile.java.) Tested: checked wav files plays well on Music app. Change-Id: Ifc07bcbed681e509176b1c144626f6f1009e69be
* | | | | Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-devMarco Nelissen2012-09-051-0/+1
|\ \ \ \ \
| * | | | | To support .mxmf which is specified in Android CDD.Dongwon Kang2012-09-051-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7082658 Change-Id: I21269d72d1d21627c6adb2e6fbcb078d0eda6020 Tested: checked MediaScanner scans .mxmf and Music app plays .mxmf file.
* | | | | Merge "Fragmented mp4 extractor" into jb-mr1-devMarco Nelissen2012-09-0512-47/+1106
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fragmented mp4 extractorMarco Nelissen2012-09-0512-47/+1106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still experimental. Set property "media.stagefright.use-fragmp4" to true to enable. Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
* | | | | Expose an IRemoteDisplay to trigger wifi display connections setup and feedback.Andreas Huber2012-09-057-43/+83
| | | | | | | | | | | | | | | | | | | | Change-Id: I7602cda0e38073c9f0e63fa4de238ca0d4b4ce8e
* | | | | Implement remote display service stubs.Jeff Brown2012-09-056-1/+205
|/ / / / | | | | | | | | | | | | Change-Id: I582ed000026bba6d116db8304e15a3c52f8a9a01
* | | | Merge "Configure the SurfaceMediaSource to emit the same number of buffers" ↵Andreas Huber2012-09-054-21/+25
|\ \ \ \ | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | Configure the SurfaceMediaSource to emit the same number of buffersAndreas Huber2012-09-044-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the video encoder allocates for its input. Do this before connecting the bufferqueue through surface flinger. Change-Id: Ibc81db1359afe2d88fdb75b23fadae65c8a6f7cc
* | | | | Add setVideoScalingMode support to NuPlayerJames Dong2012-09-043-2/+46
|/ / / / | | | | | | | | | | | | | | | | | | | | o related-to-bug: 7089195 Change-Id: Ic30d9312673f2d5837c779e023ac64468ecd4951
* | | | Support for acting as a wifi display sink.Andreas Huber2012-09-0411-12/+2344
| | | | | | | | | | | | | | | | Change-Id: I0beac87025b93c60164daa865c89f16b72197a47
* | | | Merge "Improvements to our MPEG2 Transport Stream parser" into jb-mr1-devAndreas Huber2012-09-043-23/+189
|\ \ \ \ | |/ / / |/| | |
| * | | Improvements to our MPEG2 Transport Stream parserAndreas Huber2012-08-313-23/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verifies the continuity counter Parses and associates PCR time with streams Allows for a absolute time anchor to be signalled via discontinuity. Change-Id: I4bc88c78382c9cc6380f28df584cc6c254e0a8f9
* | | | Merge "Move fragmented mp4 parser to libstagefright" into jb-mr1-devMarco Nelissen2012-08-318-106/+104
|\ \ \ \
| * | | | Move fragmented mp4 parser to libstagefrightMarco Nelissen2012-08-318-106/+104
| | | | | | | | | | | | | | | | | | | | | | | | | and rename it from Parser to FragmentedMP4Parser Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
generated by cgit v1.1 at 2024-05-18 21:19:56 +0000