| e5558d56cea4616ef4a2778f9a78fe27df9401ac |
|
24-Nov-2014 |
Andreas Gampe <agampe@google.com> |
Stagefright: Fix default typo
Change-Id: Ie2fef95a45dd124572bf062011a272898a371924
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 0f37620e0f79bfab1354e2e3049c260342a2637e |
|
11-Apr-2014 |
Colin Cross <ccross@android.com> |
Revert "build fix for aosp-idea133 @ 1119318"
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.
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 027eadebbf7534d3eb596451c9197571f4e94073 |
|
11-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
am a7281ee1: am a133bc87: Merge "build fix for aosp-idea133 @ 1119318"
* commit 'a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50':
build fix for aosp-idea133 @ 1119318
|
| effbb3a9b72050dbe150af7302d9148fe7e927d3 |
|
11-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
build fix for aosp-idea133 @ 1119318
Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| d411b4ca2945cd8974a3a78199fce94646950128 |
|
11-Apr-2014 |
Andreas Huber <andih@google.com> |
warnings be gone.
(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
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 84333e0475bc911adc16417f4ca327c975cf6c36 |
|
08-Feb-2014 |
Andreas Huber <andih@google.com> |
warnings be gone.
Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 1b86fe063badb5f28c467ade39be0f4008688947 |
|
29-Jan-2014 |
Andreas Huber <andih@google.com> |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| ef58870d2c798f046c87b06be0ec0cad109a754b |
|
20-Sep-2012 |
Insun Kang <insun@google.com> |
Bug fix: MediaPlayer's deselectTrack() for subtitle.
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
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 23580bb8d6cafbc2b65dd0a4ce1acb52562d1b05 |
|
20-Sep-2012 |
Insun Kang <insun@google.com> |
Bug fix: MediaPlayer's deselectTrack() for subtitle.
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
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| c9729ca1cb1760da836e293e3ed7a82f769f3e07 |
|
24-Jul-2012 |
Insun Kang <insun@google.com> |
Unifying TimedTextDriver's resume() and start().
(cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425)
Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 6472badc497a9e748411f8c8c9ed5d83ef335a85 |
|
18-Jun-2012 |
Insun Kang <insun@google.com> |
Fix: status checking in TimedTextDriver.
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)
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| bb6bc8491fe819f96e1902e56694715cb110ce94 |
|
10-Jul-2012 |
Insun Kang <insun@google.com> |
Adds resume() function
o Revived resume() function to fix pause/resume bug. (Bug: 6663740)
o Mannually cherry-picked from GTV change.
(commit: ad1197226d1c6745959f0e469f510ca06f99489f)
Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 692ac36c4b6a09fed5113a4f45f00a041665a769 |
|
19-Apr-2012 |
James Dong <jdong@google.com> |
Make timed text source type explicit in TimedTextDriver
o related-to-bug: 5542712
Change-Id: Ifdc730e616336e8b16783e8a5766f27df62a0592
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| eec46abb88dcc50621fd2d3f17a6b8d24fd07a19 |
|
12-Apr-2012 |
James Dong <jdong@google.com> |
Fix for multiple audio/timed track feature implementation - part one
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
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 25736fd247ba757feefe15d3071f7e747c64fea4 |
|
27-Mar-2012 |
Insun Kang <insun@google.com> |
To return default track info even if there's no metadata for a
subtitle track.
It would rather return empty data than return NULL data for an existing track.
Change-Id: Ie0c18e6851bfbe2c471041589670a3012605b584
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 613c8ae1b7a2b4f43b33a72dc2fff0bc8b7d4c6f |
|
13-Apr-2012 |
James Dong <jdong@google.com> |
Add external timed text source using a passed file descriptor
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
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 7c5afe93c9ca2f9f3958663bc3fa9649ec2f5331 |
|
15-Mar-2012 |
Insun Kang <insun@google.com> |
Fix a bug in MediaPlayer's addExternalSource().
Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| f9d660a5e0196240add5daf0199f128d471e592c |
|
16-Feb-2012 |
Insun Kang <insun@google.com> |
Defines MediaPlayer APIs to support multiple audio/video/timedtext
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
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 3254b25e8b0f674ccc2226609e01dd86a600802e |
|
27-Feb-2012 |
Insun Kang <insun@google.com> |
Moves TimedTextDriver.h into include/media/stagefright/timedtext.
So that other players can include TimedTextDriver.h properly.
Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|
| 6655174826330afe66ef766258181ae8c11f3f6c |
|
11-Jan-2012 |
Insun Kang <insun@google.com> |
First step of refactoring 'timedtext' code.
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
/frameworks/av/media/libstagefright/timedtext/TimedTextDriver.cpp
|