OSDN Git Service

android-x86/frameworks-av.git
9 years agomediaplayer: limit scheduling video frames into the future
Lajos Molnar [Tue, 21 Oct 2014 00:47:54 +0000 (17:47 -0700)]
mediaplayer: limit scheduling video frames into the future

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

9 years agoNuPlayer: set anchor time for each audio buffer.
Ronghua Wu [Mon, 20 Oct 2014 06:12:50 +0000 (23:12 -0700)]
NuPlayer: set anchor time for each audio buffer.

And use anchor time to compute current position

Bug: 17999949
Bug: 18008307
Bug: 18032127
Change-Id: Ie493c9a1d45d7b788aef65d863f710da6326fcc1

9 years agoFix the fix
Marco Nelissen [Mon, 20 Oct 2014 20:15:38 +0000 (13:15 -0700)]
Fix the fix

We need to clear the buffer a little more often.

Bug: 18023017
Change-Id: If8a522b9133a4269e2435af8958f6ced322e71e9

9 years agoMerge "Clear effect buffer before sending to chain" into lmp-dev
Marco Nelissen [Mon, 20 Oct 2014 14:44:58 +0000 (14:44 +0000)]
Merge "Clear effect buffer before sending to chain" into lmp-dev

9 years agoClear effect buffer before sending to chain
Marco Nelissen [Fri, 17 Oct 2014 23:39:39 +0000 (16:39 -0700)]
Clear effect buffer before sending to chain

otherwise the effect might get a buffer with previous data instead
of silence.

Bug: 18023017
Change-Id: Ic6be5ce0e74552aac2a0cce9c660893f9ad27f5c

9 years agoMerge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev
Andy Hung [Fri, 17 Oct 2014 20:38:10 +0000 (20:38 +0000)]
Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev

9 years agoFix AudioTrack retrograde getPosition when restoring tracks
Andy Hung [Fri, 17 Oct 2014 00:54:34 +0000 (17:54 -0700)]
Fix AudioTrack retrograde getPosition when restoring tracks

mReleased represents the number of frames written to the
track, but was cleared on start() causing a mismatch if the
client wrote to the track before starting.  Moved the clearing
to entering the STATE_STOPPED or STATE_FLUSHED state.

Bug: 18017947
Bug: 18022276
Change-Id: I3788c98c4c3c4d9cc004378432797b3f3138e22e

9 years agoMerge "move audio sink open/close to NuPlayerRenderer" into lmp-dev
Chong Zhang [Fri, 17 Oct 2014 01:10:23 +0000 (01:10 +0000)]
Merge "move audio sink open/close to NuPlayerRenderer" into lmp-dev

9 years agomove audio sink open/close to NuPlayerRenderer
Chong Zhang [Thu, 16 Oct 2014 00:05:08 +0000 (17:05 -0700)]
move audio sink open/close to NuPlayerRenderer

Bug: 17675112
Change-Id: I7eb3d02380658f848baedafe2aea287586ccf016

9 years agoMerge "Fix freed memory references" into lmp-dev
Lajos Molnar [Thu, 16 Oct 2014 18:59:22 +0000 (18:59 +0000)]
Merge "Fix freed memory references" into lmp-dev

9 years agoam b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT...
Chris Elliott [Thu, 16 Oct 2014 18:23:13 +0000 (18:23 +0000)]
am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit 'b6dcdbf436ffacb52a41ac8ef9b07f99fd64779f':
  Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

9 years agoFix freed memory references
Marco Nelissen [Thu, 16 Oct 2014 17:51:23 +0000 (10:51 -0700)]
Fix freed memory references

MPEG4Source references memory owned by MPEG4Extractor, and therefore an
MPEG4Extractor needs to be kept around as long as the MPEG4Sources obtained
from it exist.

Bug: 17890354
Change-Id: I399e18ec78517559ccc0914ffc7e099687c0ba51

9 years agoRevert "audio: prevent larger than required sleeps - DO NOT MERGE"
Chris Elliott [Thu, 16 Oct 2014 02:17:27 +0000 (02:17 +0000)]
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

