summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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-049-12/+1553
| | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Added an additional virtual method IStreamSource::flags()." into ↵Andreas Huber2012-08-311-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | Added an additional virtual method IStreamSource::flags().Andreas Huber2012-08-311-0/+16
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I89e62d84328e12f08c8f73cbfd53cfb42569de97
* | | | | | Merge "Special mode for ESQueue that allows for earlier dequeuing of access ↵Andreas Huber2012-08-312-4/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | units" into jb-mr1-dev
| * | | | | | Special mode for ESQueue that allows for earlier dequeuing of access unitsAndreas Huber2012-08-312-4/+36
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if it's know beforehand that each PES packet contains exactly one access unit. Currently this optimization is only supported for H.264 video. Change-Id: I0888027cc7e9850307484b11dba1191cf6bfac83
* | | | | | Merge "Add support for mpeg2 transport streams to the RTSP implementation." ↵Andreas Huber2012-08-317-5/+254
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | into jb-mr1-dev
| * | | | | Add support for mpeg2 transport streams to the RTSP implementation.Andreas Huber2012-08-317-5/+254
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I409d7133a53a71e62523b1acc2b03302fcf824a5
* | | | | Merge "Documentation on pipes" into jb-mr1-devGlenn Kasten2012-08-311-0/+40
|\ \ \ \ \
| * | | | | Documentation on pipesGlenn Kasten2012-08-301-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3de496c7db026c50dcb6bc577741bb65d08e7c9d
* | | | | | Merge "Update audio comments" into jb-mr1-devGlenn Kasten2012-08-311-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update audio commentsGlenn Kasten2012-08-301-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ie7504d0ddb252f7e4d4f99ed0b44cfc7b1049816
* | | | | Merge "Implement the source->sink(!) keep alive the wfd specs mandate..." ↵Andreas Huber2012-08-312-12/+95
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | Implement the source->sink(!) keep alive the wfd specs mandate...Andreas Huber2012-08-302-12/+95
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I388d9911ebd243aa9c13a13ec3683e76898470a6
* | | | | | Merge "Don't hard code the number of buffers for SurfaceMediaSource" into ↵Jamie Gennis2012-08-301-3/+25
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | jb-mr1-dev
| * | | | | Don't hard code the number of buffers for SurfaceMediaSourceJames Dong2012-08-301-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ce17b3dc82a5d3e4a66569c76ad9745ceedacd6
* | | | | | Merge "Only run the wifi display RTSP server on demand, and only on the wifi ↵Andreas Huber2012-08-3011-31/+97
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | direct" into jb-mr1-dev
| * | | | | Only run the wifi display RTSP server on demand, and only on the wifi directAndreas Huber2012-08-3011-31/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface. Change-Id: I7d3c44cb79cd40e73499f2d7ccf35c69b628e6d7
* | | | | | Merge "Move libnbaio out of AudioFlinger" into jb-mr1-devGlenn Kasten2012-08-3013-0/+1351
|\ \ \ \ \ \
| * | | | | | Move libnbaio out of AudioFlingerGlenn Kasten2012-08-3013-0/+1351
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libnbaio is now a separate shared library from AudioFlinger, rather than a static library used only by AudioFlinger. AudioBufferProvider interface is now also independent of AudioFlinger, moved to include/media/ Change-Id: I9bb62ffbc38d42a38b0af76e66da5e9ab1e0e21b
* | | | | | audio effects: fix bug in sample rate control.Eric Laurent2012-08-301-0/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug in LVM bundle wrapper preventing audio framework sample rate from being sent to the effect bundle instance. Change-Id: I912027f866d3beac91b977bba869ff96a92d2a62
* | | | | Prepare for transmitting audio through AudioSource.Andreas Huber2012-08-302-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioSource can now be configured to output buffers timestamped based on looper time (absolute) instead of based on systemTime() relative to start time. Change-Id: I8eca42648eb50033ac4aafbe5daac64a98a40690
* | | | | Transmit frames at a higher frame rate for smoother updates, increaseAndreas Huber2012-08-302-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video bandwidth to 5 Mbit/sec. Change-Id: Ieb9051b0f29d5a20004d1b3befdb745bc67769c7
* | | | | Optionally log the transport stream transmitted to the sink.Andreas Huber2012-08-302-1/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: I5d392e7997d6beb09ba6eca70d6899747098d2b3
* | | | | Merge "Fix wifi display shutdown deadlock." into jb-mr1-devAndreas Huber2012-08-291-2/+2
|\ \ \ \ \
| * | | | | Fix wifi display shutdown deadlock.Andreas Huber2012-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I77eed39f39c0de6b427c425248ff7d21c051c074
* | | | | | Merge "Initial checkin of support for acting as a wifi display source" into ↵Andreas Huber2012-08-2923-38/+4457
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | jb-mr1-dev