summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* am 9b68037c: am f0d98899: am aaa527fb: Merge "send available codec buffer ↵Chong Zhang2014-10-031-4/+12
|\ | | | | | | | | | | | | count with codec notification" into lmp-dev * commit '9b68037c1f3fcf2a390dd796fb31b1d873fe4bea': send available codec buffer count with codec notification
| * Merge "send available codec buffer count with codec notification" into lmp-devChong Zhang2014-10-031-4/+12
| |\
| | * send available codec buffer count with codec notificationChong Zhang2014-10-021-4/+12
| | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154
* | | am 9236887a: am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if ↵Lajos Molnar2014-10-031-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | setting default profile" into lmp-dev * commit '9236887ac5dfa526d1a90dd5e0a3c3095f443e70': mediarecorder: set level if setting default profile
| * | Merge "mediarecorder: set level if setting default profile" into lmp-devLajos Molnar2014-10-021-0/+5
| |\ \
| | * | mediarecorder: set level if setting default profileLajos Molnar2014-10-021-0/+5
| | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
* | | | am f893459f: am 86c541dc: am 6eff943c: Merge "NuPlayerDecoder: postpone ↵Wei Jia2014-10-022-8/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | input message processing when it\'s not dequeued." into lmp-dev * commit 'f893459ff569c240bd525b1a2176da4192501eaa': NuPlayerDecoder: postpone input message processing when it's not dequeued.
| * | | Merge "NuPlayerDecoder: postpone input message processing when it's not ↵Wei Jia2014-10-022-8/+31
| |\ \ \ | | | | | | | | | | | | | | | dequeued." into lmp-dev
| | * | | NuPlayerDecoder: postpone input message processing when it's not dequeued.Wei Jia2014-10-022-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17622642 Change-Id: I67608121bf70d6acb152e4aa64892b11bf167e8c
* | | | | am f973c881: resolved conflicts for merge of 55fc6a77 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-021-30/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f973c881e3f3c1cbb91e4eb0e65f57bb23ed5758': stagefright: move math templates into AUtils.h
| * | | | Merge "stagefright: move math templates into AUtils.h" into lmp-devLajos Molnar2014-10-021-30/+1
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | stagefright: move math templates into AUtils.hLajos Molnar2014-10-011-30/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | add unit test for math templates Bug: 17676461 Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319
* | | | am d7bdfd7d: am cfe3ba6b: am d8b03abf: Merge "NuPlayer: Fix flush mode ↵Andy Hung2014-10-026-28/+103
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | decoder error handling" into lmp-dev * commit 'd7bdfd7d33789965988079e3a03ec1233f1f5896': NuPlayer: Fix flush mode decoder error handling
| * | | Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-devAndy Hung2014-10-026-28/+103
| |\ \ \ | | |/ / | |/| |
| | * | NuPlayer: Fix flush mode decoder error handlingAndy Hung2014-10-016-28/+103
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly handle each flush mode upon decoder error. Do not clear out affected decoder immediately. Alter logcat messages for better diagnostics. Bug: 17638878 Bug: 17679341 Change-Id: I219796c04d65d7c4dd61c0d4f99f9f580241a68b
* | | am b76c2702: am 8359c43a: am 3af67d03: Merge "GenericSource: support ↵Robert Shih2014-10-022-2/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnect before NuCachedSource2 is created" into lmp-dev * commit 'b76c2702fcae662b7ac0523d4735ef90c0f6dbba': (32 commits) GenericSource: support disconnect before NuCachedSource2 is created Camera1 shim: If there's no flash, the keys need to be null. NuCachedSource2: more fixes for source read hang NuPlayer: change assert to conditional check. Camera2Client: log an error when autoFocus is called in wrong state NuPlayer: use generation to filter out stale message from renderer. MediaBuffer: ABuffer will release MediaBuffer when it's destructed. AudioEffect acquires session Add support for ANDROID_LOOP to NuPlayer StagefrightRecorder: default to codec and fps from camcorder low profile AudioPolicyManager: Use "safe" speaker for notifications if available mediaplayer: release MediaBuffer in stale input buffers NuPlayerDriver: do not set to paused state when receiving playback complete and reset is in progress. Revert "Fix AAC timestamps for multiple aac frames per input buffer" fix failure in MediaCodecTest#testException mediaplayer: limit number of outstanding buffer requests NuPlayer: make previous decoders obsolete when reset is done. NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning. NuPlayer: check mSource before deferencing it. Move stale handler cleanup to constructor ...
| * | Merge "GenericSource: support disconnect before NuCachedSource2 is created" ↵Robert Shih2014-10-012-2/+21
| |\ \ | | | | | | | | | | | | into lmp-dev
| | * | GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-012-2/+21
| | |/ | | | | | | | | | | | | Bug: 17672488 Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac
* | | am 87129bcf: am 41b9ef26: Merge "mediaplayer: make frame-accurate avsync ↵Lajos Molnar2014-10-011-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | configurable" into lmp-dev * commit '87129bcf0aff6b8dd37a871fece451d49bb8f889': mediaplayer: make frame-accurate avsync configurable
| * | mediaplayer: make frame-accurate avsync configurableLajos Molnar2014-09-291-0/+20
| |/ | | | | | | | | | | | | disable by default Bug: 17686015 Change-Id: I3961b1bc9c6d48afc8c5f7f5270528ea6341bc60
* | am 18e10cb1: am 0ed72488: Merge "NuPlayer: use format obtained from source ↵Wei Jia2014-09-261-1/+1
|\ \ | |/ | | | | | | | | | | to tell if video exists." into lmp-dev * commit '18e10cb19395ba8758d484cb962c9f38e30adba4': NuPlayer: use format obtained from source to tell if video exists.
| * NuPlayer: use format obtained from source to tell if video exists.Wei Jia2014-09-251-1/+1
| | | | | | | | | | Bug: 17374216 Change-Id: I2d5f90d72b70684475d67ff8f41b803c2880840b
* | am 3529b78d: am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into ↵Andy Hung2014-09-252-14/+39
|\ \ | |/ | | | | | | | | | | lmp-dev * commit '3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7': NuPlayer: Fix decoder error handling
| * Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-252-14/+39
| |\
| | * NuPlayer: Fix decoder error handlingAndy Hung2014-09-242-14/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon error, release MediaCodec after flushing data. Report errors when they occur with ALOGE. Fix onInputBufferFilled mInputBufferIsDequeued check. Bug: 17423087 Bug: 17622642 Change-Id: I316601a19d5ec95cf8e14f5bc0418a05ec423041
* | | am 376a8353: am 9a70c2c4: Merge "Fix Widevine classic playback errors with ↵Lajos Molnar2014-09-251-1/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | NuPlayer" into lmp-dev * commit '376a8353901533268d21a0e2041c75cd9f2f04da': Fix Widevine classic playback errors with NuPlayer
| * | Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-devLajos Molnar2014-09-251-1/+8
| |\ \
| | * | Fix Widevine classic playback errors with NuPlayerJeff Tinker2014-09-241-1/+8
| | | | | | | | | | | | | | | | | | | | bug: 17589961 Change-Id: If16c61b90cf92caa89eecd66aabef5813fd7619b
* | | | am 6210ce1c: am 207fc297: Merge "mediaplayer: handle bad input in ↵Lajos Molnar2014-09-252-4/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | VideoFrameScheduler" into lmp-dev * commit '6210ce1c6c753d9c232d18a886b2b89ab138f3bc': mediaplayer: handle bad input in VideoFrameScheduler
| * | | mediaplayer: handle bad input in VideoFrameSchedulerLajos Molnar2014-09-242-4/+17
| | | | | | | | | | | | | | | | | | | | Bug: 17626098 Change-Id: I2ae22ed43b35ff532a47818b118dd328ce2abf63
* | | | am 3709974f: am 50373731: Merge "NuPlayerDecoder: release MediaBuffers when ↵Wei Jia2014-09-251-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | decoder is deleted." into lmp-dev * commit '3709974f26e9661d512ae995123f2b22db51dc66': NuPlayerDecoder: release MediaBuffers when decoder is deleted.
| * | | NuPlayerDecoder: release MediaBuffers when decoder is deleted.Wei Jia2014-09-241-0/+4
| | |/ | |/| | | | | | | | | | Bug: 17454455 Change-Id: Ic984c74826f87f5f3c27756a7e7d52295a529bed
* | | am d996c469: am fc55783d: Merge "NuPlayer will notify SeekComplete only when ↵Wei Jia2014-09-243-19/+29
|\ \ \ | |/ / | | | | | | | | | | | | | | | requested so." into lmp-dev * commit 'd996c4698bda072866d77bac9e9a7685a2c9349b': NuPlayer will notify SeekComplete only when requested so.
| * | Merge "NuPlayer will notify SeekComplete only when requested so." into lmp-devWei Jia2014-09-243-19/+29
| |\ \
| | * | NuPlayer will notify SeekComplete only when requested so.Wei Jia2014-09-233-19/+29
| | |/ | | | | | | | | | | | | Bug: 17596535 Change-Id: I6b744fdcf80f11d521d26c7c8b45f7de70aa0dc3
* | | am c090e902: am 7e9f7f7a: NuPlayer: change assert to conditional check.Wei Jia2014-09-241-6/+20
|\ \ \ | |/ / | | | | | | | | | * commit 'c090e90241bcf0475f48f930e0f592e8716b8d15': NuPlayer: change assert to conditional check.
| * | NuPlayer: change assert to conditional check.Wei Jia2014-09-231-6/+20
| | | | | | | | | | | | | | | Bug: 17491050 Change-Id: I657866c5342c227d57617eb89955897171eb5976
* | | am 817c28d7: am 3cdd6b8c: Merge "NuPlayer: add pause timeout event for ↵Ronghua Wu2014-09-232-1/+46
|\ \ \ | |/ / | | | | | | | | | | | | | | | offload audio." into lmp-dev * commit '817c28d71d0d68a6eb25057bd04e555dc0b85cc4': NuPlayer: add pause timeout event for offload audio.
| * | Merge "NuPlayer: add pause timeout event for offload audio." into lmp-devRonghua Wu2014-09-232-1/+46
| |\ \
| | * | NuPlayer: add pause timeout event for offload audio.Ronghua Wu2014-09-222-1/+46
| | | | | | | | | | | | | | | | | | | | Bug: 17375249 Change-Id: Ie59c6b372e9ad2aace3d1e27b9896d79de35d722
* | | | am 888451fb: am ad5447f6: Merge "NuPlayer: use generation to filter out ↵Wei Jia2014-09-232-7/+20
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | stale message from renderer." into lmp-dev * commit '888451fbabf574a09b33a01db821a0a2d4a00add': NuPlayer: use generation to filter out stale message from renderer.
| * | | 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 0973af24: am 0079b331: Merge "MediaBuffer: ABuffer will release ↵Wei Jia2014-09-232-19/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | MediaBuffer when it\'s destructed." into lmp-dev * commit '0973af247786ff1be980390cc274364fca6b2d6e': MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
| * | Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." ↵Wei Jia2014-09-222-19/+4
| |\ \ | | | | | | | | | | | | into lmp-dev
| | * | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-192-19/+4
| | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
* | | | am ee919f19: am 8d6ae6d9: Merge "mediaplayer: smooth out videoplayback based ↵Lajos Molnar2014-09-205-3/+446
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | on framerate" into lmp-dev * commit 'ee919f191c059594d2ac4f4468db518c29ec87b6': 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 54c4dbda: am 3bde6b1c: Merge "Make prepare properly report failure again" ↵Marco Nelissen2014-09-201-1/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '54c4dbda0c9590b669266a76e8397ed5ad9a7aea': 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
generated by cgit v1.1 at 2024-11-12 10:21:28 +0000