summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge "Trust the Cues element"Andreas Huber2012-04-051-44/+22
|\ \
| * | Trust the Cues elementJohann2012-04-041-44/+22
| | | | | | | | | | | | | | | | | | | | | | | | With the Cue based seeking we will get the closest previous key frame. For audio, use the Cue file to find the Cluster with the video key frame then incrementally look for the audio Block. Change-Id: Idc934cca1286b1bb48ee7577b27903ca488a0610
* | | Merge "Fix a bug: WOULD_BLOCK handling in TimedTextPlayer."Andreas Huber2012-04-052-1/+25
|\ \ \ | |/ / |/| |
| * | Fix a bug: WOULD_BLOCK handling in TimedTextPlayer.Insun Kang2012-04-042-1/+25
| | | | | | | | | | | | | | | | | | Bug: 6234756 Change-Id: I0fae6e5ad8607d472faad7dd680e020f20ac1669
* | | Send video width and height to mediascannerMarco Nelissen2012-04-041-0/+2
| | | | | | | | | | | | | | | | | | b/5820120 Change-Id: Ia5c48eb1ab15fe3bbe773131148470a06eb2b96d
* | | Merge "fix crash with cues at the beginning of the file"Andreas Huber2012-04-031-9/+4
|\ \ \
| * | | fix crash with cues at the beginning of the fileJohann2012-04-031-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previous implementation tried to be clever about economizing Cue loads. however, files with the cues at the beginning missed the initial load in the seek function and would crash with a null pointer. Change-Id: I49c15d6688909cd13afabf33a54d9f5896aab7cd
* | | | New Crypto services talking to the new crypto "HAL".Andreas Huber2012-04-031-98/+61
|/ / / | | | | | | | | | | | | Change-Id: I69ed31e7a8b4d69d1209d2d516f94d258f072566 related-to-bug: 6275919
* | | Merge "Use Cues to seek Matroska files"Andreas Huber2012-04-031-13/+97
|\ \ \
| * | | Use Cues to seek Matroska filesJohann2012-04-021-13/+97
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the first seek, load the Cues element. Parse it incrementally until the desired seek point can be located. This allows files to begin playing immediately. However, the Browser still seeks to 0 before playing embedded YouTube files. Because YouTube stores the cues at the end of the file, this causes it to seek, load the cues, then begin playing. It is still better than the previous behavior which blocked until the entire file was loaded. BUG=5921311 Change-Id: Iad2abc64ded3b4e2c2d2c478a969f68450754282
* | | Add a few more APIs to MediaCodecList.Andreas Huber2012-04-022-43/+137
|/ / | | | | | | Change-Id: I5ac193cd40c82bbcd87c1e55003b78102e8d4674
* | reduce IPCs in BufferQueueMathias Agopian2012-03-291-0/+1
|/ | | | Change-Id: I1f8c32a771a411476d225adc62d1f07c24f39a3e
* Implementation of a raw audio "decoder".Andreas Huber2012-03-297-0/+317
| | | | Change-Id: Ie89f01e59dd8106883937188afbb407550f0ac92
* Add ABuffer support to SkipCutBufferMarco Nelissen2012-03-292-7/+44
| | | | | | | | Add support for ABuffer to SkipCutBuffer, and make it (re)allocate an appropriately sized buffer when needed, rather then relying on the caller to tell it ahead of time how big the buffers are going to be. Change-Id: I8b5c9ba5dd2fc13ef8870b7d4fe93a1bfdc7a626
* AV Android make files changesJames Dong2012-03-2824-45/+44
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* stagefright: compile without chromium for pdk buildsColin Cross2012-03-262-5/+10
| | | | Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
* Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-268-26/+293
|\
| * Provisional support for secure decryption of media streams.Andreas Huber2012-03-268-26/+293
| | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | Removed code related to simulator build in TimedEventQueue to get rid of the ↵James Dong2012-03-261-21/+0
|/ | | | | | | | dependency on jni.h o related-to-bug: 6214141 Change-Id: I548d84a9888be884d3903dc9dea9235258792165
* Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-249-11/+0
| | | | | | o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
* Fix the file mimetype reported by the mpeg4 extractor.Andreas Huber2012-03-232-2/+3
| | | | | Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b related-to-bug: 6217289
* Support gapless playback for mp3 and m4aMarco Nelissen2012-03-225-6/+191
| | | | | | | | | 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/+59
|\
| * Add MetaData::dumpToLogMarco Nelissen2012-03-211-0/+59
| | | | | | | | | | | | Utility method for dumping the content of a MetaData object to the log. Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
* | Merge "Parse gapless info from mp4 files"Marco Nelissen2012-03-212-0/+49
|\ \
| * | Parse gapless info from mp4 filesMarco Nelissen2012-03-212-0/+49
| |/ | | | | | | Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
* | Merge "Handling end times of subtitles."James Dong2012-03-207-20/+46
|\ \ | |/ |/|
| * Handling end times of subtitles.Insun Kang2012-03-217-20/+46
| | | | | | | | Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
* | Merge "Move COM tag parsing to constructor"Marco Nelissen2012-03-201-27/+31
|\ \
| * | Move COM tag parsing to constructorMarco Nelissen2012-03-201-27/+31
| | | | | | | | | | | | Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
* | | Merge "Parse mp3 encoder padding/delay"Marco Nelissen2012-03-205-17/+109
|\ \ \ | |/ /
| * | Parse mp3 encoder padding/delayMarco Nelissen2012-03-205-17/+109
| | | | | | | | | | | | | | | | | | Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag. Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
* | | Merge "Do not set camera preview display if the surface is null."Wu-cheng Li2012-03-191-3/+7
|\ \ \ | |_|/ |/| |
| * | Do not set camera preview display if the surface is null.Wu-cheng Li2012-03-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaRecorder.setPreviewDisplay() is not required if applications use MediaRecorder.setCamera(). Besides, this causes a problem when apps use Camera.setPreviewTexture. Camera service thinks the surface texture from Camera.setPreviewTexture and the surface from MediaRecorder.setPreviewDisplay are different. bug:5988937 Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
* | | Merge "Add libmedia_native"Glenn Kasten2012-03-191-0/+1
|\ \ \
| * | | Add libmedia_nativeGlenn Kasten2012-03-161-0/+1
| | | | | | | | | | | | | | | | Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
* | | | Merge "audio_channel_in/out_mask_from_count"Glenn Kasten2012-03-192-5/+5
|\ \ \ \
| * | | | audio_channel_in/out_mask_from_countGlenn Kasten2012-03-152-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and avoid ambiguous term "channels" where it might be confusing as to whether it is a channel mask or channel count Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
* | | | | Merge "ACodec is a little more aggressive in its error checking now."Andreas Huber2012-03-164-8/+27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | ACodec is a little more aggressive in its error checking now.Andreas Huber2012-03-164-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update components to do the right thing. Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
* | | | | Merge "Remove obsolete software codec header files and amr encoders."Andreas Huber2012-03-1615-1298/+0
|\ \ \ \ \
| * | | | | Remove obsolete software codec header files and amr encoders.Andreas Huber2012-03-1615-1298/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
* | | | | Merge "Skip XING/VBRI frame when decoding"Marco Nelissen2012-03-163-107/+59
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Skip XING/VBRI frame when decodingMarco Nelissen2012-03-163-107/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send the XING/VBRI frame to the decoder, as it will result in extra data being output. Also clean up the XING seeker code a bit. Change-Id: I714a94180edae9bedc1bc0c96bf382fe6f928ac6
* | | | | Merge "Remove obsolete OMXComponentBase class"Andreas Huber2012-03-163-298/+0
|\ \ \ \ \
| * | | | | Remove obsolete OMXComponentBase classAndreas Huber2012-03-163-298/+0
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: I701ff5a57b0ab49cc772c4f82d03b5005e54ec6f
* | | | | Fix a bug in MediaPlayer's addExternalSource().Insun Kang2012-03-162-17/+4
|/ / / / | | | | | | | | | | | | Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
* | | | Add a new camera open API that allows taking the ownership.Wu-cheng Li2012-03-151-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose is to let face unlock always get the camera successfully. What happened was the camera applications may have opened the camera in onResume under the lock screen. This API lets face unlock take the camera from the camera application. A new permission will be added, so other applicatoins won't be able to take the camera from the face unlock. bug:5584464 Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
* | | Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext ↵James Dong2012-03-1412-135/+227
|\ \ \ | |/ / |/| | | | | tracks."
| * | Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-1512-135/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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