77f4d8b90c
Merge "Organize header dependencies" into oc-mr1-dev am: 1ec73bea63
...
am: 4b8ef498cc
7 years ago
1ec73bea63
Merge "Organize header dependencies" into oc-mr1-dev
7 years ago
28e6c5fc56
Merge "GenericSource: still feed audio decoder when paused."
7 years ago
255735a38b
Organize header dependencies
...
Header files that are exported are moved to a specific place for
exporting.
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 63821829
Change-Id: Ia578e3c0dd1ff157335b3a49af896acb922586e8
7 years ago
91b5eb2ffc
Merge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev
...
am: db5beef4cf
7 years ago
c01eddb86e
MediaPlayer: Permit VolumeShaper operations on gapless playback
...
This allows unducking to occur when VolumeShaper operations
are applied to the original player.
Test: Automated duck tests
Bug: 63111689
Change-Id: If2e93b1ccb11216032f24e71ab200668e1e4850d
7 years ago
9af3fd5c98
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965 am: 650446e758
...
am: 2e3ff09fc6
7 years ago
2e3ff09fc6
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965
...
am: 650446e758
7 years ago
29204646b9
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1
...
am: 6b79fa9965
7 years ago
650446e758
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1
...
am: 6b79fa9965
7 years ago
6b79fa9965
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca
...
am: b65bc512d1
7 years ago
ee04f896ca
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384
...
am: 830ecba34d
7 years ago
830ecba34d
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149
...
am: 6f7295a384
7 years ago
6f7295a384
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7
...
am: d8192c9149
7 years ago
d8192c9149
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44
...
am: 1a1bb632e7
7 years ago
50280c1b44
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c
...
am: 93ae13644b
7 years ago
93ae13644b
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584
...
am: 5cc9f8780c
7 years ago
5cc9f8780c
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8
...
am: e0f4963584
7 years ago
0844e1a3e8
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f
...
am: 263d5a2a70
7 years ago
263d5a2a70
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6
...
am: 03fa67202f
7 years ago
03fa67202f
MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
...
am: bd7db202c6
7 years ago
89dc2fe686
GenericSource: still feed audio decoder when paused.
...
Test: audio decoder stops polling source
Bug: 63412809
Change-Id: I53c98920ea850defae88b2e12be6b05d6d90c32c
7 years ago
502c2f4053
MediaPlayerService: fix access of mPlayer in client
...
Test: poc doesn't crash
Bug: 38234812
Change-Id: I6f9be046ff66d2d5bed27bd712287e4ead550830
7 years ago
599e95afa2
Merge "NuPlayerRenderer: allow video to continue when audio ends"
7 years ago
a4421734be
Merge "NuPlayer: fix track error notification"
7 years ago
f86731d6a5
NuPlayer: fix track error notification
...
Audio/video decoder could have been shut down due to error. When the
counter track has error, it should take this into consideration.
Test: MediaPlayer sends out corrent error notification.
Bug: 63116575
Change-Id: Ie31d4e6d9b2bc6715d657a4c8e2dc7c1368257b1
7 years ago
20e6916035
Merge "Fix memory leak warning." am: ae6088e456 am: 37cd5f116d am: 4c09f57e62
...
am: 31dcf0154d
7 years ago
31dcf0154d
Merge "Fix memory leak warning." am: ae6088e456 am: 37cd5f116d
...
am: 4c09f57e62
7 years ago
37cd5f116d
Merge "Fix memory leak warning."
...
am: ae6088e456
7 years ago
d214a56215
NuPlayerRenderer: allow video to continue when audio ends
...
Test: video can continue when audio ends
Bug: 63397228
Change-Id: Iebd79006b7205ddd4d616a803fe0e5f492cbc866
7 years ago
449d3f0814
Fix memory leak warning.
...
This CL eliminates the following compiler warning:
MediaPlayerFactory.cpp:249:27: warning: Potential memory leak
Bug: None
Test: After this change the warning is gone.
Change-Id: I09e7ec5cc3bc84decfea2456550b532aac55d26f
7 years ago
ddd11adcd9
media: Change the location of dumping stats
...
The latest photos apk calls the setVideoSurfaceTexture
with a null bufferProducer. Hence the surface is set as
NULL.
Due to this, the video decoder is shutdown before the
surface is set. Hence the stats are lost. Thus when the
app calls reset after surface is set, the stats are not
printed.
Test: see dump stats
CRs-Fixed: 2063273
Bug: 62897827
Author: anubhavp@codeaurora.org
Change-Id: Iafc09c50840960be4a20e55b34d5d31ba6a2da49
(cherry picked from commit 563acd6f5a0bfc0174aee61a9ec04916fc227f14)
7 years ago
8818bf1fbb
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
...
Bug: 38391487
Bug: 24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit 56097a8ecc
7 years ago
ba97351e6b
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b am: 2675f4cac9 am: 6a2a5b5808
...
am: 333b2d578a
7 years ago
333b2d578a
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b am: 2675f4cac9
...
am: 6a2a5b5808
7 years ago
6a2a5b5808
Merge "NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer." into lmp-mr1-dev am: 3b1a9c3f1b
...
am: 2675f4cac9
7 years ago
14972ed9c9
Merge "Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing" into oc-dev am: 8631fd7b27
...
am: 360abaf9d7
7 years ago
360abaf9d7
Merge "Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing" into oc-dev
...
am: 8631fd7b27
7 years ago
8631fd7b27
Merge "Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing" into oc-dev
7 years ago
838be3907f
Modular DRM for MediaPlayer: L3 playback fails at OMX mmap; preparDrm preparing
...
Bug: 34559906
Bug: 38390836
Bug: 38039230
Bug: 62194380
Test: GTS Tests
Change-Id: I51e2479f745a4c3e271628abdd79efcb97368ec2
7 years ago
0094fd7067
Android.mk: remove $TOP in LOCAL_C_INCLUDES
...
Test: make systemimage
Change-Id: I5f83786afe3f2c65819b127b041cb74fc4c989ac
Merged-In: I5f83786afe3f2c65819b127b041cb74fc4c989ac
Signed-off-by: YOUNG HO CHA <ganadist@gmail.com>
(cherry picked from commit 2ee7aab4a3
7 years ago
080a39e487
Merge "Android.mk: remove $TOP in LOCAL_C_INCLUDES"
7 years ago
2ee7aab4a3
Android.mk: remove $TOP in LOCAL_C_INCLUDES
...
Test: make systemimage
Change-Id: I5f83786afe3f2c65819b127b041cb74fc4c989ac
Signed-off-by: YOUNG HO CHA <ganadist@gmail.com>
7 years ago
b3cd253a09
Android.mk: remove $TOP in LOCAL_C_INCLUDES
...
Test: make systemimage
Change-Id: I5f83786afe3f2c65819b127b041cb74fc4c989ac
Signed-off-by: YOUNG HO CHA <ganadist@gmail.com>
7 years ago
6e899bb13f
Merge "Modular DRM for MediaPlayer/Fixing legacy frame drop at NuPlayerDecoder" into oc-dev am: b7b6818b73
...
am: 8eed27bece
7 years ago
8eed27bece
Merge "Modular DRM for MediaPlayer/Fixing legacy frame drop at NuPlayerDecoder" into oc-dev
...
am: b7b6818b73
7 years ago
62dec9555e
Modular DRM for MediaPlayer/Fixing legacy frame drop at NuPlayerDecoder
...
Bug: 34559906
Bug: 38039230
Bug: 38430289
Test: GTS/CTS Tests
Change-Id: I68dca5f8bae4f9f7866cfaaa6aba97c80dcd8ffb
7 years ago
15c3740aa9
NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
...
Bug: 38391487
Bug: 24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit 56097a8ecc
7 years ago
0e39f08a85
Merge "Modular DRM for MediaPlayer/Race at stop/releaseDrm" into oc-dev am: a666b69800
...
am: b69caa46e8
7 years ago
b69caa46e8
Merge "Modular DRM for MediaPlayer/Race at stop/releaseDrm" into oc-dev
...
am: a666b69800
7 years ago
Pawin Vongmasa
TreeHugger Robot
Wei Jia
Andy Hung
Yunlian Jiang
Santhosh Behara
Hassan Shojania
YOUNG HO CHA
Colin Cross