summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* Deleted the media, camera, drm related files since they are relocatedJames Dong2012-03-2886-11013/+0
| | | | Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
* Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-268-3/+100
|\
| * Provisional support for secure decryption of media streams.Andreas Huber2012-03-268-3/+100
| | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-261-3/+2
|\ \ | |/ |/|
| * reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-261-3/+2
| | | | | | | | | | | | | | | | | | | | Reorganize SoundPool and JetPlayer code to be ready for the creation of libmedia_native. Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation). Remove dependencies on nativehelper/jni.h from JetPlayer. Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
* | Add TRACK_FAST for IAudioFlinger::createTrackGlenn Kasten2012-03-261-2/+3
| | | | | | | | | | | | Currently not implemented by client or server Change-Id: Ib11dda57db3eeb871bcc7b546e340078776875f5
* | Merge "IAudioFlinger::createTrack and openRecord flags"Glenn Kasten2012-03-262-4/+9
|\ \
| * | IAudioFlinger::createTrack and openRecord flagsGlenn Kasten2012-03-192-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | createTrack and openRecord don't need the "old" flags parameter, which was either audio_policy_output_t or audio_in_acoustics_t shifted left by 16 bits. But they do need "new" flags, which are defined by the application use case. Initially, the only application use case flag is timed output, but others are planned. For output, the audio_policy_output_t flags are passed to AudioSystem::getOutput, which returns an audio_io_handle_t, and that handle is then passed to createTrack. So createTrack doesn't need the old flags parameter. For input, the audio_in_acoustics_t flags are passed to AudioSystem::getInput, which returns an audio_io_handle_t, and that handle is then passed to openRecord. So openRecord doesn't need the old flags parameter. Change-Id: I18a9870911846cca69d420c19fe6a9face2fe8c4
* | | remove jni.h include from IOMX.hColin Cross2012-03-241-2/+0
| | | | | | | | | | | | | | | | | | | | | jni.h is not used in IOMX.h and is not available in pdk builds, remove it. Change-Id: I9bc8fd70f617942712d9f684c6fc927bf18be753
* | | Fixed missing return value from a method should have returned status_tJames Dong2012-03-241-1/+1
| |/ |/| | | | | Change-Id: I83ad2735eaf8a8dfa5f8f29f30aec1311b3222de
* | Merge "Remove enforceFrameCount"Glenn Kasten2012-03-221-2/+1
|\ \
| * | Remove enforceFrameCountGlenn Kasten2012-03-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used to decide whether to issue a warning. The warning was issued the first time track was created but not at re-creation. Now it is a verbose message every time, not a warning since it happens all the time with key clicks on A2DP. Change-Id: I9d39f53c0a7eb84b666e55b1b76ff830cf8f37ba
* | | Support gapless playback for mp3 and m4aMarco Nelissen2012-03-222-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | Gapless playback for appropriately tagged mp3 and m4a files. Currently this is implemented in OMXCodec, which most players use, but should be easy to support in other players as well by using the SkipCutBuffer utility class. Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
* | | Merge "Add MetaData::dumpToLog"Marco Nelissen2012-03-211-0/+4
|\ \ \ | |/ / |/| |
| * | Add MetaData::dumpToLogMarco Nelissen2012-03-211-0/+4
| | | | | | | | | | | | | | | | | | Utility method for dumping the content of a MetaData object to the log. Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
* | | Merge "Whitespace"Glenn Kasten2012-03-211-2/+3
|\ \ \ | |/ / |/| |
| * | WhitespaceGlenn Kasten2012-03-191-2/+3
| |/ | | | | | | | | | | Fix indentation, and add blank lines in key places for clarity Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
* | Merge "Parse mp3 encoder padding/delay"Marco Nelissen2012-03-201-0/+2
|\ \ | |/ |/|
| * Parse mp3 encoder padding/delayMarco Nelissen2012-03-201-0/+2
| | | | | | | | | | | | Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag. Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
* | Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-153-13/+31
|/ | | | | | | | | | | | | | | | | | tracks. o Newly introduced APIs are (MediaPlayer): getTrackInfo() / addExternalSource() / enableTrack() / disableTrack(). o Timed text tracks are supported only, for now. o TODOs: - Define the audio/video behavior for enableTrack and disableTrack. - Refactoring AwesomePlayer / TimedTextDriver so that all types of track index can be managed in the correct order and be ready for supporting audio/video tracks. (MediaExtractor and MediaSource for text file might be necessary.) Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
* Merge "Use correct syntax for #include <> """Glenn Kasten2012-03-141-1/+1
|\
| * Use correct syntax for #include <> ""Glenn Kasten2012-03-131-1/+1
| | | | | | | | Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
* | Merge "Gapless playback, step 1."Marco Nelissen2012-03-133-0/+6
|\ \
| * | Gapless playback, step 1.Marco Nelissen2012-03-133-0/+6
| | | | | | | | | | | | | | | | | | | | | Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly by reusing the initial AudioTrack for subsequent players. Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
* | | Merge "Switched to use the header files in /frameworks/native and deleted ↵James Dong2012-03-1313-7216/+0
|\ \ \ | | | | | | | | | | | | the duplicate header files in /frameworks/base"
| * | | Switched to use the header files in /frameworks/nativeJames Dong2012-03-1213-7216/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* | | | Whitespace and indentationGlenn Kasten2012-03-139-19/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation to be multiple of 4. Make it easier to search: sp< not sp < to "switch (...)" instead of "switch(...)" (also "if" and "while") Remove redundant blank line at start or EOF. Remove whitespace at end of line. Remove extra blank lines where they don't add value. Use git diff -b or -w to verify. Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
* | | Merge "Remove virtual from methods that don't need it"Glenn Kasten2012-03-121-0/+2
|\ \ \ | |_|/ |/| |
| * | Remove virtual from methods that don't need itGlenn Kasten2012-03-091-0/+2
| |/ | | | | | | Change-Id: I30e17e61aae25b036436c0e270313c80c43e5f06
* | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-092-7/+8
| | | | | | | | | | | | | | | | | | | | This affects: - IAudioFlinger::openOutput - AudioTrack::AudioTrack - AudioTrack::set - apps that call these Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
* | Merge "Use AudioRecord::record_flags consistently"Glenn Kasten2012-03-091-3/+5
|\ \ | |/ |/|
| * Use AudioRecord::record_flags consistentlyGlenn Kasten2012-03-081-3/+5
| | | | | | | | Change-Id: I6f369a2b99eb515603bc7d5629a07db2b96783fe
* | Merge "audio policy: use audio_devices_t when appropriate"Eric Laurent2012-03-082-2/+2
|\ \ | |/ |/|
| * audio policy: use audio_devices_t when appropriateEric Laurent2012-03-082-2/+2
| | | | | | | | Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
* | IAudioFlingerClient::ioConfigChanged param2 constGlenn Kasten2012-03-062-3/+3
|/ | | | | | | | | The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged is used as an input. So changed it from void * to const void *. It is then cast to const OutputDescriptor * or const audio_stream_type_t * depending on the event. Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
* Merge "AudioTrack: relax check on minimum buffer size"Eric Laurent2012-03-061-2/+4
|\
| * AudioTrack: relax check on minimum buffer sizeEric Laurent2012-03-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Current AudioTrack implementation enforces that the requested audio buffer size is at least corresponding the audio latency. This requirement is too strong and leads to problems with current stagefright and AudioSink implementations when playing over output streams with long latency. Ultimately, the AudioSink design should be changed to specify a minimum buffer size in time or frames units but not in buffer count units. Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f
* | Merge "Remove unused code - MediaSourceSplitter"James Dong2012-03-061-193/+0
|\ \
| * | Remove unused code - MediaSourceSplitterJames Dong2012-03-051-193/+0
| |/ | | | | | | Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
* | Merge "Add channel mask in AudioSink"Jean-Michel Trivi2012-03-052-1/+4
|\ \ | |/ |/|
| * Add channel mask in AudioSinkJean-Michel Trivi2012-03-022-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for specifying a channel mask when opening an AudioSink. This parameter does not replace the channel count parameter in order to not have to duplicate the logic to derive a mask from the channel count everywhere an AudioSink is used without a known mask. A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will be automatically derived from the number of channels. Update existing AudioSink implementations to use the channel mask, and users of AudioSink to specify the mask if available, and CHANNEL_MASK_USE_CHANNEL_ORDER otherwise. Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
* | Merge "Fix typos and line length in AudioRecord comments"Glenn Kasten2012-03-021-5/+6
|\ \ | |/ |/|
| * Fix typos and line length in AudioRecord commentsGlenn Kasten2012-02-241-5/+6
| | | | | | | | Change-Id: I85cfb9a2b9b3ade098161aa7687b4d4f7eb226ea
* | Switch the way we configure for MediaPlayer retransmission.John Grossman2012-03-013-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd with merge conflicts addressed by hand and additional changes made in response to code review feedback. Move in the direction of a more publishable API for configuring a media player for retransmission. It used to be that we used a custom invoke and a modified URL (prefixed with aahTX://). There are many issues with this technique and it was never meant to stand the test of time. This CL gets rid of all that. A new (but currently hidden) method was introduced to the java level MediaPlayer API, called setRetransmitTarget(InetSocketAddress), which allows an app writer to set the retransmit target. For now, this method needs to be called before a call to setDataSource (which is pretty unusual for the MediaPlayer API) because this mid level code uses this as a cue to instantiate an aahTX player instead of relying on the data source to select a player. When retranmit functionality becomes part of the existing android player implemenation, this set-retrans-before-set-data-source behavior can go away, along with the aahTX player itself. Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98 Signed-off-by: John Grossman <johngro@google.com>
* | Merge "Instead of hardcoding OMX component names in our code, support"Andreas Huber2012-03-013-21/+121
|\ \
| * | Instead of hardcoding OMX component names in our code, supportAndreas Huber2012-03-013-21/+121
| | | | | | | | | | | | | | | | | | a config file instead. Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
* | | renamed audio policy output flag.Eric Laurent2012-03-012-2/+2
|/ / | | | | | | | | | | | | Renamed AUDIO_POLICY_OUTPUT_FLAG_INDIRECT to AUDIO_POLICY_OUTPUT_FLAG_NONE which is more appropriate. Change-Id: Ia14d60397df0f2dcd9bea0186400a09da35bc104
* | Merge "AudioRecord const methods"Glenn Kasten2012-02-291-8/+8
|\ \
| * | AudioRecord const methodsGlenn Kasten2012-02-281-8/+8
| | | | | | | | | | | | Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
* | | Merge "Separate the notion of "stop" from that of "release", i.e."Andreas Huber2012-02-292-1/+18
|\ \ \
generated by cgit v1.1 at 2025-11-26 18:09:45 +0000