OSDN Git Service
The Android Open Source Project [Fri, 22 Nov 2013 18:35:20 +0000 (10:35 -0800)]
Lajos Molnar [Tue, 29 Oct 2013 22:41:50 +0000 (15:41 -0700)]
am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
96aed4fb18e5303b039cc7e5dc252e0827491d09':
avcenc: Prepend startcodes to output buffers
Lajos Molnar [Tue, 29 Oct 2013 22:39:25 +0000 (22:39 +0000)]
Merge "avcenc: Prepend startcodes to output buffers"
Elliott Hughes [Wed, 23 Oct 2013 17:25:57 +0000 (10:25 -0700)]
am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
d5255d1de125d15afae6cfc35701a5255b5e2933':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:22:43 +0000 (17:22 +0000)]
Merge "If dlopen("libwvm.so") fails, log the reason why."
Elliott Hughes [Wed, 23 Oct 2013 17:03:20 +0000 (10:03 -0700)]
If dlopen("libwvm.so") fails, log the reason why.
Bug:
11342992
Change-Id: I99986b6181df6d7615fdc1520d2edaadaccd9bb4
Nick Kralevich [Sun, 20 Oct 2013 16:31:32 +0000 (09:31 -0700)]
am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
0f4b0d238613cd98fe0b8931f7e6cbcc8b9ad7b1':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:28:47 +0000 (16:28 +0000)]
Merge "libeffects: do not use GNU old-style field designators"
synergydev [Sun, 20 Oct 2013 05:51:33 +0000 (22:51 -0700)]
libeffects: do not use GNU old-style field designators
Not using a GNU extension improves portability
Change-Id: I4e8a0376c089828ca4fc7f1aaf3914bfd917d4c5
Nick Kralevich [Sat, 19 Oct 2013 02:30:45 +0000 (19:30 -0700)]
am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
0219856e5e45c0bdd20f2199297ec92f11f0875f':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:28:09 +0000 (02:28 +0000)]
Merge "libvideoeditor: fix M4OSA_Clock header guard"
synergydev [Sat, 19 Oct 2013 02:20:59 +0000 (19:20 -0700)]
libvideoeditor: fix M4OSA_Clock header guard
CLOCK was mispelled as CLOCH
Change-Id: Ie7163fc8723d7a5b9df113f55a4a550e5465d9b5
Glenn Kasten [Thu, 17 Oct 2013 01:07:33 +0000 (18:07 -0700)]
am
f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
* commit '
f8f15b05fe051009945c9042a1a9260280e0feb2':
Fix race condition in AudioTrack::pause followed by start
Glenn Kasten [Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)]
Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
787c0d04: merge in klp-release (no-op)
* commit '
787c0d04ac4f9c938a1311f8e30d9d7ac2b8a6da':
Camera: Skip AE precapture when possible
Cleanup openRecord error handling
TimedEventQueue takes a wake lock
fix offload audio effect proxy implementation uuid
MediaCodecInfo: report supported color formats for non-native-window mode
Camera2 API: Hack: Always use async mode with GLConsumer
AudioTrack: fix music resume
Zhijun He [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev
* commit '
3defdab829de7df3a343393b2b277e99d071744c':
Camera: don't do hw support check for ZSL
Ed Heyl [Thu, 17 Oct 2013 00:42:20 +0000 (17:42 -0700)]
merge in klp-release (no-op)
Glenn Kasten [Thu, 17 Oct 2013 00:02:13 +0000 (17:02 -0700)]
Fix race condition in AudioTrack::pause followed by start
Bug:
11148722
Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
Zhijun He [Wed, 16 Oct 2013 22:47:47 +0000 (22:47 +0000)]
Merge "Camera: don't do hw support check for ZSL" into klp-dev
Eric Laurent [Wed, 16 Oct 2013 22:35:35 +0000 (15:35 -0700)]
am
120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '
120a88471a607c85c4d60300d73c3be0a1e8f8c8':
AudioTrack: fix head position after restore
Eric Laurent [Wed, 16 Oct 2013 22:28:33 +0000 (22:28 +0000)]
Merge "AudioTrack: fix head position after restore" into klp-dev
Eric Laurent [Wed, 16 Oct 2013 22:26:52 +0000 (15:26 -0700)]
am
d5766875: AwesomePlayer: fix concurrent pause and teardown
* commit '
d576687570f19f3956d91c1d3da10d965e34c407':
AwesomePlayer: fix concurrent pause and teardown
Eric Laurent [Wed, 16 Oct 2013 22:12:32 +0000 (15:12 -0700)]
AudioTrack: fix head position after restore
The head position transfered to the new track
by restoreTrack_l() must take into account the frames that
are dropped from the old track to avoid a non recoverable
offset in the playback head position returned to applications.
Bug:
11230062.
Change-Id: I51143a08b95e8f264ed709ae2054360315f2b8b1
Zhijun He [Wed, 16 Oct 2013 22:09:17 +0000 (15:09 -0700)]
Camera: don't do hw support check for ZSL
Only use camera.disable_zsl_mode to control disable/enable ZSL.
Bug:
11258054
Change-Id: Ibf10b959d0913f7dedb59d89b571e9bf66fe978a
Eric Laurent [Tue, 15 Oct 2013 23:11:24 +0000 (16:11 -0700)]
AwesomePlayer: fix concurrent pause and teardown
There was a race condition if a pause request was received
while we were executing a teardown event. Although we hold
a mutex while processing the teardown event, there is a step
of the prepare sequence where we release the mutex if streaming.
In this case, the pause request is executed but ignored because
the player state is still preparing. At the end of the teardown
event processing we restore previous playback state and resume.
The fix consists in clearing the saved teardown playback state
when a pause request is received while processing a teardown event.
Bug:
11225491.
Change-Id: If0e61855ce5a336322f1ba8e5559bdc190beeb76
The Android Automerger [Tue, 15 Oct 2013 13:00:42 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Narayan Kamath [Tue, 15 Oct 2013 02:01:21 +0000 (19:01 -0700)]
am
014e7fa2: Make Audio wakelock names less unique.
* commit '
014e7fa2e90827d911c37bb0ce4d2e10e14d0bb3':
Make Audio wakelock names less unique.
Narayan Kamath [Mon, 14 Oct 2013 14:03:38 +0000 (15:03 +0100)]
Make Audio wakelock names less unique.
These wakelocks now show up in the client process, where they
might cause wakelock overflows if AudioFlinger threads die often.
The client process should be agnostic of audio flinger threading,
so don't make the wakelock names rely on audioflinger thread names.
Wakelock names now depend only on the audio flinger thread type, and
not the ID itself.
bug:
11200551
Change-Id: Ia1f71b569cb7502d617b77596abc245f461a6ec0
The Android Automerger [Mon, 14 Oct 2013 02:20:21 +0000 (19:20 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Sun, 13 Oct 2013 18:08:06 +0000 (11:08 -0700)]
am
b3cb72a1: SoundPool: handle new audio track event
* commit '
b3cb72a17d9a472883e9e2faa18b42eac533fe99':
SoundPool: handle new audio track event
The Android Automerger [Sun, 13 Oct 2013 13:01:45 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Sun, 13 Oct 2013 00:05:19 +0000 (17:05 -0700)]
SoundPool: handle new audio track event
If the AudioTrack is torn down, SoundPool will never
receive the buffer end event and the track will stay active
for ever.
The fix consists in stopping the AudioTrack when a new audiotrack
event is received.
Bug:
11193583.
Change-Id: I9876eb2a8f75c601368f669acd67b0accf6e2736
Zhijun He [Sat, 12 Oct 2013 01:27:26 +0000 (18:27 -0700)]
am
15ad2470: Camera: Fix deadlock in Camera3OutputStream
* commit '
15ad2470b2f2ac34473eb568b606ad75e8e63ac6':
Camera: Fix deadlock in Camera3OutputStream
Zhijun He [Fri, 11 Oct 2013 23:21:11 +0000 (16:21 -0700)]
Camera: Fix deadlock in Camera3OutputStream
process capture request thread, process capture result and setParameter
binder threads can run into circular locking situation when acquiring
StreamingProcessor lock, Camera3Stream lock, and bufferQueue lock.
Releasing the Camera3Stream lock briefly in process capture request
thread getbuffer call can break this deadlock.
Bug:
11016037
Change-Id: If08d4b134c26be26039b1d5363759e60f911bad6
Zhijun He [Fri, 11 Oct 2013 19:50:13 +0000 (12:50 -0700)]
am
d5ed2263: Merge "Camera: Skip AE precapture when possible" into klp-dev
* commit '
d5ed2263a485d6e633fe08f033d04fad75daec6f':
Camera: Skip AE precapture when possible
Eino-Ville Talvala [Fri, 11 Oct 2013 19:50:13 +0000 (12:50 -0700)]
am
1dd08b30: Merge "Camera2/3: Add more tracing for API1" into klp-dev
* commit '
1dd08b30e2366cabc50d883885d6229dab8218f2':
Camera2/3: Add more tracing for API1
Zhijun He [Fri, 11 Oct 2013 17:26:52 +0000 (10:26 -0700)]
Camera: Skip AE precapture when possible
Skip AE precapture when AE is already converged for still capture use case. This
could save still capture latency 6-7 frame time for AE already converged case.
Bug:
10712902
Change-Id: Ie5512618b76e5d87c62c57c3d96d2004c604e29e
Zhijun He [Fri, 11 Oct 2013 19:22:15 +0000 (19:22 +0000)]
Merge "Camera: Skip AE precapture when possible" into klp-dev
Eino-Ville Talvala [Fri, 11 Oct 2013 19:21:51 +0000 (19:21 +0000)]
Merge "Camera2/3: Add more tracing for API1" into klp-dev
Zhijun He [Fri, 11 Oct 2013 17:26:52 +0000 (10:26 -0700)]
Camera: Skip AE precapture when possible
Skip AE precapture when AE is already converged for still capture use case. This
could save still capture latency 6-7 frame time for AE already converged case.
Bug:
10712902
Change-Id: Ie5512618b76e5d87c62c57c3d96d2004c604e29e
Eino-Ville Talvala [Thu, 10 Oct 2013 22:13:09 +0000 (15:13 -0700)]
Camera2/3: Add more tracing for API1
- AF state
- Async autofocus completion
- Async takePicture completion
- Stages of takePicture
Bug:
10570497
Change-Id: Ida9fedd81aa4ee3ae3fb8dfada858a3bc3c213a3
The Android Automerger [Thu, 10 Oct 2013 13:01:02 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Zhijun He [Wed, 9 Oct 2013 22:52:40 +0000 (15:52 -0700)]
am
cc27e117: Camera: Save 1 frame time for takePicture call
* commit '
cc27e117ed01c9a2b4def5a9c7a3103af83ee47e':
Camera: Save 1 frame time for takePicture call
Zhijun He [Thu, 3 Oct 2013 23:12:43 +0000 (16:12 -0700)]
Camera: Save 1 frame time for takePicture call
Move the latest request signal call right before submitting request to HAL,
which avoids unnecessary 1 frame time wait.
Also fix request status constructor issue, and the log tag for Camera2Client.
Bug:
10570497
Change-Id: I0b1818658bee9983b117e49a5a00f1aab515c567
The Android Automerger [Wed, 9 Oct 2013 13:01:03 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Ed Heyl [Tue, 8 Oct 2013 23:11:46 +0000 (16:11 -0700)]
Igor Murashkin [Tue, 8 Oct 2013 23:11:45 +0000 (16:11 -0700)]
am
828363da: Merge "camera2: Don\'t race while dumping last frame metadata" into klp-dev
* commit '
828363dada5878fca6e0cb1553fbea96f38671c8':
camera2: Don't race while dumping last frame metadata
Ed Heyl [Tue, 8 Oct 2013 22:59:50 +0000 (15:59 -0700)]
merge in KFS78N (no-op)
Igor Murashkin [Tue, 8 Oct 2013 22:57:32 +0000 (22:57 +0000)]
Merge "camera2: Don't race while dumping last frame metadata" into klp-dev
Ed Heyl [Tue, 8 Oct 2013 22:49:52 +0000 (15:49 -0700)]
am
a676e96c: merge in KQS81M
* commit '
a676e96c6ed71846bdf60448bd63100ee2b357fb':
Camera2/3: For still captures, use widest FPS range available.
camera2: Tell all streams to ignore global device UI rotation
Workaround slow AudioTrack destruction
Partial fix for SoundPool not terminating
Fix MediaDrm cts tests
Ed Heyl [Tue, 8 Oct 2013 22:40:01 +0000 (15:40 -0700)]
merge in KQS81M
Eino-Ville Talvala [Tue, 8 Oct 2013 18:50:01 +0000 (11:50 -0700)]
am
a5209c2e: Merge "Camera3: Improve resilience to stream failures" into klp-dev
* commit '
a5209c2e6a89ecd8d3bec79cb0e82a677301d794':
Camera3: Improve resilience to stream failures
Eino-Ville Talvala [Tue, 8 Oct 2013 18:46:21 +0000 (18:46 +0000)]
Merge "Camera3: Improve resilience to stream failures" into klp-dev
Eino-Ville Talvala [Wed, 25 Sep 2013 01:04:19 +0000 (18:04 -0700)]
Camera3: Improve resilience to stream failures
- Handle binder connection drops (DEAD_OBJECT) for streams
- Just log an error, don't go to an error state when queue/dequeue fails
Bug:
10347526
Change-Id: Ib463ffe15d58db444cf5d8cad176a201c7d1facc
Eric Laurent [Tue, 8 Oct 2013 17:51:07 +0000 (10:51 -0700)]
am
aab5b08c: AwesomePlayer: do not send events when paused.
* commit '
aab5b08cb4a3b5a47daece6168f41ec918020739':
AwesomePlayer: do not send events when paused.
Eric Laurent [Tue, 8 Oct 2013 16:22:31 +0000 (09:22 -0700)]
AwesomePlayer: do not send events when paused.
When streaming audio and paused, AwesomePlayer should
stop sending BufferingEvents as they will keep a wake lock
for no reason.
TimedEventQueue should always acquire the wakelock with mediaserver
identity so that it is released with the same identity by the
event handler thread.
Bug:
11104408.
Change-Id: Ied0e03acd6ad2f5a4c0ec82d5c2aa4e1c6da772c
Igor Murashkin [Tue, 8 Oct 2013 01:01:46 +0000 (18:01 -0700)]
camera2: Don't race while dumping last frame metadata
Bug:
11095203
Change-Id: Icfb31e1719634b62004d6c15a95a9316e9642e4c
Glenn Kasten [Tue, 24 Sep 2013 18:52:37 +0000 (11:52 -0700)]
Cleanup openRecord error handling
Bug:
10888816
Change-Id: I84897dd7d30b370640b54e928f230604b873cb68
Glenn Kasten [Mon, 7 Oct 2013 16:19:38 +0000 (09:19 -0700)]
am
fee4ce33: Merge "Cleanup openRecord error handling" into klp-dev
* commit '
fee4ce338d78eeb58af1f66831ead53322d3859e':
Cleanup openRecord error handling
Glenn Kasten [Mon, 7 Oct 2013 16:16:06 +0000 (16:16 +0000)]
Merge "Cleanup openRecord error handling" into klp-dev
The Android Automerger [Sun, 6 Oct 2013 13:01:09 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Sat, 5 Oct 2013 00:58:16 +0000 (17:58 -0700)]
am
ea0fadeb: audioflinger: offload: fix pause/flush/resume
* commit '
ea0fadeb5d81ef3cb7f9db458c9033d628bdb86a':
audioflinger: offload: fix pause/flush/resume
Eric Laurent [Fri, 4 Oct 2013 23:23:48 +0000 (16:23 -0700)]
audioflinger: offload: fix pause/flush/resume
If a pause/flush/resume sequence is fast enough, resume is received while
we are still in PAUSING state in which case it is a NOP. If this happens,
flush is still forwarded to the audio HAL but is not preceeded by a pause
which can cause problems to the audio DSP.
It is necessary to preserve the flush as this sequence is typical to a seek.
The fix consists in forcing a pause/resume when a flush request must be
executed and the audio HAL has not been paused previously.
Bug:
11081559.
Change-Id: Ib84ed26d503a61c05933b923ec556b10cedfe140
Eric Laurent [Fri, 4 Oct 2013 20:34:44 +0000 (13:34 -0700)]
am
026c5b07: Merge "audioflinger: fix wake lock acquisition check" into klp-dev
* commit '
026c5b07fefd36e0e2dd7035c2898d0e28596d0f':
audioflinger: fix wake lock acquisition check
Eric Laurent [Fri, 4 Oct 2013 00:54:26 +0000 (17:54 -0700)]
TimedEventQueue takes a wake lock
Take a wake lock when events present in a TimedEventQueue
to prevent from going idle before all delayed events are
processed.
Bug:
11057387.
Change-Id: I26a17df68068fde5e879a2fe7568dec439fc540f
Eric Laurent [Fri, 4 Oct 2013 15:36:52 +0000 (08:36 -0700)]
fix offload audio effect proxy implementation uuid
The proxy implementation UUID should not be the NULL UUID as
AudioFlinger will reject effect creation if the AudioEffect
is constructed by passing the implementation UUID and not the
type UUID.
Bug:
11070481.
Change-Id: Ia9049d974e76303c5b63a607ee594b7dc1f182d4
Eric Laurent [Fri, 4 Oct 2013 19:57:14 +0000 (19:57 +0000)]
Merge "audioflinger: fix wake lock acquisition check" into klp-dev
Eric Laurent [Fri, 4 Oct 2013 18:46:55 +0000 (11:46 -0700)]
audioflinger: fix wake lock acquisition check
Commit
e14a5d6 introduced a bug in ThreadBase::acquireWakeLock() where
the wake lock acquisition return code is not initialized before
being checked causing the wake lock token to be sometines not set
and potential failure to release the wake lock later.
Bug:
10985160.
Change-Id: Iffd40e773ae3bcfec3c148a844d5dbebbf474eaf
Eric Laurent [Fri, 4 Oct 2013 17:55:56 +0000 (10:55 -0700)]
am
da0926af: Merge "TimedEventQueue takes a wake lock" into klp-dev
* commit '
da0926afdb12794497c93d68eee296f2d92bfa7e':
TimedEventQueue takes a wake lock
Eric Laurent [Fri, 4 Oct 2013 17:47:25 +0000 (17:47 +0000)]
Merge "TimedEventQueue takes a wake lock" into klp-dev
Eric Laurent [Fri, 4 Oct 2013 17:24:29 +0000 (10:24 -0700)]
am
385e7509: fix offload audio effect proxy implementation uuid
* commit '
385e7509eb563c983647e72b1232225c2200435f':
fix offload audio effect proxy implementation uuid
Eric Laurent [Fri, 4 Oct 2013 00:54:26 +0000 (17:54 -0700)]
TimedEventQueue takes a wake lock
Take a wake lock when events present in a TimedEventQueue
to prevent from going idle before all delayed events are
processed.
Bug:
11057387.
Change-Id: I26a17df68068fde5e879a2fe7568dec439fc540f
Eric Laurent [Fri, 4 Oct 2013 15:36:52 +0000 (08:36 -0700)]
fix offload audio effect proxy implementation uuid
The proxy implementation UUID should not be the NULL UUID as
AudioFlinger will reject effect creation if the AudioEffect
is constructed by passing the implementation UUID and not the
type UUID.
Bug:
11070481.
Change-Id: Ia9049d974e76303c5b63a607ee594b7dc1f182d4
Lajos Molnar [Fri, 4 Oct 2013 13:23:02 +0000 (06:23 -0700)]
am
7bab0248: Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" into klp-dev
* commit '
7bab024867996bec6dc4e3e31ed4570da9afbc25':
MediaCodec: avoid codec EOS if flushing during port reconfiguration
Lajos Molnar [Fri, 4 Oct 2013 13:18:02 +0000 (13:18 +0000)]
Merge "MediaCodec: avoid codec EOS if flushing during port reconfiguration" into klp-dev
Zhijun He [Thu, 3 Oct 2013 23:10:54 +0000 (16:10 -0700)]
am
19fffcbd: Merge "Camera3: track request status in inflight queue" into klp-dev
* commit '
19fffcbd89a51af797265af2e11c97be5820a07d':
Camera3: track request status in inflight queue
Zhijun He [Thu, 3 Oct 2013 23:05:41 +0000 (23:05 +0000)]
Merge "Camera3: track request status in inflight queue" into klp-dev
Marco Nelissen [Thu, 3 Oct 2013 22:41:56 +0000 (15:41 -0700)]
am
8097068d: Merge "Better recording wake lock accounting" into klp-dev
* commit '
8097068de97c0cdab8150931f290edbd5b3721e5':
Better recording wake lock accounting
Lajos Molnar [Thu, 3 Oct 2013 22:40:04 +0000 (15:40 -0700)]
am
580ed263: Merge "stagefright: enable adaptive playback based on codec format key" into klp-dev
* commit '
580ed263a6ea6c766f9f715e101340c7fe26ab75':
stagefright: enable adaptive playback based on codec format key
Eino-Ville Talvala [Thu, 3 Oct 2013 22:40:03 +0000 (15:40 -0700)]
am
b2d71d3a: Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into klp-dev
* commit '
b2d71d3a35de6382096ed688a4cae3bbca3c97bf':
Camera API 2, Device 2/3: Implement idle and shutter callbacks
Lajos Molnar [Thu, 3 Oct 2013 22:40:02 +0000 (15:40 -0700)]
am
56ce7260: IOMX: Add prepareForAdaptivePlayback method
* commit '
56ce726019f700a95ce5b45beebceadae4836e30':
IOMX: Add prepareForAdaptivePlayback method
Andreas Huber [Thu, 3 Oct 2013 22:40:02 +0000 (15:40 -0700)]
am
a306ee6b: Remove now unused wfd commandline tool. (also unbreaks the build)
* commit '
a306ee6bc1aef463f8984be26b8a4214490b6c55':
Remove now unused wfd commandline tool. (also unbreaks the build)
Andreas Huber [Thu, 3 Oct 2013 22:40:01 +0000 (15:40 -0700)]
am
6ea551fa: Remove obsolete miracast sink code and friends.
* commit '
6ea551fa13b69e5ce359a7dba7485d857a005304':
Remove obsolete miracast sink code and friends.
Zhijun He [Wed, 2 Oct 2013 23:29:51 +0000 (16:29 -0700)]
Camera3: track request status in inflight queue
Bug:
9758581
Change-Id: I1d7135cd0932bd6b453acabfeb9a553985c887bc
Marco Nelissen [Thu, 3 Oct 2013 21:15:05 +0000 (21:15 +0000)]
Merge "Better recording wake lock accounting" into klp-dev
Marco Nelissen [Thu, 3 Oct 2013 15:51:24 +0000 (08:51 -0700)]
Better recording wake lock accounting
Count wake lock use against the app that initiated the recording,
not against the media server.
b/
10985160
Change-Id: Iae6e6c030b7f1c6081d9c79725d6990f60dadaaa
Lajos Molnar [Thu, 3 Oct 2013 19:08:06 +0000 (19:08 +0000)]
Merge "stagefright: enable adaptive playback based on codec format key" into klp-dev
Eino-Ville Talvala [Thu, 3 Oct 2013 18:33:55 +0000 (18:33 +0000)]
Merge "Camera API 2, Device 2/3: Implement idle and shutter callbacks" into klp-dev
Lajos Molnar [Thu, 2 May 2013 23:46:41 +0000 (16:46 -0700)]
stagefright: enable adaptive playback based on codec format key
Added support for prepareForAdaptivePlayback() call in
configureCodec, if max-width and max-height keys are specified
in the format. It is OK for this call to fail, if component
does not implement adaptive playback.
Change-Id: Ie15892bc666df103b635890a0fda799b204bb06c
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
7093648
Bug:
10192531
Lajos Molnar [Thu, 2 May 2013 23:30:48 +0000 (16:30 -0700)]
IOMX: Add prepareForAdaptivePlayback method
prepareForAdaptivePlayback is the fallback mechanism to support
seamless resolution change for devices that do not support dynamic
output buffers. It is up to the codecs to handle this appropriately,
but codecs that do not handle dynamic output buffers would
request enough buffers up to the requested size in this method
to avoid port reconfiguration on resolution changes.
Change-Id: I58d4aa8ef1359ea3472735bbe9140c3132039b3d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
10192531
Related-to-bug:
7093648
Andreas Huber [Thu, 3 Oct 2013 15:43:20 +0000 (08:43 -0700)]
Remove now unused wfd commandline tool. (also unbreaks the build)
Change-Id: I03320342976e4e355cc6aeb3d2c485985613b3b5
related-to-bug:
11047222
Lajos Molnar [Wed, 2 Oct 2013 18:25:20 +0000 (11:25 -0700)]
MediaCodec: avoid codec EOS if flushing during port reconfiguration
Change-Id: Ic2e93f38feeb2e906f8d6b400ed6df2b7580ca87
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11045434
Eino-Ville Talvala [Fri, 6 Sep 2013 16:32:43 +0000 (09:32 -0700)]
Camera API 2, Device 2/3: Implement idle and shutter callbacks
- Update callback Binder interface
- Rename frameId to be requestId to be consistent and disambiguate
from frameNumber.
- Implement shutter callback from HAL2/3 notify()
- Add in-flight tracking to HAL2
- Add requestId to in-flight tracking
- Report requestId from shutter callback
- Implement idle callback from HAL3 process_capture_result
- Add new idle tracker thread
- Update all idle waiting to use the tracker
- Add reporting from request thread, all streams to tracker
- Remove existing idle waiting infrastructure
Bug:
10549462
Change-Id: I867bfc248e3848c50e71527e3561fe92dc037958
Andreas Huber [Wed, 2 Oct 2013 20:06:06 +0000 (13:06 -0700)]
Remove obsolete miracast sink code and friends.
Change-Id: I8bbb22fb0cfe2d73881d9f05bf8112ae86d8040b
related-to-bug:
11047222
Zhijun He [Wed, 2 Oct 2013 16:36:33 +0000 (09:36 -0700)]
am
f05e50eb: Camera: only return static metadata for HAL3 device
* commit '
f05e50eb06d3f70e50fa7f44c1fd32128033b49d':
Camera: only return static metadata for HAL3 device
Zhijun He [Wed, 2 Oct 2013 16:35:20 +0000 (09:35 -0700)]
am
26c1fb23: Merge "Camera: drop stale callback buffer" into klp-dev
* commit '
26c1fb23a1e2cc059aac42fd1814efba2a3e9640':
Camera: drop stale callback buffer
Lajos Molnar [Wed, 2 Oct 2013 16:35:09 +0000 (09:35 -0700)]
am
353fb9bf: Merge "MediaTimeProvider support fixes" into klp-dev
* commit '
353fb9bf940ee34a3885bc85ec7891228e958a4b':
MediaTimeProvider support fixes
Lajos Molnar [Wed, 2 Oct 2013 16:35:09 +0000 (09:35 -0700)]
am
5fd39f77: Merge "MediaCodecInfo: report supported color formats for non-native-window mode" into klp-dev
* commit '
5fd39f777d54368a93fc9d8a6a24da0239d41fcf':
MediaCodecInfo: report supported color formats for non-native-window mode
The Android Automerger [Wed, 2 Oct 2013 13:01:04 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Zhijun He [Wed, 2 Oct 2013 05:21:56 +0000 (22:21 -0700)]
am
8b905e19: Merge "Camera: Set default thumbnail size with matched aspect ratio" into klp-dev
* commit '
8b905e19548248904ab0fd0b63c9adcab2331a1a':
Camera: Set default thumbnail size with matched aspect ratio