summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/timedtext/TimedTextDriver.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
| | | | Change-Id: Ie2fef95a45dd124572bf062011a272898a371924
* Revert "build fix for aosp-idea133 @ 1119318"Colin Cross2014-04-111-0/+1
| | | | | | Build fix is needed in AOSP, but in master it re-introduces a warning and breaks the build on -Werror. Revert it in master. This reverts commit effbb3a9b72050dbe150af7302d9148fe7e927d3.
* am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"Mark Salyzyn2014-04-111-1/+0
|\ | | | | | | | | * commit 'a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50': build fix for aosp-idea133 @ 1119318
| * build fix for aosp-idea133 @ 1119318Mark Salyzyn2014-04-111-1/+0
| | | | | | | | Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
| * warnings be gone.Andreas Huber2014-04-111-0/+1
| | | | | | | | | | | | | | | | (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: MediaPlayer's deselectTrack() for subtitle.Insun Kang2012-09-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | warnings be gone.Andreas Huber2014-02-111-0/+1
| | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-2/+4
| | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | Bug fix: MediaPlayer's deselectTrack() for subtitle.Insun Kang2012-09-201-2/+7
|/ | | | | | | | | | | | 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
* 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-021-8/+28
| | | | | | | | | | | 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-6/+23
| | | | | | | | o Revived resume() function to fix pause/resume bug. (Bug: 6663740) o Mannually cherry-picked from GTV change. (commit: ad1197226d1c6745959f0e469f510ca06f99489f) Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
* 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 in MediaPlayer's addExternalSource().Insun Kang2012-03-161-1/+1
| | | | Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
* Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-151-68/+68
| | | | | | | | | | | | | | | | | | 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-2/+1
| | | | | | So that other players can include TimedTextDriver.h properly. Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
* First step of refactoring 'timedtext' code.Insun Kang2012-01-311-0/+223
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
generated by cgit v1.1 at 2024-06-12 12:35:19 +0000