Revert change if we require a build beyond P

This reverts commit 620208dc0bbd7a0792702df3ab08800fdad60cec.

Change-Id: I07f65e35dbd9f814725f50f7bb346f7b285f41aa

9 years agoaudio policy: Fix for voice call audio loss
Haynes Mathew George [Mon, 13 Oct 2014 20:05:22 +0000 (13:05 -0700)]
audio policy: Fix for voice call audio loss

Audio Policy service filters out one of the create patch
commands when it finds two pending commands with the same
patch handles. Due to this routing command is not received
to audio HAL and the voice call set up fails.
Fix this by filtering create patch commands only when
they are issued on the same output.

authored-by: Karthik Reddy Katta <a_katta@codeaurora.org>

Bug: 17787282
Change-Id: If36f0ab71e9b72d6a8eb61d31f762bc5e1683b89

9 years agoam 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE
Chris Elliott [Wed, 15 Oct 2014 22:10:42 +0000 (22:10 +0000)]
am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '620208dc0bbd7a0792702df3ab08800fdad60cec':
  audio: prevent larger than required sleeps - DO NOT MERGE

9 years agoaudio: prevent larger than required sleeps - DO NOT MERGE
Chris Elliott [Wed, 15 Oct 2014 20:46:15 +0000 (20:46 +0000)]
audio: prevent larger than required sleeps - DO NOT MERGE

This will be cherry picked into P build after O completes for other devices.

This reverts the revert from commit 2feb18ddfdbd20941ebcc3314780a582da5608e4.

b/17962037

From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Wed, 26 Mar 2014 16:18:42 -0700
Subject: [PATCH] AudioTrack: prevent larger than required sleeps

AudioTrackThread can end up waiting for larger than necessary
time for free space to be available in the cblk. Fix this by
waiting on the cblk futex instead of the (internal) condition variable.

Change-Id: Iba5b266f9b4082b3833f4abd52ebc6601c8e3034

9 years agoam 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT...
Chris Elliott [Wed, 15 Oct 2014 19:11:37 +0000 (19:11 +0000)]
am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

* commit '2feb18ddfdbd20941ebcc3314780a582da5608e4':
  Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

9 years agoRevert "audio: prevent larger than required sleeps - DO NOT MERGE"
Chris Elliott [Wed, 15 Oct 2014 00:49:17 +0000 (00:49 +0000)]
Revert "audio: prevent larger than required sleeps - DO NOT MERGE"

This reverts commit 8c0417c173d1fd618ae54e2d721b0ec360ea70cc.

Reverting as we only wanted to include this CL the KNX01M build

Change-Id: Ib53292de658078285a38710915168e1746486fea

9 years agoMerge "Camera2Client: avoid two consecutive sets of configure_streams calls" into...
Zhijun He [Tue, 14 Oct 2014 23:31:50 +0000 (23:31 +0000)]
Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev

9 years agoam 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE
Haynes Mathew George [Tue, 14 Oct 2014 22:03:36 +0000 (22:03 +0000)]
am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGE

* commit '8c0417c173d1fd618ae54e2d721b0ec360ea70cc':
  audio: prevent larger than required sleeps - DO NOT MERGE

9 years agoCamera2Client: avoid two consecutive sets of configure_streams calls
Zhijun He [Tue, 14 Oct 2014 05:20:37 +0000 (22:20 -0700)]
Camera2Client: avoid two consecutive sets of configure_streams calls

When mediaRecorder starts without an active preview stream, Camera2Client
starts preview then immediately start recording, which could cause the second
configure_streams to call into HAL before any preview request is sent. This
could cause HAL to run into bad state. This change work around this issue
by making sure the first preview request is submitted to the HAL before
start recording.

Bug: 17915062
Change-Id: I94ae64ee76487603695a469240da601ddcb29a66

9 years agoaudio: prevent larger than required sleeps - DO NOT MERGE
Haynes Mathew George [Thu, 9 Oct 2014 12:06:00 +0000 (20:06 +0800)]
audio: prevent larger than required sleeps - DO NOT MERGE

b/17962037

From: Haynes Mathew George <hgeorge@codeaurora.org>
Date: Wed, 26 Mar 2014 16:18:42 -0700
Subject: [PATCH] AudioTrack: prevent larger than required sleeps

AudioTrackThread can end up waiting for larger than necessary
time for free space to be available in the cblk. Fix this by
waiting on the cblk futex instead of the (internal) condition variable.

Change-Id: I75bd14cd46f3b75afe0ea8bd9b48d7a2f95f654a

9 years agoMerge "ACodec: only check crop rect on output port" into lmp-dev
Lajos Molnar [Tue, 14 Oct 2014 08:31:20 +0000 (08:31 +0000)]
Merge "ACodec: only check crop rect on output port" into lmp-dev

9 years agoMerge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev
Lajos Molnar [Tue, 14 Oct 2014 08:00:15 +0000 (08:00 +0000)]
Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-dev

9 years agostagefright: fix surface input handling of software encoders
Lajos Molnar [Sat, 11 Oct 2014 00:15:17 +0000 (17:15 -0700)]
stagefright: fix surface input handling of software encoders

- added SoftVideoEncoder for common color conversion and
  extension handling logic
- fix YUV420 SemiPlanar handling that should be NV12 not NV21

Bug: 17935149
Change-Id: I9b8d05678b1862dd37bf349ea83d67bdf1bb5560

9 years agostagefright: support passing GraphicBuffer in metadata buffer
Lajos Molnar [Sat, 11 Oct 2014 00:14:17 +0000 (17:14 -0700)]
stagefright: support passing GraphicBuffer in metadata buffer

Bug: 17935149
Change-Id: I6bb5dd654e498a7153410afc052c2c8f7f35e44d

9 years agoNuPlayer: query current position from NuPlayerRenderer.
Ronghua Wu [Wed, 8 Oct 2014 22:13:29 +0000 (15:13 -0700)]
NuPlayer: query current position from NuPlayerRenderer.

Bug: 17653702
Change-Id: Ie0b1f92420b071a0cfcd389f5e7917a54d332541

9 years agoMerge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED...
Wei Jia [Mon, 13 Oct 2014 20:27:43 +0000 (20:27 +0000)]
Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state." into lmp-dev

9 years agoNuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
Wei Jia [Sat, 11 Oct 2014 22:33:00 +0000 (15:33 -0700)]
NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.

Bug: 17596535
Change-Id: Ib43f91f9b0d0a52112aa1fa8352adac15aaf80f8

9 years agoMerge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
Chong Zhang [Mon, 13 Oct 2014 19:48:51 +0000 (19:48 +0000)]
Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

9 years agoMerge "ACodec: process deferred messages when entering Loaded state." into lmp-dev
Wei Jia [Mon, 13 Oct 2014 18:41:03 +0000 (18:41 +0000)]
Merge "ACodec: process deferred messages when entering Loaded state." into lmp-dev

9 years agohandle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
Chong Zhang [Mon, 13 Oct 2014 05:28:11 +0000 (22:28 -0700)]
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat

Bug: 17935293
Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e

9 years agoMerge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev
Guang Zhu [Mon, 13 Oct 2014 00:02:36 +0000 (00:02 +0000)]
Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev

9 years agoRevert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
Guang Zhu [Mon, 13 Oct 2014 00:02:20 +0000 (00:02 +0000)]
Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"

Bug: 17935293

fix 64-bit builds

This reverts commit 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b.

Change-Id: Ifbc499342fb47fd67cae02a79cb900e701caed68

9 years agoMerge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev
Dave Burke [Sun, 12 Oct 2014 05:30:16 +0000 (05:30 +0000)]
Merge "Revert "audio policy: add support for ro.audio.media_deep_buffer"" into lmp-dev

9 years agoRevert "audio policy: add support for ro.audio.media_deep_buffer"
Vineeta Srivastava [Sat, 11 Oct 2014 21:59:36 +0000 (21:59 +0000)]
Revert "audio policy: add support for ro.audio.media_deep_buffer"

This reverts commit 95511add8ad4d440c67272503559f5042c4e6f1f.

Change-Id: I76a8b86790b06b08d8ca0f8d374e585f964ffba8

9 years agoACodec: process deferred messages when entering Loaded state.
Wei Jia [Sat, 11 Oct 2014 01:13:00 +0000 (18:13 -0700)]
ACodec: process deferred messages when entering Loaded state.

Bug: 17792260
Change-Id: Ie8154cf41be5672fc8a9f3a2a82b7ede0a8b828f

9 years agoMerge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev
Eric Laurent [Fri, 10 Oct 2014 23:39:36 +0000 (23:39 +0000)]
Merge "audio policy: add support for ro.audio.media_deep_buffer" into lmp-dev

9 years agoaudio policy: add support for ro.audio.media_deep_buffer
Eric Laurent [Fri, 10 Oct 2014 22:31:38 +0000 (15:31 -0700)]
audio policy: add support for ro.audio.media_deep_buffer

Bug: 17931716.
Change-Id: Ife170f20f5d02b71059fbd384bd29759fafee826

9 years agoMerge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev
Chong Zhang [Fri, 10 Oct 2014 22:19:44 +0000 (22:19 +0000)]
Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

9 years agoaudio policy: move intializations to onFirstRef()
Eric Laurent [Fri, 10 Oct 2014 00:49:00 +0000 (17:49 -0700)]
audio policy: move intializations to onFirstRef()

Bug: 17896324.

Change-Id: I3bb74f5397142ac354bd815eb362e5ddacdcb463

9 years agohandle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
Chong Zhang [Fri, 10 Oct 2014 04:33:53 +0000 (21:33 -0700)]
handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat

Bug: 17935293
Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088

9 years agoMerge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev
Lajos Molnar [Fri, 10 Oct 2014 03:05:40 +0000 (03:05 +0000)]
Merge "MediaCodec: fix onError and onInputBufferAvailable" into lmp-dev

9 years agoMerge "NuPlayerRenderer: adjust anchor time correctly for video only case." into...
Wei Jia [Fri, 10 Oct 2014 00:30:58 +0000 (00:30 +0000)]
Merge "NuPlayerRenderer: adjust anchor time correctly for video only case." into lmp-dev

9 years agoMediaCodec: fix onError and onInputBufferAvailable
Lajos Molnar [Thu, 9 Oct 2014 23:32:33 +0000 (16:32 -0700)]
MediaCodec: fix onError and onInputBufferAvailable

- don't call onInputBufferAvailable if we created an input surface
- keep component name alive if an error occurs

Bug: 17934966
Change-Id: I396c6e6cfd9fa589a1a95c6169492089255e6993

9 years agoMerge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev
Marco Nelissen [Thu, 9 Oct 2014 19:34:31 +0000 (19:34 +0000)]
Merge "Fix VideoFrame class layout for 64/32 bit" into lmp-dev

9 years agoNuPlayerRenderer: adjust anchor time correctly for video only case.
Wei Jia [Thu, 9 Oct 2014 01:44:45 +0000 (18:44 -0700)]
NuPlayerRenderer: adjust anchor time correctly for video only case.

Bug: 17922171
Change-Id: I4c7e9e7f5ab96d3675d012ae30f78ef945394103

9 years agoFix VideoFrame class layout for 64/32 bit
Marco Nelissen [Thu, 9 Oct 2014 16:47:12 +0000 (09:47 -0700)]
Fix VideoFrame class layout for 64/32 bit

This structure is passed between 64 and 32 bit processes via shared
memory, so ensure it's the same size, and that the members we care
about are in the same place.

Bug: 17569156
Change-Id: Id776bc825af1fbf43a6dd3407cca064f6d932902

9 years agoACodec: only check crop rect on output port
Lajos Molnar [Wed, 8 Oct 2014 01:42:45 +0000 (18:42 -0700)]
ACodec: only check crop rect on output port

Bug: 17789956
Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a

9 years agoMerge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev
Eric Laurent [Wed, 8 Oct 2014 00:16:25 +0000 (00:16 +0000)]
Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev

9 years agoAudioTrack: fix AudioTrackThread crash upon exit
Eric Laurent [Tue, 7 Oct 2014 22:45:14 +0000 (15:45 -0700)]
AudioTrack: fix AudioTrackThread crash upon exit

In case of error during createTrack_l(), there is a possibility
that a newly created AudioTrackThread is resumed by requestExit()
just after entering the Thread class _threadLoop() but before
entering the class threadLoop(). In this case, processAudioBuffer()
is executed once with mCblk == 0 and we assert.

Bug: 17894033.
Change-Id: I93d0d0d4dbf14bcb88dad23e6ad49d2ecd47badd

9 years agoMerge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev
Eric Laurent [Tue, 7 Oct 2014 20:46:02 +0000 (20:46 +0000)]
Merge "audio policy: fix build with USE_LEGACY_AUDIO_POLICY" into lmp-dev

9 years agoMerge "audio policy: fix lockup during mediaserver restart" into lmp-dev
Eric Laurent [Tue, 7 Oct 2014 20:45:51 +0000 (20:45 +0000)]
Merge "audio policy: fix lockup during mediaserver restart" into lmp-dev

9 years agoMerge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev
Andy Hung [Tue, 7 Oct 2014 20:35:48 +0000 (20:35 +0000)]
Merge "NuPlayer: wait for renderer flush before decoder shutdown" into lmp-dev

9 years agoMerge "Recover from errors" into lmp-dev
Marco Nelissen [Tue, 7 Oct 2014 19:31:16 +0000 (19:31 +0000)]
Merge "Recover from errors" into lmp-dev

9 years agoaudio policy: fix build with USE_LEGACY_AUDIO_POLICY
Eric Laurent [Tue, 7 Oct 2014 16:19:31 +0000 (09:19 -0700)]
audio policy: fix build with USE_LEGACY_AUDIO_POLICY

Bug: 17894512.
Change-Id: I6431c0b03ba02cf561413c34848a334caa0261fa

9 years agoaudio policy: fix lockup during mediaserver restart
Eric Laurent [Tue, 7 Oct 2014 16:08:47 +0000 (09:08 -0700)]
audio policy: fix lockup during mediaserver restart

When pre or post processing effects are applied by audio policy service
automatically there is a potential lockup if the first call into
AudioPolicyService is made while creating one of those effects.
This is because effects are created with AudioPolicyService mutex held and
effect creation calls into methods (e.g registerClient()) which also acquire
the mutex.

The fix consists in adding a new mutex to AudioPolicyEffects class and not
hold the AudioPolicyService mutex when calling methods in of class.

Bug: 17830596.
Change-Id: Ie61c3671d3147f46e99ba208f39c1a3bf180779f

9 years agoMerge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev
Rachad [Tue, 7 Oct 2014 01:56:59 +0000 (01:56 +0000)]
Merge "stagefright: do not allocate output buffers for tunneled playback" into lmp-dev

9 years agoRecover from errors
Marco Nelissen [Sun, 5 Oct 2014 20:15:16 +0000 (13:15 -0700)]
Recover from errors

When the AAC decoder encounters an error, the lists of submitted
and consumed sizes need to be resynchronized, to prevent timestamp
drift.

Bug: 17638652
Change-Id: Ia6d5f48dc36be355803589e4a5796b01559942b8

9 years agoMerge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into...
Chong Zhang [Mon, 6 Oct 2014 18:39:27 +0000 (18:39 +0000)]
Merge "StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder." into lmp-dev

9 years agoStageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.
Praveen Chavan [Mon, 6 Oct 2014 07:37:28 +0000 (00:37 -0700)]
StageFrightRecorder: Enable meta-data mode for VP8 hardware encoder.

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

9 years agoNuPlayer: wait for renderer flush before decoder shutdown
Andy Hung [Fri, 3 Oct 2014 16:53:53 +0000 (09:53 -0700)]
NuPlayer: wait for renderer flush before decoder shutdown

Bug: 17679341
Change-Id: Ie3883686891e7ee6fb45ceb01af1eb60b559d3a0

9 years agoMerge "NuPlayer: add audioDecoderStillNeeded." into lmp-dev
Ronghua Wu [Mon, 6 Oct 2014 15:38:17 +0000 (15:38 +0000)]
Merge "NuPlayer: add audioDecoderStillNeeded." into lmp-dev

9 years agoMerge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev
Chong Zhang [Sat, 4 Oct 2014 01:35:42 +0000 (01:35 +0000)]
Merge "MediaRecorder: only dequeue available buffers from MediaCodec" into lmp-dev

9 years agoNuPlayer: add audioDecoderStillNeeded.
Ronghua Wu [Fri, 3 Oct 2014 22:19:10 +0000 (15:19 -0700)]
NuPlayer: add audioDecoderStillNeeded.

Bug: 17752358
Change-Id: Ia3b3ee4df65e5564afd0723943d2d747f3a604af

9 years agoMediaRecorder: only dequeue available buffers from MediaCodec
Chong Zhang [Fri, 3 Oct 2014 23:12:37 +0000 (16:12 -0700)]
MediaRecorder: only dequeue available buffers from MediaCodec

Bug: 17514968
Change-Id: If232f92d163deb2440b927315c69e0c4d51ca290

9 years agoMerge "NuPlayer: don't restart AudioSink when torn down due to pause timeout." into...
Ronghua Wu [Fri, 3 Oct 2014 21:51:37 +0000 (21:51 +0000)]
Merge "NuPlayer: don't restart AudioSink when torn down due to pause timeout." into lmp-dev

9 years agoNuPlayer: don't restart AudioSink when torn down due to pause timeout.
Ronghua Wu [Thu, 2 Oct 2014 23:55:52 +0000 (16:55 -0700)]
NuPlayer: don't restart AudioSink when torn down due to pause timeout.

Bug: 17752358
Change-Id: I232d105480139bfc0b991bcd8e001930e577cf30

9 years agoMerge "audioflinger: fix pre processing transfer between record threads." into lmp-dev
Eric Laurent [Fri, 3 Oct 2014 20:37:46 +0000 (20:37 +0000)]
Merge "audioflinger: fix pre processing transfer between record threads." into lmp-dev

9 years agoMerge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev
Ronghua Wu [Fri, 3 Oct 2014 18:07:50 +0000 (18:07 +0000)]
Merge "stagefright: fix fake-stride handling for H263 SW decoder" into lmp-dev

9 years agoMerge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into...
Glenn Kasten [Fri, 3 Oct 2014 18:04:57 +0000 (18:04 +0000)]
Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev

9 years agostagefright: fix fake-stride handling for H263 SW decoder
Ronghua Wu [Thu, 2 Oct 2014 18:21:08 +0000 (11:21 -0700)]
stagefright: fix fake-stride handling for H263 SW decoder

- Use outputBufferWidth/Height to init H263 decoder.
- Handle stride change when using fake stride.

Bug: 17773094
Bug: 17326758
Change-Id: I66ce7b9c650383456923d75417c590e3a8a814e7

9 years agoaudioflinger: fix pre processing transfer between record threads.
Eric Laurent [Fri, 3 Oct 2014 02:41:47 +0000 (19:41 -0700)]
audioflinger: fix pre processing transfer between record threads.

Fix two problems remaining with pre processing effects transfer from
one record thread to the next in case of tear down due to device connection:
1 - the enabled state of the effects was not communicated to the new HAL
input stream.
2 - the effects saved in orphan chains list were not transfered to the
new thread when a AudioRecord was created.

Bug: 17757378.
Change-Id: I0923c98470db3b51154dc89846157780a4c21e86

9 years agoMerge "send available codec buffer count with codec notification" into lmp-dev
Chong Zhang [Fri, 3 Oct 2014 01:31:21 +0000 (01:31 +0000)]
Merge "send available codec buffer count with codec notification" into lmp-dev

9 years agoFix uncertainty of one normal mix buffer in AudioTrack::getTimestamp
Glenn Kasten [Sun, 28 Sep 2014 21:41:07 +0000 (14:41 -0700)]
Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp

The per-thread timestamp latch was not synchronized with the per-track
released frames.  Now the value of each track's released frames is
latched along with the timestamp.

Bug: 17531839
Bug: 17669342
Change-Id: I9d50c8c6a5de55a3f4561ac40e20d497376c1257

9 years agoMerge "mediarecorder: set level if setting default profile" into lmp-dev
Lajos Molnar [Thu, 2 Oct 2014 23:41:54 +0000 (23:41 +0000)]
Merge "mediarecorder: set level if setting default profile" into lmp-dev

9 years agoMerge "NuPlayerDecoder: postpone input message processing when it's not dequeued...
Wei Jia [Thu, 2 Oct 2014 23:18:49 +0000 (23:18 +0000)]
Merge "NuPlayerDecoder: postpone input message processing when it's not dequeued." into lmp-dev

9 years agoMerge "stagefright: move math templates into AUtils.h" into lmp-dev
Lajos Molnar [Thu, 2 Oct 2014 22:44:17 +0000 (22:44 +0000)]
Merge "stagefright: move math templates into AUtils.h" into lmp-dev

9 years agosend available codec buffer count with codec notification
Chong Zhang [Tue, 30 Sep 2014 20:12:22 +0000 (13:12 -0700)]
send available codec buffer count with codec notification

Bug: 14679336
Change-Id: Id927c96a9a14dd6ecd72540f0037d5841aa32154

9 years agoNuPlayerDecoder: postpone input message processing when it's not dequeued.
Wei Jia [Thu, 2 Oct 2014 22:12:25 +0000 (15:12 -0700)]
NuPlayerDecoder: postpone input message processing when it's not dequeued.

Bug: 17622642
Change-Id: I67608121bf70d6acb152e4aa64892b11bf167e8c

9 years agomediarecorder: set level if setting default profile
Lajos Molnar [Thu, 2 Oct 2014 04:36:51 +0000 (21:36 -0700)]
mediarecorder: set level if setting default profile

Bug: 17676461
Change-Id: If01ccd09935945d330de0842be95c3544951b6b9

9 years agoMerge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev
Andy Hung [Thu, 2 Oct 2014 14:26:01 +0000 (14:26 +0000)]
Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev

9 years agostagefright: move math templates into AUtils.h
Lajos Molnar [Thu, 2 Oct 2014 04:30:20 +0000 (21:30 -0700)]
stagefright: move math templates into AUtils.h

add unit test for math templates

Bug: 17676461
Change-Id: Ie964c5fcfcca1ec53b4538f8e577392e8fbb4319

9 years agoNuPlayer: Fix flush mode decoder error handling
Andy Hung [Tue, 30 Sep 2014 21:40:32 +0000 (14:40 -0700)]
NuPlayer: Fix flush mode decoder error handling

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

9 years agoMerge "camera2: Force DNG previews to render with LSC map." into lmp-dev
Ruben Brunk [Thu, 2 Oct 2014 02:32:23 +0000 (02:32 +0000)]
Merge "camera2: Force DNG previews to render with LSC map." into lmp-dev

9 years agoaudioflinger: fix failure to indicate volume to effect
Eric Laurent [Wed, 1 Oct 2014 21:26:10 +0000 (14:26 -0700)]
audioflinger: fix failure to indicate volume to effect

If an effect is added and enabled after a track is started
it will not receive current volume information because volume
is indicated only to active effects and if there is a volume change.

