summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | NuPlayer: use generation to filter out stale message from renderer.Wei Jia2014-09-222-7/+20
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up generation number for decoders. Bug: 17507846 Change-Id: Ibd2cfe11f89f404882d66c384b5198dc641f5e71
* | | | | am 5110d6a0: Merge "MyHandler: set ip address to an invalid one when ↵Wei Jia2014-09-231-1/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | getsockname() returns error." into lmp-dev * commit '5110d6a00db5973881d06c39c60e477fb90a2d55': MyHandler: set ip address to an invalid one when getsockname() returns error.
| * | | | Merge "MyHandler: set ip address to an invalid one when getsockname() ↵Wei Jia2014-09-231-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | returns error." into lmp-dev
| | * | | | MyHandler: set ip address to an invalid one when getsockname() returns error.Wei Jia2014-09-221-1/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 17556472 Change-Id: I0387c78727d9a18abddcfdb4b480f4b1412bbc9f
* | | | | am a44d8f71: Merge "fix crash when makeHTTPConnection fails with null ↵Chong Zhang2014-09-231-1/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | pointer" into lmp-dev * commit 'a44d8f71a4b9ebae87c386bc3fe19abc52590bb5': fix crash when makeHTTPConnection fails with null pointer
| * | | | Merge "fix crash when makeHTTPConnection fails with null pointer" into lmp-devChong Zhang2014-09-221-1/+12
| |\ \ \ \
| | * | | | fix crash when makeHTTPConnection fails with null pointerChong Zhang2014-09-221-1/+12
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 17608108 Change-Id: I4bdf6d09ae565418be3d6677b5ccac9072fb9b2c
* | | | | am d7f77cd7: Merge "MediaCodec: Fix deallocated pointer reference when ↵Andy Hung2014-09-221-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | calling reset()" into lmp-dev * commit 'd7f77cd78f5180ba7a04b270d632cc4f9f11718a': MediaCodec: Fix deallocated pointer reference when calling reset()
| * | | | Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" ↵Andy Hung2014-09-221-3/+3
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | into lmp-dev
| | * | | MediaCodec: Fix deallocated pointer reference when calling reset()Andy Hung2014-09-221-3/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name pointer argument in MediaCodec::init() was being implicitly deallocated. Bug: 17499622 Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2
* | | | am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s ↵Wei Jia2014-09-228-96/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | destructed." into lmp-dev * commit '0079b331227fc1555d7c5305f33917a570d44890': MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
| * | | Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." ↵Wei Jia2014-09-228-96/+48
| |\ \ \ | | | | | | | | | | | | | | | into lmp-dev
| | * | | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-198-96/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
* | | | | am 39e07162: Merge "NuPlayer HLS: better subtitle toggling" into lmp-devRobert Shih2014-09-224-3/+43
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '39e07162be0680fd30bec7be50628883aa912ffd': NuPlayer HLS: better subtitle toggling
| * | | | Merge "NuPlayer HLS: better subtitle toggling" into lmp-devRobert Shih2014-09-224-3/+43
| |\ \ \ \
| | * | | | NuPlayer HLS: better subtitle togglingRobert Shih2014-09-194-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17310061 Change-Id: Iacee1816285425aaad08c32b28591bb0162d5a85
* | | | | | am 8d6ae6d9: Merge "mediaplayer: smooth out videoplayback based on ↵Lajos Molnar2014-09-205-3/+446
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framerate" into lmp-dev * commit '8d6ae6d9e9f2740f88928fae52e811ca68b0024e': mediaplayer: smooth out videoplayback based on framerate
| * | | | | mediaplayer: smooth out videoplayback based on framerateLajos Molnar2014-09-195-3/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14659809 Change-Id: I73f6c7224c51ac06487475f9ed395379111ad71f
* | | | | | am 3bde6b1c: Merge "Make prepare properly report failure again" into lmp-devMarco Nelissen2014-09-201-1/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '3bde6b1c3387c51479f39846533ead246a920990': Make prepare properly report failure again
| * | | | | Merge "Make prepare properly report failure again" into lmp-devMarco Nelissen2014-09-201-1/+6
| |\ \ \ \ \
| | * | | | | Make prepare properly report failure againMarco Nelissen2014-09-191-1/+6
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17583084 Bug: 17548451 Change-Id: I759d28eaafb520c206d54740c2c0a857b534d23c
* | | | | | am dc43dfa1: mediaplayer: schedule video frames in VSYNC valleysLajos Molnar2014-09-207-14/+224
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'dc43dfa1294470a4413c37e863ef3b621da8681f': mediaplayer: schedule video frames in VSYNC valleys
| * | | | | mediaplayer: schedule video frames in VSYNC valleysLajos Molnar2014-09-197-14/+224
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 14659809 Change-Id: Ic340ac61ad4778b493625c79c2cb4f747ff54ede
* | | | | am 4409ba46: Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4409ba46fab830d81860edba056c3dc6e1c7c003': Fix ringbuffer handling
| * | | | Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
| |\ \ \ \
| | * | | | Fix ringbuffer handlingMarco Nelissen2014-09-192-24/+19
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly keep track of the number of samples in the ring buffer, rather than inferring it from the difference between the read and write pointer, since the latter cannot distinguish between a completely full and a completely empty buffer. Bug: 17582331 Change-Id: I24d16ce96710209b7457ffad7c4c60201451980f
* | | | | am dfc34dab: Reduce log spam from getTimestamp errorsGlenn Kasten2014-09-191-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'dfc34daba6d6cb923683d96689a0cb7c7006eee5': Reduce log spam from getTimestamp errors
| * | | | Reduce log spam from getTimestamp errorsGlenn Kasten2014-09-191-1/+1
| |/ / / | | | | | | | | | | | | | | | | Bug: 17576481 Change-Id: I07d99e7c42b7d4f0994b5a6d9c9fe8eb29fbbe40
* | | | am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-devMarco Nelissen2014-09-191-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b0ed4e3e482cbdc2fa6c7853526597f4ae3f0972': Always consider first buffer to be config
| * | | Merge "Always consider first buffer to be config" into lmp-devMarco Nelissen2014-09-191-0/+8
| |\ \ \
| | * | | Always consider first buffer to be configMarco Nelissen2014-09-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for backwards compatibility. Also fix a problem where writing 0 bytes to an empty ringbuffer would treat it as overflowed. Bug: 17567501 Change-Id: I8019da76466576e1b2984e9eccf09bdec593038a
* | | | | am c0651e85: Merge "mediaplayer: fix buffer aggregation when video has ↵Phil Burk2014-09-191-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | offloaded audio" into lmp-dev * commit 'c0651e858ae4ef4c9a2df2e4506b4093b6666ae9': mediaplayer: fix buffer aggregation when video has offloaded audio
| * | | | Merge "mediaplayer: fix buffer aggregation when video has offloaded audio" ↵Phil Burk2014-09-181-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into lmp-dev
| | * | | | mediaplayer: fix buffer aggregation when video has offloaded audioPhil Burk2014-09-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change conditional test so we don't accidentally do buffer aggregation on video buffers. Bug: 17553847 Change-Id: I746452b2e62db664315732a38f982ce7faf26212 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | am 6aadfce1: Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-3/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6aadfce1d8c972faad7f4437dcd88d8cd3557611': AudioEffect acquires session
| * | | | | Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-3/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | AudioEffect acquires sessionJean-Michel Trivi2014-09-181-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users of audio sessions, AudioTrack and AudioRecord, are acquiring and releasing audio sessions according to their life-cycle. AudioEffect instances were not counting as users of an audio session. This caused an effect used on a session to be purged by AudioFlinger::purgeStaleEffects_l() whenever the last user of that session went away. This CL makes AudioEffect acquire and release a session when created and destroyed. Bug 15432115 Change-Id: I922532150009988d43872f9b5928044a830ae0b3
* | | | | | am 2973994a: Merge "PlaylistFetcher:don\'t signal a/v eos on subttitle eos" ↵Robert Shih2014-09-181-0/+17
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '2973994af39d55b58728df3dca067594e826ea2a': PlaylistFetcher:don't signal a/v eos on subttitle eos
| * | | | | Merge "PlaylistFetcher:don't signal a/v eos on subttitle eos" into lmp-devRobert Shih2014-09-181-0/+17
| |\ \ \ \ \
| | * | | | | PlaylistFetcher:don't signal a/v eos on subttitle eosRobert Shih2014-09-171-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17310061 Change-Id: Ifbca3c12f21171a6e429dca51a250a41051fdd34
* | | | | | | am 21a1d72b: Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-183-33/+117
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '21a1d72bb42710d149532653490154f89330b9dd': NuPlayer: update timestamp handling
| * | | | | | Merge "NuPlayer: update timestamp handling" into lmp-devAndy Hung2014-09-173-33/+117
| |\ \ \ \ \ \
| | * | | | | | NuPlayer: update timestamp handlingAndy Hung2014-09-173-33/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use getTimestamp WOULD_BLOCK error return code to clean up initial playback/start timestamp handling. Account for pause time and seeks. Only send notification from driver when the media time changes. Bug: 14659809 Bug: 17428188 Change-Id: I051bb5e2dd4fd5990474f8fb635615ad8d18eb2c
* | | | | | | | am 83266677: Merge "NuPlayer: use getTimestamp instead of getPosition" into ↵Lajos Molnar2014-09-174-23/+58
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '832666776a681ec3a30ee8fc7d5da9039646147d': NuPlayer: use getTimestamp instead of getPosition
| * | | | | | | Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-devLajos Molnar2014-09-174-23/+58
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | NuPlayer: use getTimestamp instead of getPositionLajos Molnar2014-09-174-23/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14659809 Bug: 16985287 Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
* | | | | | | | am a87be62b: Merge "Fix AudioTrack offloaded timestamp handling." into lmp-devLajos Molnar2014-09-171-5/+93
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a87be62b083fb969aeece99d6c29735ef9a5a373': Fix AudioTrack offloaded timestamp handling.
| * | | | | | | Merge "Fix AudioTrack offloaded timestamp handling." into lmp-devLajos Molnar2014-09-171-5/+93
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix AudioTrack offloaded timestamp handling.Andy Hung2014-09-171-5/+93
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getTimestamp for offloaded tracks now returns WOULD_BLOCK for situations where the timestamp is unavailable due to the previous track still flushing or the timestamp is stale. It is fixed for normal playback conditions. Bug: 14659809 Bug: 17428188 Change-Id: Ic9ec07ccabc604236979769db5c4ea2dec252660
* | | | | | | am 866e028b: Merge "Add support for ANDROID_LOOP to NuPlayer" into lmp-devMarco Nelissen2014-09-177-4/+30
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '866e028bbe30b1ba0b9d8903c88bbe8525b81a37': Add support for ANDROID_LOOP to NuPlayer
generated by cgit v1.1 at 2025-01-08 18:06:30 +0000