| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
* commit 'f5f24006f7bd997c6bca00804ec0f35bddd7ccc2':
media: -Werror re-enabled
|
| |
| |
| |
| | |
Change-Id: I62fdb78e8acefafd468ce2e5aa9e78eba0dd0f48
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
%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
|
|\ \
| |/
| |
| |
| |
| |
| | |
1119326"
* commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9':
Fix aosp_arm64 mirror-aosp-master build 1119326
|
| |
| |
| |
| |
| |
| | |
Remove -Werror that was set in 'warnings be gone'
Change-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30
|
| |
| |
| |
| |
| |
| | |
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.
|
|\ \
| |/
| |
| |
| | |
* commit 'a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50':
build fix for aosp-idea133 @ 1119318
|
| |
| |
| |
| | |
Change-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4
|
| |
| |
| |
| |
| |
| |
| |
| | |
(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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
%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
|
| |
| |
| |
| | |
Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
|
| |
| |
| |
| |
| |
| | |
to media code
Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
|
| |
| |
| |
| | |
Change-Id: Id113743c1531509fbca7a1fa7125056d6d7f1213
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|/
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: I2b228db8f11a829399cdc6efe67d7b6e0a1917ba
|
|
|
|
|
|
| |
(cherry picked from gtv bb23a2b7e06c59f56e353fd4a2a66a9b8179d425)
Change-Id: If5f14549fa315c34e32d6fed7c1ea09deabceb63
|
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
| |
o Revived resume() function to fix pause/resume bug. (Bug: 6663740)
o Mannually cherry-picked from GTV change.
(commit: ad1197226d1c6745959f0e469f510ca06f99489f)
Change-Id: I77ac90085fb1f1d2e7eb706642978a4fa4d28b49
|
|
|
|
|
|
|
|
|
|
| |
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)
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26
related-to-bug: 6647465
|
|
|
|
|
|
| |
related-to-bug: 6480861
Change-Id: I86f24f1304dea42a7501c578cff0c590b048ccc2
|
|\ |
|
| |
| |
| |
| |
| |
| | |
Bug: 6375542
Change-Id: Ic5dd5a1826b9f78ccbbddc4dec33b0e915b9329f
|
|/
|
|
|
|
|
| |
o Do not enqueue another subtitle when notifying a null message.
related-to-bug: 6401574
Change-Id: I366e643ffa1601c11a12e46fcf7c00a469c77448
|
|
|
|
|
|
| |
o related-to-bug: 5542712
Change-Id: Ifdc730e616336e8b16783e8a5766f27df62a0592
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
subtitle track.
It would rather return empty data than return NULL data for an existing track.
Change-Id: Ie0c18e6851bfbe2c471041589670a3012605b584
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
Bug: 6234756
Change-Id: I0fae6e5ad8607d472faad7dd680e020f20ac1669
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
o related-to-bug: 6214141
Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
|
|
|
|
| |
Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
|
|
|
|
| |
Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
|
|
|
|
|
|
| |
So that other players can include TimedTextDriver.h properly.
Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
|
|
|
|
| |
Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
|
|
|
|
| |
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
|
|
|
|
|
|
|
| |
TimedTextParser should handle multiple blank lines between subtitles
in SRT format.
Change-Id: Id81e0a14d9984141f68b9f0919942c85562301b3
|
|
|
|
|
|
|
|
|
| |
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
|
|
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
|