Add a flag to force EffectChain::setVolume_l() to pass volume indication
to all effects each time an effect is enabled.

Bug: 17572556.

Change-Id: I6b68488c9aca8b2095fb210aa124d02e4f759660

9 years agoMerge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp...
Glenn Kasten [Wed, 1 Oct 2014 23:09:52 +0000 (23:09 +0000)]
Merge "Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"" into lmp-dev

9 years agoRevert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"
Glenn Kasten [Wed, 1 Oct 2014 22:38:43 +0000 (22:38 +0000)]
Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"

This reverts commit 54464ba861aaafd11ee5645f5d1ecd1171c6e9fe.

Bug: 17733142.

Change-Id: I9886d40032b2f7d96bee03e600e14f78943d8052

9 years agoMerge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
Chong Zhang [Wed, 1 Oct 2014 21:37:10 +0000 (21:37 +0000)]
Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev

9 years agocamera2: Force DNG previews to render with LSC map.
Ruben Brunk [Wed, 1 Oct 2014 19:59:57 +0000 (12:59 -0700)]
camera2: Force DNG previews to render with LSC map.

Bug: 17688063
Change-Id: I7f60a3465ab608a6b68d1e38493895cbd40bd7ae

9 years agoMerge "GenericSource: support disconnect before NuCachedSource2 is created" into...
Robert Shih [Wed, 1 Oct 2014 19:41:34 +0000 (19:41 +0000)]
Merge "GenericSource: support disconnect before NuCachedSource2 is created" into lmp-dev

9 years agoGenericSource: support disconnect before NuCachedSource2 is created
Robert Shih [Mon, 29 Sep 2014 21:42:35 +0000 (14:42 -0700)]
GenericSource: support disconnect before NuCachedSource2 is created

Bug: 17672488
Change-Id: I96776c9679fdcfbe9a442c86447c59802b1465ac

9 years agoadd AAC audio decoder params for PCM limiter enable
Chong Zhang [Wed, 1 Oct 2014 05:02:34 +0000 (22:02 -0700)]
add AAC audio decoder params for PCM limiter enable

Bug: 17470065
Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1

9 years agoMerge "NuCachedSource2: fix disconnect process" into lmp-dev
Robert Shih [Wed, 1 Oct 2014 01:17:29 +0000 (01:17 +0000)]
Merge "NuCachedSource2: fix disconnect process" into lmp-dev

9 years agoNuCachedSource2: fix disconnect process
Robert Shih [Tue, 30 Sep 2014 21:17:38 +0000 (14:17 -0700)]
NuCachedSource2: fix disconnect process

 - clear mAsyncResult
 - return early from reads if mDisconnecting is set

Bug: 17696761
Change-Id: I98bfc3f5f06594915bd58faf71fbcded482664d2

9 years agoMerge "Check if info for uri is available" into lmp-dev
Marco Nelissen [Tue, 30 Sep 2014 22:29:21 +0000 (22:29 +0000)]
Merge "Check if info for uri is available" into lmp-dev

9 years agoCheck if info for uri is available
Marco Nelissen [Tue, 30 Sep 2014 21:53:39 +0000 (14:53 -0700)]
Check if info for uri is available

before retrieving it.

Bug: 17683986
Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c

9 years agoMerge "mediaplayer: make frame-accurate avsync configurable" into lmp-dev
Lajos Molnar [Tue, 30 Sep 2014 14:45:59 +0000 (14:45 +0000)]
Merge "mediaplayer: make frame-accurate avsync configurable" into lmp-dev

9 years agomerge in lmp-release history after reset to 955e24d3a8e218d4711cabc6558781e095011132
The Android Automerger [Tue, 30 Sep 2014 13:16:00 +0000 (06:16 -0700)]
merge in lmp-release history after reset to 955e24d3a8e218d4711cabc6558781e095011132

9 years agoMerge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into...
Glenn Kasten [Tue, 30 Sep 2014 01:44:18 +0000 (01:44 +0000)]
Merge "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" into lmp-dev