summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/timedtext
Commit message (Collapse)AuthorAgeFilesLines
* media: -Werror re-enabledMark Salyzyn2014-04-151-1/+1
| | | | Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
* libstagefright: fix 64-bit warningsColin Cross2014-04-141-1/+2
| | | | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. (cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
* Fix aosp_arm64 mirror-aosp-master build 1119326Mark Salyzyn2014-04-111-1/+1
| | | | | | Remove -Werror that was set in 'warnings be gone' Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
* build fix for aosp-idea133 @ 1119318Mark Salyzyn2014-04-111-1/+0
| | | | Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
* warnings be gone.Andreas Huber2014-04-113-2/+4
| | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* Bug fix: set 'und' as default metadata language info for srt.Insun Kang2013-01-171-4/+3
| | | | | | | | | | | | | o Previously, it leaves language code empty and it is inconsistent with other code which gives 'und'. As a result, selected SRT track returned empty language info. With this fix, it returns 'und'. Bug: 7227230 TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest -m testGetTrackInfo Change-Id: I225848f029637dd782c376e0d770dddd5c849550
* Bug fix: MediaPlayer's deselectTrack() for subtitle.Insun Kang2012-09-202-3/+18
| | | | | | | | | | | | o Previously, deselectTrack() actually doesn't work properly in TimedTextDriver / TimedTextPlayer. o Ignores select track operation when the same track is selected in a row. Bug: 7200096 TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest Change-Id: If7feac294cf9b358f616be45574bc2e26001c887
* Fix a small build warning.John Grossman2012-08-081-1/+2
| | | | Change-Id: I2b228db8f11a829399cdc6efe67d7b6e0a1917ba
* Unifying TimedTextDriver's resume() and start().Insun Kang2012-08-021-22/+19
| | | | | | (cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425) Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
* Fix: status checking in TimedTextDriver.Insun Kang2012-08-023-32/+84
| | | | | | | | | | | o fixes seeking error when there's no enabled text track. o clean up status checking code for deselectTrack. o fixes a potential bug : pause->backward seek can trigger unwanted resume. Bug: 6682160 Change-Id: I03d8788b27fb9c0a6092be83ad3578ccf3266905 (cherry picked from commit 2dafb6071d4f14e0e208912500694912211aa26b)
* Adds resume() functionInsun Kang2012-08-023-13/+51
| | | | | | | | o Revived resume() function to fix pause/resume bug. (Bug: 6663740) o Mannually cherry-picked from GTV change. (commit: ad1197226d1c6745959f0e469f510ca06f99489f) Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
* Adjust fire time of a timed text message before firing it.Insun Kang2012-08-022-18/+40
| | | | | | | | | | related-to-bug: 6501328 o When Video/Audio is stuttering, subtitle's firing time should be adjusted. Change-Id: I0e7e8a1796cb2b3c8a09c8fbd41690bce2689e85 (cherry picked from gtv: commit b2c3aedcb6c145e33ded39ef81e3202b2419469f)
* Bugfix: Seek on SRT external trackInsun Kang2012-07-204-26/+298
| | | | | | | | | | o Need to return closest upcoming subtitle when seeking time is within gap ranges. o Manually cherry-picked from GTV change. (commit e026a83dc88888b42da77eca739b8f09a0cd6dae) related-to-bug: 6796228 Change-Id: I02b7718a432d6b2f5575fa1a1a42bda6f04aa25b
* Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
| | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* Fix a bug on sending a message to retry in TimedText.Insun Kang2012-05-111-1/+1
| | | | | | related-to-bug: 6480861 Change-Id: I86f24f1304dea42a7501c578cff0c590b048ccc2
* 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
* | 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
* Make timed text source type explicit in TimedTextDriverJames Dong2012-04-181-4/+4
| | | | | | o related-to-bug: 5542712 Change-Id: Ifdc730e616336e8b16783e8a5766f27df62a0592
* Fix for multiple audio/timed track feature implementation - part oneJames Dong2012-04-161-23/+36
| | | | | | | | | | | | | | | | o getTrackInfo now returns all tracks, rather than just the timed text tracks. o the index of the track info is kept to the same as the track index if the track is not from an external source o correctly maps the selectTrack() and unselectTrack() calls to the right track index o TODO: 1) note that the selectTrack() and unselectTrack() only works for timed text track at present; 2) the lock is timed text specific o related-to-bug: 6110705 Change-Id: Ib1feeef2184bc992930ace0d1197b6c00a2636d7
* To return default track info even if there's no metadata for aInsun Kang2012-04-131-9/+8
| | | | | | | | subtitle track. It would rather return empty data than return NULL data for an existing track. Change-Id: Ie0c18e6851bfbe2c471041589670a3012605b584
* Add external timed text source using a passed file descriptorJames Dong2012-04-131-10/+21
| | | | | | | | o Also fixed a minor issue where the file length should be of type off64_t rather than size_t o related-to-bug: 5542712 Change-Id: I35fd8ceea0bc75e553b7f4a99932cf58ea560c4e
* Fix a bug: WOULD_BLOCK handling in TimedTextPlayer.Insun Kang2012-04-042-1/+25
| | | | | | Bug: 6234756 Change-Id: I0fae6e5ad8607d472faad7dd680e020f20ac1669
* AV Android make files changesJames Dong2012-03-281-2/+2
| | | | | | | 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
* Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-241-1/+0
| | | | | | o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
* Handling end times of subtitles.Insun Kang2012-03-217-20/+46
| | | | Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
* Fix a bug in MediaPlayer's addExternalSource().Insun Kang2012-03-161-1/+1
| | | | Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
* Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-159-88/+123
| | | | | | | | | | | | | | | | | | 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
* Fixing coding style : IndentationInsun Kang2012-03-132-51/+51
| | | | Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
* Moves TimedTextDriver.h into include/media/stagefright/timedtext.Insun Kang2012-02-274-84/+3
| | | | | | So that other players can include TimedTextDriver.h properly. Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
* Changed TimedTextInBandSource to TimedText3GPPSource.Insun Kang2012-02-234-48/+51
| | | | Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
* Move away from MediaDebug and use ADebug insteadJames Dong2012-02-102-2/+2
| | | | Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
* First step of refactoring 'timedtext' code.Insun Kang2012-01-3112-607/+941
| | | | | | | | | | | | | | | | | | | Goal 1. Removed dependency of TimedTextPlayer on AwsomePlayer. 2. Generalized TimedTextParser to TimedTextSource and its subclasses. Summary 1. Introduced TimedTextDriver, TimedTextPlayer (new implementation), TimedTextSource (and its subclasses). 2. Removed TimedTextParser. Remaining TODOs 1. Revise VideoVidew, Gallery3D app, AwesomePlayer to check if 'pause' and 'resume' works well. 2. Consider revising MediaPlayer APIs such as setParameter() -> addTextSource(). Need more thoughts. Change-Id: Ie0c4f15b9690102de755cef6940f8c31ccf78e27
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Fix a subtitle bug: multiple blank lines in SubRip(srt) file.Insun Kang2011-11-221-6/+11
| | | | | | | TimedTextParser should handle multiple blank lines between subtitles in SRT format. Change-Id: Id81e0a14d9984141f68b9f0919942c85562301b3
* Timed text display format support:Gloria Wang2011-06-225-41/+582
| | | | | | | | | 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
* For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-255-0/+809
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
generated by cgit v1.1 at 2024-05-10 11:01:24 +0000