OSDN Git Service
The Android Automerger [Wed, 20 Aug 2014 13:11:06 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
a8143b2bbaabc3f704b05078ccc930dbc28591b9
The Android Automerger [Tue, 19 Aug 2014 13:10:44 +0000 (06:10 -0700)]
merge in lmp-release history after reset to
1b786a35ddd072765348eee2bffa2009c1b14da3
Eino-Ville Talvala [Tue, 19 Aug 2014 00:41:30 +0000 (00:41 +0000)]
Merge "camera: Fix setParameters for Preview FPS single/range values" into lmp-dev
Igor Murashkin [Wed, 19 Mar 2014 01:15:23 +0000 (18:15 -0700)]
camera: Fix setParameters for Preview FPS single/range values
As a workaround, duplicate CameraParameters into CameraParameters2 to
prevent ABI break for some camera HALs that directly link into
CameraParameters.
CameraParameters2 implements the real fixes needed in the framework,
while CameraParameters is left in to satisfy older camera HALs.
Bug:
12609188
Bug:
16654949
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
Glenn Kasten [Mon, 18 Aug 2014 22:51:59 +0000 (15:51 -0700)]
Fix memory access error due to race during fast track removal
Bug:
16205169
Change-Id: Ie15ec2a737b6ddd16b2d26030d01564ff70177f5
Ronghua Wu [Mon, 18 Aug 2014 22:34:34 +0000 (22:34 +0000)]
Merge "stagefright: Do not add silence data for compress offload" into lmp-dev
aarti jadhav-gaikwad [Wed, 13 Aug 2014 09:34:39 +0000 (15:04 +0530)]
stagefright: Do not add silence data for compress offload
Bug:
16683770
Bug:
17035257
Change-Id: I7aef543c47214cc2854d143167b02f1603cf8bea
The Android Automerger [Mon, 18 Aug 2014 13:09:45 +0000 (06:09 -0700)]
merge in lmp-release history after reset to
426c719a5f3b4d88480eb35a7b0b373f672ea3cb
The Android Automerger [Sun, 17 Aug 2014 14:17:47 +0000 (07:17 -0700)]
merge in lmp-release history after reset to
426c719a5f3b4d88480eb35a7b0b373f672ea3cb
Chong Zhang [Wed, 20 Aug 2014 00:41:05 +0000 (00:41 +0000)]
Merge "Don't crash for bitstream errors in AMPEG4ElementaryAssembler" into lmp-dev
Chong Zhang [Tue, 19 Aug 2014 23:53:42 +0000 (16:53 -0700)]
Don't crash for bitstream errors in AMPEG4ElementaryAssembler
Bug:
17110981
Change-Id: I0d0960fa12f2ad179231494be29af307de217b2a
Wei Jia [Tue, 19 Aug 2014 18:52:03 +0000 (18:52 +0000)]
Merge "NuPlayer: use generation to detect stale requests from old decoders." into lmp-dev
Wei Jia [Wed, 6 Aug 2014 18:24:07 +0000 (11:24 -0700)]
NuPlayer: use generation to detect stale requests from old decoders.
Bug:
14955925
Bug:
16303659
Bug:
16467066
Bug:
13133027
Change-Id: I3e66b25b2302c0eb795361629b03bf2e96ed34e4
Wei Jia [Tue, 19 Aug 2014 23:08:17 +0000 (23:08 +0000)]
Merge "Allow audio and video flushed separately." into lmp-dev
Igor Murashkin [Tue, 19 Aug 2014 23:06:54 +0000 (23:06 +0000)]
Merge changes I116ee711,Ieb3fc61f into lmp-dev
* changes:
camera: hal3: Remove register_stream setprop check
camera: Allow shutter sounds to be disabled from camera2 api
Wei Jia [Tue, 19 Aug 2014 22:53:35 +0000 (22:53 +0000)]
Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp-dev
Wei Jia [Tue, 29 Jul 2014 17:22:53 +0000 (10:22 -0700)]
Allow audio and video flushed separately.
Bug:
14955925
Bug:
16303659
Bug:
16467066
Bug:
13133027
Change-Id: I956a9f55513970115119c7639a5e33b39e6d2f55
Igor Murashkin [Tue, 19 Aug 2014 22:14:29 +0000 (15:14 -0700)]
camera: hal3: Remove register_stream setprop check
camera3_device_t::register_stream must always be NULL in HAL3.2+ cameras
Bug:
13914251
Change-Id: I116ee71135a827c8b4db61cd91f56ba56da3f0ef
Igor Murashkin [Tue, 19 Aug 2014 21:53:08 +0000 (14:53 -0700)]
camera: Allow shutter sounds to be disabled from camera2 api
When using the connectLegacy binder interface (available only
through an @hide java api), then consider the camera to be in the
camera2 api legacy mode.
In legacy mode, allow disabling the shutter sound unconditionally.
Bug:
17109582
Change-Id: Ieb3fc61ff111d792cc657c018e278349c25472cf
Wei Jia [Mon, 18 Aug 2014 18:29:50 +0000 (11:29 -0700)]
NuPlayerRenderer: allow flush() to be called multiple times.
Also fix racing condition on accessing some members.
Bug:
16982307
Bug:
13133027
Change-Id: I0d4a605146e24ad7396a07369d501593cad73f41
Yin-Chia Yeh [Tue, 19 Aug 2014 15:45:13 +0000 (15:45 +0000)]
Merge "cameraservice: update supportedFocusModes for api1" into lmp-dev
Ronghua Wu [Tue, 19 Aug 2014 18:34:06 +0000 (18:34 +0000)]
Merge "stagefright: Fix thumbnail generation for some clips." into lmp-dev
Ronghua Wu [Mon, 4 Aug 2014 23:59:20 +0000 (16:59 -0700)]
stagefright: Fix thumbnail generation for some clips.
Fix thumbnail generation for clips that include an immediate resolution change:
* Enable dynamic resolution change, when port settings may change while we have
filled buffers.
* Handle the case when port settings change happens right after stop is called.
Bug:
16210021
Change-Id: I8b2c48365d74ce7551f000a1f4b0711647a9796f
Ronghua Wu [Tue, 19 Aug 2014 18:33:40 +0000 (18:33 +0000)]
Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev
Ronghua Wu [Mon, 18 Aug 2014 22:57:03 +0000 (15:57 -0700)]
NuPlayer: disable deep audio buffer in offload mode.
Bug:
17035257
Change-Id: I56ca28d4c4774c1c0103d19126cf0b8f859964b7
Ronghua Wu [Tue, 19 Aug 2014 18:31:33 +0000 (18:31 +0000)]
Merge "NuPlayerRenderer: only query audio sink for position for the first entry." into lmp-dev
Ronghua Wu [Mon, 18 Aug 2014 23:27:08 +0000 (16:27 -0700)]
NuPlayerRenderer: only query audio sink for position for the first entry.
Bug:
17035257
Change-Id: I472ec4610e1174c59986f42d72fe55f90e93731e
Lajos Molnar [Tue, 19 Aug 2014 17:54:04 +0000 (17:54 +0000)]
Merge "NuPlayer: add support for proper stop" into lmp-dev
Lajos Molnar [Mon, 18 Aug 2014 17:33:37 +0000 (17:33 +0000)]
Merge "stagefright: add codec capability info for google audio codecs" into lmp-dev
Chong Zhang [Wed, 13 Aug 2014 04:25:48 +0000 (21:25 -0700)]
use dedicated looper for GenericSource
- handle setVideoSurface in deferred action, and return
to client immediately
- handle GenericSource's prepareAsync on its own looper,
instead of sharing looper with NuPlayer
- let HTTPLiveSource share looper with LiveSession, instead
of NuPlayer
- remove reflector in RTSPSource
Bug:
16892748
Change-Id: I1aed557320052012065f5a90adbcb03c238da988
Ronghua Wu [Fri, 8 Aug 2014 22:24:55 +0000 (15:24 -0700)]
stagefright: Fix race condition between MediaCodec and SoftwareRenderer
* Set the buffer's format info when it's returned from OMX component.
* Move frame format meta from SoftwareRenderer's ctor to the render call.
I.e. each frame sent to the renderer carries the format info.
* Reset renderer with the new format instead of re-creating
SoftwareRenderer when incoming frame's format is changed.
Bug:
13842676
Change-Id: Ibab46f109200bcbdeab13a4cc1bcd0870f2a99fb
Chong Zhang [Fri, 15 Aug 2014 19:13:23 +0000 (19:13 +0000)]
Merge "use dedicated looper for GenericSource" into lmp-dev
Lajos Molnar [Fri, 15 Aug 2014 14:55:50 +0000 (14:55 +0000)]
Merge "stagefright: allow specifying flac copmression level by 'complexity'" into lmp-dev
Lajos Molnar [Fri, 15 Aug 2014 14:48:45 +0000 (14:48 +0000)]
Merge "stagefright/media: add support for codec features with text value" into lmp-dev
Andy Hung [Fri, 15 Aug 2014 05:34:52 +0000 (05:34 +0000)]
Merge "nuplayer: create AudioSink early to verify offload is possible" into lmp-dev
Lajos Molnar [Fri, 15 Aug 2014 00:42:47 +0000 (17:42 -0700)]
stagefright: add codec capability info for google audio codecs
Bug:
11990470
Change-Id: I6a7d6758727cc205c636dfb19eb7fe99d67fb084
Lajos Molnar [Fri, 15 Aug 2014 02:55:25 +0000 (19:55 -0700)]
stagefright: allow specifying flac copmression level by 'complexity'
Bug:
11990470
Change-Id: I428961cc654b768773814078f753e2e67243f186
Lajos Molnar [Fri, 15 Aug 2014 02:54:08 +0000 (19:54 -0700)]
stagefright/media: add support for codec features with text value
Bug:
11990470
Change-Id: I7600d999c5f4b6821d825d25fa7e8a2bb5a80c46
Andy Hung [Thu, 14 Aug 2014 22:56:34 +0000 (15:56 -0700)]
nuplayer: create AudioSink early to verify offload is possible
Offload audio playback is not guaranteed even if AudioSystem says it
is allowed. Create AudioSink early to verify offload is really possible.
Move AudioSink open / close into functions.
Bug:
16732303
Bug:
16978805
Change-Id: Ie1c73a96656863c1281bed3280a84b86d3cbadf5
Yin-Chia Yeh [Thu, 14 Aug 2014 21:24:24 +0000 (14:24 -0700)]
cameraservice: update supportedFocusModes for api1
Do not list infinity focus mode if the focuser is not calibrated.
bug
13933979
Change-Id: I677ed22305703ac09eeaf986f5bc2a680cececd8
Chong Zhang [Thu, 14 Aug 2014 21:17:50 +0000 (21:17 +0000)]
Merge "make NuPlayer's http connection mechanism behave more like that of AwesomePlayer's" into lmp-dev
Chong Zhang [Wed, 13 Aug 2014 04:25:48 +0000 (21:25 -0700)]
use dedicated looper for GenericSource
- handle setVideoSurface in deferred action, and return
to client immediately
- handle GenericSource's prepareAsync on its own looper,
instead of sharing looper with NuPlayer
- let HTTPLiveSource share looper with LiveSession, instead
of NuPlayer
- remove reflector in RTSPSource
Bug:
16892748
Change-Id: I1aed557320052012065f5a90adbcb03c238da988
Chong Zhang [Wed, 13 Aug 2014 22:26:49 +0000 (15:26 -0700)]
make NuPlayer's http connection mechanism behave
more like that of AwesomePlayer's
- remove cache specific headers before connect
- read mime type before creating cached source on top
of the http source
Bug:
16892521
Change-Id: Ie13a62dd8dd959be6095a42e2b41e3bc817efeb5
The Android Automerger [Thu, 14 Aug 2014 13:11:21 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
44a5a202101614302f607228d4357496b350bab4
The Android Automerger [Wed, 13 Aug 2014 13:12:12 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
e6e18e8de729316b3fac7733f9ebc7f1b3feba95
Jean-Michel Trivi [Wed, 13 Aug 2014 16:04:00 +0000 (16:04 +0000)]
Merge "audiopolicy: add dump for audio patches" into lmp-dev
Zhijun He [Mon, 11 Aug 2014 21:47:47 +0000 (14:47 -0700)]
Camera API1: Ignore the video size change during recording
Ignore the video size parameter change when recording is active.
Bug:
16524513
Change-Id: I55b7c961c06199764486f48bc2187838c2279606
Chong Zhang [Wed, 13 Aug 2014 21:02:11 +0000 (21:02 +0000)]
Merge "cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough" into lmp-dev
Chong Zhang [Wed, 13 Aug 2014 20:48:10 +0000 (13:48 -0700)]
cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough
Bug:
16892521
Change-Id: I0e2da4134a37e632f9f2c29d1d27d8fded7a7863
Lajos Molnar [Wed, 13 Aug 2014 00:30:20 +0000 (00:30 +0000)]
Merge "stagefright: allow scenarios when dequeueBufferFromNativeWindow fails" into lmp-dev
Glenn Kasten [Mon, 21 Jul 2014 18:22:03 +0000 (11:22 -0700)]
Fix overruns when capturing with resampling
Bug:
16658148
Change-Id: I2dd04b23a143e0948b299d408790e7a46b5a53b0
Lajos Molnar [Tue, 12 Aug 2014 17:28:12 +0000 (10:28 -0700)]
stagefright: allow scenarios when dequeueBufferFromNativeWindow fails
We can run out of native buffers when the bufferqueue is abandoned.
Bug:
16839124
Change-Id: If605f692b87082f1630e1da0fd44da0cb76133f5
Zhijun He [Tue, 12 Aug 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Camera API1: Ignore the video size change during recording" into lmp-dev
Lajos Molnar [Tue, 12 Aug 2014 17:05:56 +0000 (17:05 +0000)]
Merge "MediaCodecList: handle errors gracefully" into lmp-dev
Lajos Molnar [Tue, 12 Aug 2014 15:55:25 +0000 (08:55 -0700)]
MediaCodecList: don't return references
Bug:
16905025
Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487
Lajos Molnar [Mon, 11 Aug 2014 23:46:15 +0000 (16:46 -0700)]
MediaCodecList: handle errors gracefully
Handle missing OMX codecs, and codecs that do not load.
Fix NULL dereference when initializing codec with no type.
Bug:
16907578
Bug:
16905025
Change-Id: I5d103db36ebb029d1aab03222bf6e9324beb1566
Zhijun He [Mon, 11 Aug 2014 21:47:47 +0000 (14:47 -0700)]
Camera API1: Ignore the video size change during recording
Ignore the video size parameter change when recording is active.
Bug:
16524513
Change-Id: I55b7c961c06199764486f48bc2187838c2279606
Chong Zhang [Tue, 12 Aug 2014 00:22:47 +0000 (00:22 +0000)]
Merge "propogate heartbeat error code to app" into lmp-dev
Chong Zhang [Mon, 11 Aug 2014 22:14:10 +0000 (15:14 -0700)]
propogate heartbeat error code to app
Bug:
16885604
Change-Id: Ib6c60f0ef8cf72aa1aac67a75121142bff304018
Andy Hung [Mon, 11 Aug 2014 20:26:28 +0000 (20:26 +0000)]
Merge "Extend downsampling ratios greater than 2:1" into lmp-dev
Igor Murashkin [Mon, 11 Aug 2014 19:47:12 +0000 (19:47 +0000)]
Merge "camera: Allow Camera#getParameters to be called by mediaserver anytime" into lmp-dev
Ricardo Garcia [Tue, 12 Aug 2014 16:04:45 +0000 (16:04 +0000)]
Merge "Fix to support mono in effect buffer allocation." into lmp-dev
Ricardo Garcia [Mon, 11 Aug 2014 19:04:54 +0000 (12:04 -0700)]
Fix to support mono in effect buffer allocation.
Since effects are now enabled for recording, mono cases are possible
and needed to be correctly allocated.
Bug:
16917961
Change-Id: I760fc421f9f90fabb3f0deadd5f9dc61cd284371
Andy Hung [Thu, 7 Aug 2014 18:04:34 +0000 (11:04 -0700)]
Extend downsampling ratios greater than 2:1
Also improve robustness to choice of sampling rate or buffer size
such that increasing either by 10x does not cause overflow.
Bug:
12979141
Bug:
15933066
Change-Id: If7989bd745d1bee3bdf811b8b7c978543ccafb65
Zhijun He [Mon, 11 Aug 2014 17:33:48 +0000 (17:33 +0000)]
Merge "Camera2/3: Cleanup the jpeg buffer size calcaulation logic" into lmp-dev
Jean-Michel Trivi [Mon, 11 Aug 2014 17:22:38 +0000 (17:22 +0000)]
Merge "Update audio ports with profile capabilities" into lmp-dev
Zhijun He [Fri, 8 Aug 2014 19:00:47 +0000 (12:00 -0700)]
Camera2/3: Cleanup the jpeg buffer size calcaulation logic
- Only one place calculating the jpeg size-the device layer, Camera2Device and
Camera3Device.
- Remove size argument for CameraDeviceBase and cleanup related code.
Bug:
14327010
Change-Id: I45d2ab4859ee0cc9273e579254f0569108c748f1
Jean-Michel Trivi [Sun, 10 Aug 2014 21:30:48 +0000 (14:30 -0700)]
Update audio ports with profile capabilities
When opening an output, import the profile capabilities associated
with the device into the AudioPort.
Bug
10549017
Change-Id: If102f5623457542d2c1407ada303c71e43d19a08
Eric Laurent [Sun, 10 Aug 2014 21:07:09 +0000 (14:07 -0700)]
audiopolicy: add dump for audio patches
Bug:
10549017.
Change-Id: I896c8e16c8cf7490bab75295903620a76236f571
Lajos Molnar [Thu, 15 Aug 2013 22:59:19 +0000 (15:59 -0700)]
NuPlayer: add support for proper stop
MediaPlayer.stop() should move to the Stopped state which is
semantically identical to the Initialized state.
Bug:
13138230
Change-Id: I5d7b4a22533f545c24a18e2cd9f7cb2685d42c84
Signed-off-by: Lajos Molnar <lajos@google.com>
Dan Albert [Sat, 9 Aug 2014 06:46:47 +0000 (06:46 +0000)]
Merge changes Idc9808f7,If7bc8e5b into lmp-dev
* changes:
Fix the build after -Bsymbolic fix.
Fix PIC relocations for non-Bsymbolic builds
Robert Shih [Sat, 9 Aug 2014 01:47:09 +0000 (01:47 +0000)]
Merge "NuPlayer: getSelectedTrack" into lmp-dev
Robert Shih [Thu, 10 Jul 2014 01:53:31 +0000 (18:53 -0700)]
NuPlayer: getSelectedTrack
Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6
Lajos Molnar [Sat, 9 Aug 2014 02:01:37 +0000 (02:01 +0000)]
Merge "stagefright: set crop rect in SoftwareRenderer" into lmp-dev
Lajos Molnar [Fri, 8 Aug 2014 17:05:03 +0000 (10:05 -0700)]
stagefright: set crop rect in SoftwareRenderer
Bug:
9563986
Change-Id: Id66a21ef8cdd8350e3eb95d6359fe9c1b94c4f98
Rachad [Sat, 9 Aug 2014 04:56:42 +0000 (04:56 +0000)]
Merge "Added Tunneled video playback support to ACodec" into lmp-dev
Rachad [Tue, 29 Jul 2014 23:47:56 +0000 (16:47 -0700)]
Added Tunneled video playback support to ACodec
Bug:
16132368
Change-Id: I88d2d66b8548fc203f4a2c4797196af15e56ff38
Eric Laurent [Sat, 9 Aug 2014 00:50:59 +0000 (00:50 +0000)]
Merge "audio policy: enable more than one sink per audio patch." into lmp-dev
Lajos Molnar [Sat, 9 Aug 2014 01:53:46 +0000 (01:53 +0000)]
Merge "Fix WAVExtractor to output full audio frames only" into lmp-dev
Eric Laurent [Fri, 8 Aug 2014 22:13:39 +0000 (15:13 -0700)]
audio policy: enable more than one sink per audio patch.
Allow creation of audio patches with more than one sink.
More than one sink is enabled when:
- Connecting an input device to output devices on the same audio HW module.
- Connecting an output mix to output devices on the same audio HA module.
All other patches are limited to one sink.
Bug:
16879363.
Change-Id: I95be6948ef29df64e51e5b8ace38c2db7f3e89f2
Andy Hung [Fri, 8 Aug 2014 22:52:38 +0000 (15:52 -0700)]
Fix WAVExtractor to output full audio frames only
Fixes NuPlayer crash from MediaBuffers ending in partial audio frames.
Bug:
16881623
Change-Id: Ia80a9910f99245e645860c00ae85118cc85bef57
Chong Zhang [Fri, 8 Aug 2014 22:22:35 +0000 (15:22 -0700)]
some clean up of video size change notification
need to consider rotation when notifying video size change after
initial prepare, in addition to after an output format change.
Bug:
16870964
Change-Id: Icd1c9e901ac932e720ce95b8a983c0edcf251c35
Chong Zhang [Fri, 8 Aug 2014 23:01:06 +0000 (23:01 +0000)]
Merge "some clean up of video size change notification" into lmp-dev
Jean-Michel Trivi [Fri, 8 Aug 2014 21:05:14 +0000 (21:05 +0000)]
Merge "AAC decoder: add support for controlling presentation parameters" into lmp-dev
Jean-Michel Trivi [Sat, 2 Aug 2014 05:17:48 +0000 (22:17 -0700)]
AAC decoder: add support for controlling presentation parameters
Control the dowmixing of the AAC decoder
Control the DRC processing of the AAC decoder
Bug
16740915
Change-Id: I9b06ea8785f56213ea120ed85eeb360c88223297
Sasha Levitskiy [Fri, 8 Aug 2014 20:21:59 +0000 (20:21 +0000)]
Merge "libstagefright: foundation: Add syntactic sugar to the cast." into lmp-dev
Sasha Levitskiy [Fri, 8 Aug 2014 16:47:37 +0000 (09:47 -0700)]
libstagefright: foundation: Add syntactic sugar to the cast.
Change-Id: I0b6b3ae440addd4891c26b0639bd6e647a7b031e
Dan Albert [Fri, 8 Aug 2014 05:21:08 +0000 (22:21 -0700)]
Fix the build after -Bsymbolic fix.
Bug:
16853291
Change-Id: Idc9808f76e8be7afb70513c4036b57c91690728e
(cherry picked from commit
8173554d5b5e25215e9c591a0dbb92b8c0ff082e)
Ard Biesheuvel [Fri, 8 Aug 2014 09:43:41 +0000 (11:43 +0200)]
Fix PIC relocations for non-Bsymbolic builds
The ARM assembly contains a couple of hand-coded PC relative references
to data defined in other object files. Make sure the externs are tagged
as hidden so the linker knows that it can resolve the reference locally
at build time.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com>
Bug:
16853291
Change-Id: If7bc8e5bb6a2c63b9df33666d56e6c42f398fd47
(cherry picked from commit
97e3e847179c17eb9059fb322413b6facd3e5a03)
Chong Zhang [Thu, 7 Aug 2014 22:35:07 +0000 (15:35 -0700)]
delay data source creation for GenericSource prepare time
Bug:
16708180
Change-Id: I9d578ef5e2edaed50279d28d3831c68556468f39
Colin Cross [Fri, 8 Aug 2014 04:38:10 +0000 (21:38 -0700)]
libstagefright_foundation: fix build
Change-Id: If61766efa8834df175bd5758c760344364458d4a
Igor Murashkin [Fri, 8 Aug 2014 00:07:28 +0000 (17:07 -0700)]
camera: Allow Camera#getParameters to be called by mediaserver anytime
This fixes a crash if the camera was locked by the media recorder and
another process tried to get the legacy parameters (for the camera
characteristics).
Bug:
16695955
Change-Id: I945a16a686a6987150c8754b5296353e76e5afa0
Wei Jia [Thu, 7 Aug 2014 06:11:39 +0000 (06:11 +0000)]
Revert "NuPlayer: don't feed decoder input data during flushing."
The previous patch results in MediaBuffer leakage.
This reverts commit
69a85b792c31033a99c8858e3b1a3c2ea68b6278.
Bug:
14955925
Bug:
16303659
Bug:
16467066
Bug:
16849601
Change-Id: Ib1892b7603a97e12b7ee228fd5a4009700cdc988
Andy Hung [Fri, 8 Aug 2014 17:28:48 +0000 (17:28 +0000)]
Merge "Fix effect and mono sink handling." into lmp-dev
Andy Hung [Fri, 8 Aug 2014 00:49:53 +0000 (17:49 -0700)]
Fix effect and mono sink handling.
Do not permit mixing to mono sink in AudioFlinger.
Allow effects on mono sink if not Mixer thread (e.g. Record).
Bug:
16863095
Change-Id: I8b232fc1fb3f07bf017020c5d4f9ace644dec6d8
Andy Hung [Fri, 8 Aug 2014 16:12:22 +0000 (16:12 +0000)]
Merge "Clarify and implement MediaCodec status codes" into lmp-dev
Andy Hung [Wed, 30 Jul 2014 22:46:04 +0000 (15:46 -0700)]
Clarify and implement MediaCodec status codes
Clarify MediaCodec status codes in MediaError.h
When appropriate, return OMX error codes for status.
Optionally return a status code from CreateByType() and
CreateByComponentName().
Bug:
12034929
Bug:
13976475
Change-Id: I7463dd08d101074f730481b26127a69c9186c97e
Chong Zhang [Fri, 8 Aug 2014 01:03:55 +0000 (01:03 +0000)]
Merge "delay data source creation for GenericSource prepare time" into lmp-dev
Lajos Molnar [Thu, 7 Aug 2014 21:16:23 +0000 (14:16 -0700)]
stagefright: support flexible YUV format
- Report flexible format for standard OMX formats that are flexible.
- Accept flexible format when specifying video port formats.
Bug:
10706245
Change-Id: I9e82bc895bb0d5d606eb05fdf83bec766eaa2046
Lajos Molnar [Thu, 7 Aug 2014 22:18:35 +0000 (15:18 -0700)]
media/playerservice: add getCodecList() to MediaPlayerService
Bug:
11990470
Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef