summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion ↵Andy Hung2014-11-181-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for decode." into lmp-mr1-dev * commit '1c764234f30941ab18ef2ba55299e2ce036c34b6': Fix race condition in signaling completion for decode.
| * | | | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
| |\ \ \ \ \
| | * | | | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18048775 Change-Id: I2207eb2cf30cf205d9bf414edbb1d3e709185f67
* | | | | | | am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl ↵Robert Shih2014-11-182-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getSelectedTrack" into lmp-mr1-dev * commit '811a92f68dbcab0f88b4be72099d783d3a44c9f6': NuPlayer HTTPLiveSource: impl getSelectedTrack
| * | | | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-172-0/+9
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17514665 Change-Id: I81c62553f2c5acb4d2436a9d8f04c10fdbe315d0
* | | | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-172-2/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | * commit 'd86450b93ab3960ccd68aed14563aaa76b43ce9b': Fix struct vs. class mismatches
| * | | | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-172-2/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-172-4/+3
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-172-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-146-123/+204
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Bug: 18342383 Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
* | | | Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into ↵Lajos Molnar2014-11-131-20/+0
|\ \ \ \ | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | Revert "mediaplayer: make frame-accurate avsync configurable"Lajos Molnar2014-11-071-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reenable PTS scheduling for all playback. This reverts commit 274084f7bfd3f6bdf5a55cf16ceefed345aa0060. Bug: 18111837 Change-Id: Ia734ad304c1f85d2ac302261866be82b8f2a30d4
* | | | | Fix looping sound playbackMarco Nelissen2014-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The renderer stops the audio sink at the end in order to play out the last little bit of audio. When the sound is looping, the sink needs to be restarted. Bug: 18326137 Change-Id: I3bc3629597fc43cce33bdf5691d29cc4c2285926
* | | | | Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-101-0/+4
|\ \ \ \ \
| * | | | | Fix short sound playbackMarco Nelissen2014-11-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack needs to be stopped, not paused, at the end of the file, since otherwise the last bit of queued up audio will not be played. Bug: 18188921 Change-Id: I038aad74a105e163963929c7002b55f377de1442
* | | | | | Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" ↵Robert Shih2014-11-102-11/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | into lmp-mr1-dev
| * | | | | GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUsRobert Shih2014-11-102-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 18296874 Change-Id: I9608523b4cc37e6cf8b91fb1407035aac087796b
* | | | | | Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-devRobert Shih2014-11-101-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | HTTPLiveSource: NULL check in getFormatRobert Shih2014-11-081-0/+4
| |/ / / / | | | | | | | | | | | | | | | Bug: 18297916 Change-Id: I14c5de8d28202ee1b68e369d33e01bd26dbe968d
* | | | | Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer ↵Wei Jia2014-11-065-53/+49
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | resulted from seek." into lmp-mr1-dev
| * | | | AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted ↵Wei Jia2014-11-065-53/+49
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from seek. This will remove the unnecessary flush for seek. Bug: 17511837 Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
* | | | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-062-0/+10
|\ \ \ \
| * | | | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-032-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101 related-to-bug: 16034599
* | | | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-062-0/+30
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Add missing secure stop methodsJeff Tinker2014-10-312-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18053197 b/18076411 Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
* | | | Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-devEric Laurent2014-10-291-1/+1
|\ \ \ \
| * | | | NuPlayer: reduce offload pause teardown timeout.Eric Laurent2014-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Waiting 60 seconds to teardown an offloaded path when paused is not needed and causes unecessary battery drain. 10 seconds is enough to avaoid teardown when it would be problematic (seek, pause for notifications, buffering...). Bug: 13505340. Change-Id: Ibcaa609b59e86ba2bc49539620bd77504d534c0c
* | | | | Merge "NuPlayer: merge start() and resume()." into lmp-mr1-devWei Jia2014-10-293-105/+103
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | NuPlayer: merge start() and resume().Wei Jia2014-10-283-105/+103
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | NuPlayerDriver: allow seekTo called in STOPPED_AND_PREPARED state. Bug: 18127606 Change-Id: I92ff9f7e0a176c434202762d30966d8c4643d1ef
* | | | fix deep buffer logic in NuPlayer.Eric Laurent2014-10-282-7/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deep buffer output should be requested when there is no video track, not when there is one. Also make sure that the deep buffer flag is restored after a failure to offload audio decoding. Bug: 18114624. Change-Id: If3c04c784bc20d77926993ee475fbf961aeba7ae
* | | do not hold mNotifyLock when calling MediaPlayer::notifyChong Zhang2014-10-271-1/+3
|/ / | | | | | | | | Bug:18120688 Change-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6
* | [FM] Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-2/+2
| | | | | | | | | | | | | | | | Review: https://partner-android-review.git.corp.google.com/#/c/185234 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com> Change-Id: I872ce744d23049e251a46aebc4019be5b25e3612
* | mediaplayer: don't report position past last queued positionLajos Molnar2014-10-212-8/+46
|/ | | | | | | also reanchor offloaded audio track correctly Bug: 17653702 Change-Id: If05394d3b119be8d80b7764847496246d34a2133
* mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-202-1/+43
| | | | | | | | | | | | This addresses when video timestamps jumps before an audio timestamp, but still works on slideshow video clips (<=1fps). This, however, will not skip time-changes on video-only live video streams, as we cannot distinguish live slideshow video clips from non-slideshow ones. Bug: 18032127 Change-Id: I959a714edfe1c8cf3b84704c693dcd1b3e5b7855
* NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-202-36/+48
| | | | | | | | | And use anchor time to compute current position Bug: 17999949 Bug: 18008307 Bug: 18032127 Change-Id: Ie493c9a1d45d7b788aef65d863f710da6326fcc1
* move audio sink open/close to NuPlayerRendererChong Zhang2014-10-164-123/+223
| | | | | Bug: 17675112 Change-Id: I7eb3d02380658f848baedafe2aea287586ccf016
* Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-devLajos Molnar2014-10-146-225/+194
|\
| * NuPlayer: query current position from NuPlayerRenderer.Ronghua Wu2014-10-136-225/+194
| | | | | | | | | | Bug: 17653702 Change-Id: Ie0b1f92420b071a0cfcd389f5e7917a54d332541
* | Merge "NuPlayerDriver: request seek notification when prepare*() is called ↵Wei Jia2014-10-131-2/+2
|\ \ | |/ |/| | | in STOPPED state." into lmp-dev
| * NuPlayerDriver: request seek notification when prepare*() is called in ↵Wei Jia2014-10-131-2/+2
| | | | | | | | | | | | STOPPED state. Bug: 17596535 Change-Id: Ib43f91f9b0d0a52112aa1fa8352adac15aaf80f8
* | Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." ↵Wei Jia2014-10-102-1/+19
|\ \ | | | | | | | | | into lmp-dev
| * | NuPlayerRenderer: adjust anchor time correctly for video only case.Wei Jia2014-10-092-1/+19
| |/ | | | | | | | | Bug: 17922171 Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103
* | Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-devAndy Hung2014-10-073-52/+64
|\ \
| * | NuPlayer: wait for renderer flush before decoder shutdownAndy Hung2014-10-063-52/+64
| |/ | | | | | | | | Bug: 17679341 Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0
* | Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." ↵Chong Zhang2014-10-061-0/+1
|\ \ | |/ |/| | | into lmp-dev
| * StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.Praveen Chavan2014-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | Meta-data mode for input is preferred (rather required) for recording with camera v1. This capability is queried and enabled per codec; enable it for VP8 hardware encoder. Bug: 17664960 Change-Id: I4735c61670ebe0a555002cc25ef3ed823ab02f1f
* | NuPlayer: add audioDecoderStillNeeded.Ronghua Wu2014-10-032-3/+10
| | | | | | | | | | Bug: 17752358 Change-Id: Ia3b3ee4df65e5564afd0723943d2d747f3a604af
* | Merge "NuPlayer: don't restart AudioSink when torn down due to pause ↵Ronghua Wu2014-10-033-5/+21
|\ \ | |/ |/| | | timeout." into lmp-dev
| * NuPlayer: don't restart AudioSink when torn down due to pause timeout.Ronghua Wu2014-10-033-5/+21
| | | | | | | | | | Bug: 17752358 Change-Id: I232d105480139bfc0b991bcd8e001930e577cf30
generated by cgit v1.1 at 2024-09-09 11:40:05 +0000