summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/timedtext/TimedTextPlayer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* media: switch to new AMessage handlingLajos Molnar2015-03-051-7/+7
| | | | | Bug: 19607784 Change-Id: I94cddcb81f671422ad4982a23dc4acfe57a9f1aa
* libstagefright: fix 64-bit warningsColin Cross2014-03-191-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. Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
* Bug fix: MediaPlayer's deselectTrack() for subtitle.Insun Kang2012-09-201-1/+11
| | | | | | | | | | | | 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
* Fix: status checking in TimedTextDriver.Insun Kang2012-08-021-23/+52
| | | | | | | | | | | 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-021-7/+26
| | | | | | | | 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-021-17/+39
| | | | | | | | | | 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)
* Fix a bug on sending a message to retry in TimedText.Insun Kang2012-05-111-1/+1
| | | | | | related-to-bug: 6480861 Change-Id: I86f24f1304dea42a7501c578cff0c590b048ccc2
* 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
* Fix a bug: WOULD_BLOCK handling in TimedTextPlayer.Insun Kang2012-04-041-1/+24
| | | | | | Bug: 6234756 Change-Id: I0fae6e5ad8607d472faad7dd680e020f20ac1669
* Handling end times of subtitles.Insun Kang2012-03-211-5/+25
| | | | Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
* Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-151-18/+29
| | | | | | | | | | | | | | | | | | 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
* Moves TimedTextDriver.h into include/media/stagefright/timedtext.Insun Kang2012-02-271-1/+1
| | | | | | So that other players can include TimedTextDriver.h properly. Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
* Move away from MediaDebug and use ADebug insteadJames Dong2012-02-101-1/+1
| | | | Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
* First step of refactoring 'timedtext' code.Insun Kang2012-01-311-351/+116
| | | | | | | | | | | | | | | | | | | 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
* Timed text display format support:Gloria Wang2011-06-221-39/+108
| | | | | | | | | 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-251-0/+347
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96