OSDN Git Service
Lajos Molnar [Mon, 10 Feb 2014 17:45:10 +0000 (17:45 +0000)]
Merge "avcenc: Update video port parameters in the base class"
Lajos Molnar [Mon, 10 Feb 2014 17:41:54 +0000 (17:41 +0000)]
Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
Lajos Molnar [Mon, 10 Feb 2014 17:34:23 +0000 (17:34 +0000)]
Merge "SoftVPXEncoder: Set the frame size on the output port as well"
Marco Nelissen [Mon, 10 Feb 2014 17:12:50 +0000 (17:12 +0000)]
Merge "M3UParser: Fix typo in
8883a38a308"
Martin Storsjo [Mon, 10 Feb 2014 17:09:59 +0000 (19:09 +0200)]
M3UParser: Fix typo in
8883a38a308
Change-Id: I09f8deb40b8b34efd4bfcfab6866b7780f8bae96
Marco Nelissen [Mon, 10 Feb 2014 16:42:46 +0000 (16:42 +0000)]
Merge "M3UParser: Skip query strings when looking for the last slash in a URL"
Colin Cross [Fri, 7 Feb 2014 21:23:06 +0000 (21:23 +0000)]
Merge "frameworks/av: fix errors inside ALOGV"
Colin Cross [Fri, 7 Feb 2014 04:29:44 +0000 (20:29 -0800)]
frameworks/av: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.
Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
Martin Storsjo [Fri, 22 Nov 2013 15:05:05 +0000 (17:05 +0200)]
M3UParser: Skip query strings when looking for the last slash in a URL
Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
Glenn Kasten [Wed, 5 Feb 2014 16:37:48 +0000 (16:37 +0000)]
Merge "audioflinger: conform inline ASM to UAL"
synergy dev [Tue, 4 Feb 2014 11:38:33 +0000 (06:38 -0500)]
audioflinger: conform inline ASM to UAL
Clang requires some inline ASM to conform to the UAL standards (Unified Assembler Language).
This fixes a small issue in this inline asm to allow building.
Change-Id: Ifd9b1814343ab5ade636b9401a21d575559dac16
Lajos Molnar [Mon, 3 Feb 2014 17:53:00 +0000 (17:53 +0000)]
Merge "correct one logic error in decide whether should render or not"
Jianzheng Zhou [Tue, 14 Jan 2014 09:55:16 +0000 (17:55 +0800)]
correct one logic error in decide whether should render or not
Change-Id: Ie41663f6fd5a7d983279f14a2228cb57231771bf
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
Eric Laurent [Fri, 31 Jan 2014 00:59:47 +0000 (00:59 +0000)]
Merge "fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds"
jpadmana [Thu, 14 Nov 2013 11:50:52 +0000 (17:20 +0530)]
fix deadlock issues that arise when there are simultaneous
effect control interface calls to proxy and to
non sub-effect wrappers(eg., bundlewrapper) from audioflinger
Also, return NO_ERROR when CMD_OFFLOAD succeeds
Whenever there are parallel calls to proxy and non sub-effects wrappers,
some of the calls are not completed. This is due to deadlock arsing out
of Proxy waiting for the subeffect call to return and subeffect waiting
for proxy to release lock.
The call flow is changed to a cleaner and simple one - Proxy gets the
aeli(effect library info) of subeffects during the EffectGetSubEffects()
call. Therby, proxy will manage the sub effects by itself rather than
going through effects factory.
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Bug:
12424044
Change-Id: I16852222f1d0e94e433a19177729323a4bb1c090
Eric Laurent [Fri, 31 Jan 2014 00:58:30 +0000 (00:58 +0000)]
Merge "audioflinger: fix static track end detection"
Brian Carlstrom [Thu, 30 Jan 2014 21:51:01 +0000 (21:51 +0000)]
Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: I2db14a7ee28db2449ec6e2384ade21944284528d
Eric Laurent [Sat, 21 Dec 2013 01:36:01 +0000 (17:36 -0800)]
audioflinger: fix static track end detection
If a static track is not a fast track,
prepareTracks_l() must rely on framesReady() to
detect end of buffer and remove the track from the active
track list.
Failing to do so results in the track staying active but
not processed by the mixer because in underrun. This leaves the
mix buffer content uninitialized and causes the effect process
function to accumulate its output onto undefined data.
Bug:
12013676.
Change-Id: Iad72c921fa18d34811abf7d1073890c093a27725
Glenn Kasten [Wed, 29 Jan 2014 17:48:44 +0000 (17:48 +0000)]
Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"
Gaurav Kumar [Mon, 6 Jan 2014 05:27:18 +0000 (10:57 +0530)]
AudioMixer: Remove tracks from enabledTracks after reseting outTemp
If any track goes through AudioMixer::process__genericNoResampling, and
its getnextbuffer returns NULL, Then that track is removed by AudioMixer
from enabledTracks.
Thus if all tracks getnextbuffer return NULL, Then this function doesn't
reset outTemp and last buffer in AudioFlinger's mMixBuffer will be
repeated and noise is observed.
Remove tracks from enabledTracks after reseting outTemp to zero, so that
process__genericNoResampling will reset outTemp and noise won't appear.
Bug:
12450065
Change-Id: I1ccac7ee4a3bf7fd930254356c072099e11e7c19
Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Colin Cross [Tue, 28 Jan 2014 00:43:21 +0000 (00:43 +0000)]
Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Eric Laurent [Mon, 27 Jan 2014 17:19:48 +0000 (17:19 +0000)]
Merge "Only increase the counter when we do take a wakelock"
Eric Laurent [Mon, 27 Jan 2014 17:10:34 +0000 (17:10 +0000)]
Merge "Do partial reads in MemoryLeakTrackUtil"
Oscar Rydhé [Tue, 22 Jan 2013 10:09:54 +0000 (11:09 +0100)]
Do partial reads in MemoryLeakTrackUtil
Do partial read in MemoryLeakTrackUtil dumpMemoryAddresses
to avoid using more memory than what is allocated.
Change-Id: I94feb4e00647407f938571167b981c7371f39e3d
Jimmy Dalqvist [Tue, 14 Jan 2014 13:13:52 +0000 (14:13 +0100)]
Only increase the counter when we do take a wakelock
We keep track on how many wakelocks we have taken. We always
just take one real wakelock but increase / decrease the
counter every time we try to acquire / release a wakelock.
The counter is always increased even if the power manager is
not ready, leading to an incorrect counter that could cause a
crash when we try to release it.
Make sure we only increase the counter when a wakelock, real
or counted, is taken.
Change-Id: Iad940e052694932f1dad8a1a71fa63601d289d6a
Marco Nelissen [Fri, 17 Jan 2014 21:23:17 +0000 (21:23 +0000)]
Merge "Long mp3 metadata displays as corrupted file after transfer"
Marco Nelissen [Fri, 17 Jan 2014 17:08:51 +0000 (17:08 +0000)]
Merge "Added support for ID3v2 meta data in 3gp files"
Marco Nelissen [Fri, 17 Jan 2014 16:04:36 +0000 (16:04 +0000)]
Merge "Fix compile error in NuPlayerRenderer debug print"
Oscar Rydhé [Thu, 27 Jan 2011 13:01:24 +0000 (14:01 +0100)]
Added support for ID3v2 meta data in 3gp files
Added support for parsing ID3v2 meta data from
the ID32 chunk in 3gp files. The priority will be
3gpp -> ID3v2 -> iTunes per field.
Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
Marco Nelissen [Wed, 15 Jan 2014 22:12:04 +0000 (22:12 +0000)]
Merge "Avoid jumps to faulty position after seeks"
Eino-Ville Talvala [Wed, 15 Jan 2014 20:26:02 +0000 (20:26 +0000)]
Merge "libcameraservice: Fix build in ISO C++11 mode"
Nick Kralevich [Sat, 11 Jan 2014 04:20:10 +0000 (04:20 +0000)]
Merge "Fix c++11 narrowing"
Glenn Kasten [Fri, 10 Jan 2014 17:22:39 +0000 (17:22 +0000)]
Merge "Frameworks: AudioFlinger: Fix effects memory leak"
Marco Nelissen [Thu, 9 Jan 2014 17:43:40 +0000 (17:43 +0000)]
Merge "HLS: Fixed rounding error with decimal segment duration"
Narayan Kamath [Wed, 8 Jan 2014 08:56:10 +0000 (08:56 +0000)]
Merge "Change M4OSA_ERR_CREATE to return unsigned integer."
Oscar Rydhé [Tue, 15 Oct 2013 07:54:08 +0000 (09:54 +0200)]
Fix compile error in NuPlayerRenderer debug print
When activating verbose log prints in NuPlayerRenderer the build
fails because a variable have changed but the log print hasn't been
updated.
Change-Id: I3089b087d296c37dfe6379d7e75d5892912fef96
Ashok Bhat [Thu, 2 Jan 2014 14:54:57 +0000 (14:54 +0000)]
Change M4OSA_ERR_CREATE to return unsigned integer.
While M4OSA_ERR is defined as M4OSA_UInt32, MOSA_ERR_CREATE
is defined to return M4OSA_Int32. This leads to signed/unsigned
comparison warnings. M4OSA_ERR_CREATE has been changed to return
M4OSA_UInt32 to fix this issue.
Change-Id: I71a5c50a95c7f296469604b486a1d3969d302a3f
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Eric Laurent [Sat, 21 Dec 2013 01:19:56 +0000 (01:19 +0000)]
Merge "stagefright: do not offload LD-AAC decoding"
Eric Laurent [Fri, 6 Dec 2013 19:51:42 +0000 (11:51 -0800)]
stagefright: do not offload LD-AAC decoding
For now, do not offload LD and ELD AAC decoding because there
is no way to know if it is supported by the audio DSP implementation.
The longer term fix will be to have mapMimeToAudioFormat() use the
audio object type in track metadata to refine the AAC format and the
audio HAL list supported AAC profiles.
Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
Eric Laurent [Sat, 21 Dec 2013 01:18:46 +0000 (01:18 +0000)]
Merge "stagefright: fix offloading HE-AAC sampling rate."
Yin Liu [Tue, 4 Dec 2012 08:19:53 +0000 (09:19 +0100)]
Long mp3 metadata displays as corrupted file after transfer
Cut the metadata to 1 Byte and return in function
getObjectPropertyList in order to show it properly on a PC.
Change-Id: Iefacf9fa86c20ece2572e6d95d35877a94066fe7
Eric Laurent [Fri, 6 Dec 2013 19:16:54 +0000 (11:16 -0800)]
stagefright: fix offloading HE-AAC sampling rate.
Fix HE AAC SBR sampling rate reading for explicit
signaling.
Bug:
11697128.
Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
Oscar Rydhé [Tue, 17 Dec 2013 08:53:18 +0000 (09:53 +0100)]
HLS: Fixed rounding error with decimal segment duration
If segment duration is specified with decimal value only the
integer value will be used, causing the stream duration to
be wrong.
Reported to Android public issue tracker:
https://code.google.com/p/android/issues/detail?id=56223
Change-Id: I34fb7a81af6ad3d9a214228cfe3724636ebf5ab5
Roger1 Jonsson [Thu, 11 Oct 2012 08:32:33 +0000 (10:32 +0200)]
Avoid jumps to faulty position after seeks
When seeking multiple times it is possible that some seeks
are discarded in AwesomePlayer, which causes unwanted jumps
to faulty positions.
The reason is that a seek flag is reset twice in AwesomePlayer.
At first when the video seek is completed and then again when the
audio seek is completed. If a new seek is made after the previous
video seek completed but before the previous audio seek completed,
the new seek position is discarded by the previous audio seek
completion.
This fix makes sure that the seek flag is reset only when video
has completed the seek.
Change-Id: I8f8741d4cb8682345f1d1855bbad57c05f4e3c8d
Nick Kralevich [Wed, 18 Dec 2013 04:12:18 +0000 (04:12 +0000)]
Merge "libeffects: do not use GNU old-style field designators"
synergy dev [Wed, 18 Dec 2013 01:48:51 +0000 (17:48 -0800)]
libeffects: do not use GNU old-style field designators
Avoiding the use of GCC extensions improves code portability
Change-Id: I9edbedc5c8ad4aa46ca54bc2e28280441431a530
Eric Laurent [Tue, 17 Dec 2013 22:06:50 +0000 (22:06 +0000)]
Merge "libstagefright: Delay release of wakelock in TimedEventQueue"
Haynes Mathew George [Fri, 6 Dec 2013 19:31:57 +0000 (11:31 -0800)]
libstagefright: Delay release of wakelock in TimedEventQueue
Delay release of wakelock in the TimedEventQueue to
after an event has been processed.
This ensures AP shutdown does not happen while an event
is ready but hasn't been processed yet.
Bug:
11976087.
Change-Id: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
Eric Laurent [Tue, 17 Dec 2013 22:06:10 +0000 (22:06 +0000)]
Merge "audioflinger: check for condition before waiting"
Haynes Mathew George [Wed, 4 Dec 2013 05:26:02 +0000 (21:26 -0800)]
audioflinger: check for condition before waiting
AsyncCallbackThread must check for any condition that
has already been satisfied before waiting.
Bug:
11824817
Change-Id: Ic8c2090d521ecd6a30b76ee75635258d35eb1eff
Eric Laurent [Tue, 17 Dec 2013 22:05:19 +0000 (22:05 +0000)]
Merge "AudioTrack: fix position callback after restore"
Eric Laurent [Wed, 27 Nov 2013 22:29:13 +0000 (14:29 -0800)]
AudioTrack: fix position callback after restore
When restoring an AudioTrack, the next position callback point
should not be modified and set ahead of current buffer head.
Otherwise, as frames are dropped, the new position is never reached
and an application relying on position callbacks to reload the buffer
would be stalled.
Bug:
11868603.
Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
Eric Laurent [Tue, 17 Dec 2013 22:04:08 +0000 (22:04 +0000)]
Merge "update offloaded audio track sampling rate"
Eric Laurent [Sat, 27 Jul 2013 00:16:50 +0000 (17:16 -0700)]
update offloaded audio track sampling rate
AudioPlayer must read the sampling rate from offloaded audio sinks
whenever a new time position is computed as the decoder can update
the sampling rate on the fly.
Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
Glenn Kasten [Tue, 17 Dec 2013 16:26:41 +0000 (16:26 +0000)]
Merge "Increase kFastTrackMultiplier from 1 to 2"
Andy McFadden [Wed, 11 Dec 2013 21:30:41 +0000 (21:30 +0000)]
Merge changes Ia684fde5,I58fcb526
* changes:
Fix the help text
screenrecord fixes
Andy McFadden [Wed, 11 Dec 2013 21:29:49 +0000 (21:29 +0000)]
Merge "Add "--bugreport" option to screenrecord"
Andy McFadden [Wed, 20 Nov 2013 00:48:50 +0000 (16:48 -0800)]
Fix the help text
Pesky bloggers.
(cherry-pick from Ia8677b054423db292a34e28337431b57804df259)
Change-Id: Ia684fde52697ea78fca79de958ef8b31a50e68ba
Andy McFadden [Tue, 19 Nov 2013 20:50:17 +0000 (12:50 -0800)]
screenrecord fixes
Fixes to issues identified during code review.
(cherry-pick from I2203694acb5c0544878f64f4347d29ad1a0725c4)
Change-Id: I58fcb5264fc17b26fac4b03f95d35262e9e199e2
Andy McFadden [Fri, 18 Oct 2013 14:31:41 +0000 (07:31 -0700)]
Add "--bugreport" option to screenrecord
The --bugreport option adds two visible features: (1) a timestamp
overlay that (mostly) matches logcat, making it easier to match what
appears in the video with what's in the log, and (2) an "info page"
at the start of the video that shows the system configuration.
Enabling this option adds an additional composition step,
increasing the overhead of screenrecord. Depending on the device
and circumstances, this may be unnoticeable or very pronounced.
If --bugreport is not enabled, the overhead of screenrecord is
unchanged.
We also now track device orientation changes. This is currently
detected by polling surfaceflinger, which is suboptimal. As a
result, we detect the rotation too late, and get a weird mixed
frame before the start of the animation for 90-degree changes.
Also, allow the bit rate to be specified as e.g. "4M" for 4Mbps.
Also, --rotate is now deprecated.
Bug
11220305
Bug
11136964
(cherry pick from Ibb94b81d2f73547b95d7a47e027da75fab187a4f)
Change-Id: I829a91aaca5ab82a07c14172d9e188ec38f14e57
The Android Open Source Project [Thu, 5 Dec 2013 20:38:14 +0000 (12:38 -0800)]
Glenn Kasten [Tue, 3 Dec 2013 17:06:43 +0000 (09:06 -0800)]
Increase kFastTrackMultiplier from 1 to 2
Change-Id: I158f147295eebcea96e4047d7618069bc48bdd7d
Marco Nelissen [Thu, 28 Nov 2013 17:26:16 +0000 (17:26 +0000)]
Merge "NuPlayer: Use a software renderer when using software codecs"
Marco Nelissen [Tue, 26 Nov 2013 02:10:18 +0000 (02:10 +0000)]
Merge "Fix SIGABRT when playing mp4 file"
Marco Nelissen [Mon, 25 Nov 2013 16:39:56 +0000 (08:39 -0800)]
Fix SIGABRT when playing mp4 file
If the track duration was shorter than the segment duration, the calculated
encoder padding would be negative, resulting in a crash.
b/
11823061
https://code.google.com/p/android/issues/detail?id=62610
Change-Id: I3989ad88caea38d212b61355c15aec13382c6116
Marco Nelissen [Mon, 25 Nov 2013 16:34:06 +0000 (16:34 +0000)]
Merge "Fixed data offset at parsing IPMP Descriptors"
Martin Storsjo [Fri, 22 Nov 2013 16:11:58 +0000 (18:11 +0200)]
ChromiumHTTPDataSource: Keep track of the redirected URL
This makes the code actually match an existing comment in
DrmInitialization, which claimed that mURI was the redirected
URL and not the original one.
Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
Martin Storsjo [Sat, 10 Aug 2013 20:13:30 +0000 (23:13 +0300)]
SoftVPXEncoder: Set the frame size on the output port as well
This makes sure the MediaCodec output MediaFormat contains
the right width and height.
Change-Id: Ic97af3b5850ebaf563533c3d1cae992be3e4d074
Ichitaro Kohara [Thu, 6 Jun 2013 03:19:17 +0000 (12:19 +0900)]
Fixed data offset at parsing IPMP Descriptors
MPEG4Extractor::parseDrmSINF() miscalculated data offset in parsing
IPMP Descriptors. This commit makes it to take in 2 bytes which is
the size of IPMPS_Type field.
Change-Id: I42cbb6793af9d9b2f14dbfdd7a616096002793f9
The Android Open Source Project [Fri, 22 Nov 2013 18:35:20 +0000 (10:35 -0800)]
Martin Storsjo [Fri, 15 Nov 2013 10:22:23 +0000 (12:22 +0200)]
avcenc: Update video port parameters in the base class
This makes sure that the right parameters are returned on both
input and output ports if queried after setting.
This also makes sure that the output MediaFormat from the
MediaCodec class contains the right video size.
Change-Id: I0667b3b4c6bb90331ad0ae7d51388e1bca3d1bbd
Marco Nelissen [Fri, 15 Nov 2013 22:21:32 +0000 (14:21 -0800)]
am
24605338: Merge "Fix metadata access" into klp-dev
* commit '
246053380a9f628405a29a055a3f1f4fba13ed5b':
Fix metadata access
Marco Nelissen [Fri, 15 Nov 2013 21:58:45 +0000 (21:58 +0000)]
Merge "Fix metadata access" into klp-dev
Marco Nelissen [Fri, 15 Nov 2013 21:49:58 +0000 (13:49 -0800)]
Fix metadata access
Metadata string pointers become invalid after setting more metadata,
so don't cache them.
b/
11692062
Change-Id: Iaf1afb24cf53f7fa36f49ce759355693494076e5
Eric Laurent [Fri, 15 Nov 2013 21:09:54 +0000 (13:09 -0800)]
am
d7e59228: audioflinger: do not use raw pointer for tracks
* commit '
d7e59228caad3867794d847f6bf163c6495e9506':
audioflinger: do not use raw pointer for tracks
Eric Laurent [Fri, 15 Nov 2013 20:02:28 +0000 (12:02 -0800)]
audioflinger: do not use raw pointer for tracks
Commit
9da3d95 surfaced a problem caused by the use of a raw
pointer to a track in offload thread implementation.
Pointers to tracks should always be weak or strong pointers.
Bug:
11708529.
Change-Id: Ic48632532d186c9be8261f73cefdf824b9fbbd2b
Eric Laurent [Fri, 15 Nov 2013 16:25:13 +0000 (08:25 -0800)]
am
7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev
* commit '
7dae71d606ded1dbc2aa9733c3d98ffac57988f2':
AwesomePlayer: correct stream type for offload
Eric Laurent [Fri, 15 Nov 2013 15:34:11 +0000 (15:34 +0000)]
Merge "AwesomePlayer: correct stream type for offload" into klp-dev
Eric Laurent [Fri, 15 Nov 2013 01:28:47 +0000 (17:28 -0800)]
AwesomePlayer: correct stream type for offload
canOffloadStream() function in stagefright utils forces the
stream type to AUDIO_STREAM_MUSIC when querying the audio policy
manager if a particular track is offloadable or not.
This causes MP3 ringtones to be offloaded which is not a validated use case.
The fix consists in using the actual stream type read from the AudioSink.
Bug:
11410937.
Change-Id: I44b8e033a8e785a79cdc291b142f80b5580bdc4d
Eino-Ville Talvala [Thu, 14 Nov 2013 23:44:42 +0000 (15:44 -0800)]
am
d8a62e25: Camera2: Rework the FPS range vs. FPS single setting detection
* commit '
d8a62e25ba6520c2531c7a3d32cc8066e1dab776':
Camera2: Rework the FPS range vs. FPS single setting detection
Eino-Ville Talvala [Thu, 14 Nov 2013 18:32:13 +0000 (10:32 -0800)]
Camera2: Rework the FPS range vs. FPS single setting detection
Give up on current approach of writing out consistent FPS values
into parameters that will be read back by the app.
- Preserve app's latest set parameters exactly, and compare against
them when detecting if a new FPS range or single FPS value has been
selected.
- Since get() returns exactly what was set(), it doesn't matter if the
app calls getParameters() before its next setParameters(), in terms
of retriggering FPS selection logic. Before, the behavior varied
depending on whether the app re-read the parameters.
- As before, if app changes both range and single FPS in a single set
call, the range set wins. Otherwise, the value that has changed more
recently is used.
Bug:
11570973
Change-Id: I72b5e60c3f60e88d55127dd1bda87e26eaf929c6
Eric Laurent [Thu, 14 Nov 2013 16:47:42 +0000 (08:47 -0800)]
am
4215e616: Merge "audioflinger: fix offload track transition" into klp-dev
* commit '
4215e6166fca9f87a6e9e848b3dfd4ab0d25c954':
audioflinger: fix offload track transition
Eric Laurent [Thu, 14 Nov 2013 16:47:42 +0000 (08:47 -0800)]
am
9f357f31: Merge "audioflinger: fix offload resume after drain" into klp-dev
* commit '
9f357f319205d52c04a2c8b5cc9d518ddcfdea94':
audioflinger: fix offload resume after drain
Eric Laurent [Thu, 14 Nov 2013 16:43:19 +0000 (16:43 +0000)]
Merge "audioflinger: fix offload track transition" into klp-dev
Eric Laurent [Thu, 14 Nov 2013 16:42:30 +0000 (16:42 +0000)]
Merge "audioflinger: fix offload resume after drain" into klp-dev
Lajos Molnar [Wed, 13 Nov 2013 23:57:42 +0000 (15:57 -0800)]
am
92092b39: Merge "stagefright: limit default max-input-size for AVC" into klp-dev
* commit '
92092b395d59e8943a461d344f617f1dc85375a3':
stagefright: limit default max-input-size for AVC
Lajos Molnar [Wed, 13 Nov 2013 23:57:41 +0000 (15:57 -0800)]
am
069bcc50: Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev
* commit '
069bcc5084c3d8c6f9373a2890d40a0d1a36a94e':
AwesomePlayer: Improve performance on high-fps clips
Lajos Molnar [Wed, 13 Nov 2013 23:53:42 +0000 (23:53 +0000)]
Merge "stagefright: limit default max-input-size for AVC" into klp-dev
Lajos Molnar [Wed, 13 Nov 2013 23:52:37 +0000 (23:52 +0000)]
Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev
Lajos Molnar [Wed, 13 Nov 2013 22:11:41 +0000 (14:11 -0800)]
stagefright: limit default max-input-size for AVC
AVC has a compression ratio of at least 2. Account for this, as
some codecs refuse exorbitant max-input-size requests.
Change-Id: Ib68b485879ba33a12a486f2ce18fe100be977699
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11599364
Marco Nelissen [Wed, 13 Nov 2013 18:22:11 +0000 (10:22 -0800)]
am
5595f6de: Merge "Only initialize sniffers once, don\'t hold mutex while sniffing" into klp-dev
* commit '
5595f6de606f51ec61fbf40a269b52312507aded':
Only initialize sniffers once, don't hold mutex while sniffing
Marco Nelissen [Wed, 13 Nov 2013 18:11:54 +0000 (18:11 +0000)]
Merge "Only initialize sniffers once, don't hold mutex while sniffing" into klp-dev
Andreas Huber [Wed, 13 Nov 2013 18:11:52 +0000 (10:11 -0800)]
am
26c8f714: Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
* commit '
26c8f714361bfb6403a7c457adfb8b55c89a634a':
Ignore transport stream packets with the "transport_error_indicator" bit set
Andreas Huber [Wed, 13 Nov 2013 18:06:01 +0000 (18:06 +0000)]
Merge "Ignore transport stream packets with the "transport_error_indicator" bit set" into klp-dev
Adam Hampson [Wed, 13 Nov 2013 17:32:00 +0000 (09:32 -0800)]
am
56477eb7: am
27ae268a: am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
56477eb724972c2fe0441dfa7baaad00b7927add':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Adam Hampson [Wed, 13 Nov 2013 17:25:33 +0000 (09:25 -0800)]
am
27ae268a: am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
27ae268af29b25d85f83aa34e92ac8b7f6c87c6f':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Adam Hampson [Wed, 13 Nov 2013 17:21:33 +0000 (09:21 -0800)]
am
00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '
00cb884fc870aba4052c8d187a45e4aec50a6b43':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Adam Hampson [Wed, 13 Nov 2013 17:14:31 +0000 (17:14 +0000)]
Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev