OSDN Git Service
Phil Burk [Fri, 28 Jul 2017 18:17:47 +0000 (18:17 +0000)]
Merge "aaudio: add glitch detection to loopback, improve latency check" into oc-dr1-dev
am:
d478859f02
Change-Id: Ic2e44eebd2ef8110321799b01597714b0c0a12e8
TreeHugger Robot [Fri, 28 Jul 2017 18:02:49 +0000 (18:02 +0000)]
Merge "aaudio: add glitch detection to loopback, improve latency check" into oc-dr1-dev
Pawin Vongmasa [Fri, 28 Jul 2017 03:10:43 +0000 (03:10 +0000)]
Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev
am:
3afa6a5f86
Change-Id: I91a738228413f1d2a90dfa27483f612fa604a46d
TreeHugger Robot [Fri, 28 Jul 2017 02:57:28 +0000 (02:57 +0000)]
Merge "Fix the UAF bug caused by a dead stack variable" into oc-dr1-dev
Phil Burk [Fri, 28 Jul 2017 00:21:18 +0000 (00:21 +0000)]
Merge "aaudio: remove AAUDIO_ from clock ids for autodocs" into oc-mr1-dev
Phil Burk [Fri, 14 Jul 2017 15:25:08 +0000 (08:25 -0700)]
aaudio: add glitch detection to loopback, improve latency check
Also improve automatic loop gain control for latency testing.
Use ArgParser to parse command line options.
Bug:
38178592
Test: this is a test
Change-Id: Idfe8f25544a3e7c74ee15be008bf34e3a0741455
Yin-Chia Yeh [Thu, 27 Jul 2017 23:24:11 +0000 (23:24 +0000)]
Merge "Camera: add proper nullptr check" into oc-dr1-dev
am:
4b5215993a
Change-Id: I326e2ded58282529a58df7091b4124531dcf1e7a
Yin-Chia Yeh [Thu, 27 Jul 2017 23:11:00 +0000 (23:11 +0000)]
Merge "Camera: add proper nullptr check" into oc-dr1-dev
Yin-Chia Yeh [Thu, 27 Jul 2017 19:47:03 +0000 (12:47 -0700)]
Camera: add proper nullptr check
Test: CTS
Bug:
64118349
Change-Id: I2fd5c3f32d4e13560a88f4657c4f25faedd869ba
TreeHugger Robot [Thu, 27 Jul 2017 04:13:32 +0000 (04:13 +0000)]
Merge "Organize header dependencies" into oc-mr1-dev
Eric Laurent [Thu, 27 Jul 2017 01:52:33 +0000 (01:52 +0000)]
AudioFlinger: fix set parameters on mmap streams
am:
e6e9a4811d
Change-Id: I557a5a8272f606cd4264f7efbe65e10af64a1f6c
Pawin Vongmasa [Wed, 26 Jul 2017 23:42:54 +0000 (16:42 -0700)]
Fix the UAF bug caused by a dead stack variable
The original code attempts to copy data from a location pointed to by a
local variable that has gone out of scope. This CL moves the copy
operation into the scope.
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
63773604
Change-Id: I980630b6ac30875c2df65664668d4d6b7414f3a7
Eric Laurent [Wed, 26 Jul 2017 02:26:02 +0000 (19:26 -0700)]
AudioFlinger: fix set parameters on mmap streams
Bug:
63935167
Test: Verify capture from USB mic on mmap input stream
Change-Id: I416eb90ef0e9d51d54f6450c374c086ab078d288
Pawin Vongmasa [Wed, 26 Jul 2017 20:16:54 +0000 (20:16 +0000)]
Merge "Allow getrandom() in media.codec process" into oc-dr1-dev
am:
dfcfad27da
Change-Id: I3bb353d97ba7e82127b9786080c1fe3f120edfec
TreeHugger Robot [Wed, 26 Jul 2017 19:53:42 +0000 (19:53 +0000)]
Merge "Allow getrandom() in media.codec process" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:19:32 +0000 (18:19 +0000)]
Merge "fix output nFilledLen when prepareForAdaptivePlayback is true" into oc-mr1-dev
David Lin [Wed, 26 Jul 2017 18:03:27 +0000 (18:03 +0000)]
audiopolicy: do not check for mode_in_communication for voip flags
am:
72ad4b91d6
Change-Id: I742803dd00cdd5bcbdf23b99bb6b415f3f118def
Pawin Vongmasa [Wed, 26 Jul 2017 11:06:28 +0000 (04:06 -0700)]
Allow getrandom() in media.codec process
Test: Run camera-fast-front-back-switch.sh in the bug
Bug:
63907147
Change-Id: I65d3fe66d9cd9663e431db4a56bc66f6c06a0548
David Lin [Wed, 26 Jul 2017 06:46:47 +0000 (23:46 -0700)]
audiopolicy: do not check for mode_in_communication for voip flags
Some VoIP clients may choose to open the streams as soon as the phone
state is set to MODE_RINGTONE to allow lower start latency when the call
is connected. This patch removes the unnecessary check conditions for
MODE_IN_COMMUNICATION since the stream type is sufficient indicator for
setting the flags for VoIP calls.
Bug:
62782025
Test: manual voip mo and mt calls tests
Change-Id: Idc7e1b6f33921580c0937dee71b2b2105cbd31eb
Signed-off-by: David Lin <dtwlin@google.com>
Phil Burk [Wed, 26 Jul 2017 00:33:47 +0000 (17:33 -0700)]
aaudio: remove AAUDIO_ from clock ids for autodocs
Use CLOCK_MONOTONIC instead of AAUDIO_CLOCK_MONOTONIC
Bug:
63915257
Test: Look at the generated autodocs.
Change-Id: I856da9ba4139833bcaef6873e87a3ef58e6ace69
rago [Tue, 25 Jul 2017 18:25:49 +0000 (11:25 -0700)]
Revert float capability for downmixer
Revert floating point processing on downmixer.
This commits partially reverts
d7d013446a64c6de9f0f2dfe098a721b140e0b48
Bug:
63760315
Test: Play multichannel movie
Change-Id: I16edf8767e02ef5d8ff63f52e8d1222ce0d09e22
Pawin Vongmasa [Wed, 19 Jul 2017 18:24:56 +0000 (11:24 -0700)]
Organize header dependencies
Header files that are exported are moved to a specific place for
exporting.
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
63821829
Change-Id: Ia578e3c0dd1ff157335b3a49af896acb922586e8
Andy Hung [Tue, 25 Jul 2017 02:31:38 +0000 (02:31 +0000)]
Merge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev
am:
db5beef4cf
Change-Id: Ifeac95fa06d0160abf2215b84321be4a8823e31b
Andy Hung [Tue, 25 Jul 2017 02:25:08 +0000 (02:25 +0000)]
Merge "MediaPlayer: Permit VolumeShaper operations on gapless playback" into oc-dr1-dev
Ram Mohan [Mon, 3 Jul 2017 11:37:44 +0000 (17:07 +0530)]
fix output nFilledLen when prepareForAdaptivePlayback is true
Bug:
63560919
Bug:
62894603
Change-Id: If1fbd17ebc63743f88c3cbaf2b47a6ee726e06e8
Yin-Chia Yeh [Mon, 24 Jul 2017 23:26:26 +0000 (23:26 +0000)]
Merge "Camera: fix emulator deadlock" into oc-dr1-dev
am:
84201fee0b
Change-Id: Ie036606deb823fb8c33954fa76d37eee6d403e96
TreeHugger Robot [Mon, 24 Jul 2017 23:23:51 +0000 (23:23 +0000)]
Merge "Camera: fix emulator deadlock" into oc-dr1-dev
TreeHugger Robot [Mon, 24 Jul 2017 22:46:17 +0000 (22:46 +0000)]
Merge "Build libmedia_omx with BOARD_VNDK_VERSION" into oc-mr1-dev
Andy Hung [Fri, 21 Jul 2017 23:42:41 +0000 (16:42 -0700)]
MediaPlayer: Permit VolumeShaper operations on gapless playback
This allows unducking to occur when VolumeShaper operations
are applied to the original player.
Test: Automated duck tests
Bug:
63111689
Change-Id: If2e93b1ccb11216032f24e71ab200668e1e4850d
Yin-Chia Yeh [Mon, 24 Jul 2017 20:45:15 +0000 (20:45 +0000)]
Merge "Camera: fix race in disconnect and deleteStream" into oc-dr1-dev
am:
ef00a24944
Change-Id: I4addf62e75478d8a2d9d707ed81974c5306998ed
TreeHugger Robot [Mon, 24 Jul 2017 20:36:06 +0000 (20:36 +0000)]
Merge "Camera: fix race in disconnect and deleteStream" into oc-dr1-dev
Yin-Chia Yeh [Mon, 24 Jul 2017 18:37:23 +0000 (11:37 -0700)]
Camera: fix emulator deadlock
Test: Emulator FastBasicTest 100 iteration, CTS on real device
Bug:
63933389
Change-Id: I27013d64a9cb29cb95591dc0598afbb59ac96290
Jiyong Park [Fri, 21 Jul 2017 08:25:46 +0000 (17:25 +0900)]
Build libmedia_omx with BOARD_VNDK_VERSION
Add dependency to libstagefright_headers.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m -j libmedia_omx
Change-Id: Ia97a981d4cd04acbdc3df6dac63db3f18af21a03
Yin-Chia Yeh [Thu, 20 Jul 2017 23:05:29 +0000 (16:05 -0700)]
Camera: fix race in disconnect and deleteStream
Check and return buffers to just deleted streams.
Also disallow deleteStream when camera runs into error to
simplify the stream lifecycle when error happens.
Test: CTS, manual tests
Bug:
63863140
Change-Id: I476737442041aebd393ec05998969d959cda0228
Emilian Peev [Fri, 21 Jul 2017 16:10:56 +0000 (16:10 +0000)]
Merge "Camera: Avoid freeing outstanding input buffers" into oc-dr1-dev
am:
b2bae26bf4
Change-Id: Ie15f3783ce62a4fb24af2abf3f335ffa50b7688e
TreeHugger Robot [Fri, 21 Jul 2017 16:05:00 +0000 (16:05 +0000)]
Merge "Camera: Avoid freeing outstanding input buffers" into oc-dr1-dev
Phil Burk [Fri, 21 Jul 2017 03:36:13 +0000 (03:36 +0000)]
Merge "aaudio: reduce glitching by improving sleep timing" into oc-dr1-dev
am:
d937a5cf85
Change-Id: Ic8e3f97c88ec2197a6d66a48eb091d8eea166891
TreeHugger Robot [Fri, 21 Jul 2017 03:31:06 +0000 (03:31 +0000)]
Merge "aaudio: reduce glitching by improving sleep timing" into oc-dr1-dev
Phil Burk [Wed, 19 Jul 2017 14:03:52 +0000 (07:03 -0700)]
aaudio: reduce glitching by improving sleep timing
ALways sleep a minimum time to avoid busy wait in real-time thread.
Account for wakeup jitter in threads on the other side of a FIFO.
Avoid race condition that caused a longer sleep than necessary.
Fix calculation of mFreeRunning for capture mode.
Also added systrace logging, which was used to debug this.
Bug:
63814792
Test: Run GStomper on Walleye with MMAP on, see bug
Change-Id: I7b20098580ff454365425bd21e43c17ade532a0a
Emilian Peev [Wed, 19 Jul 2017 01:21:26 +0000 (18:21 -0700)]
Camera: Avoid freeing outstanding input buffers
The producer end can disconnect at any time which
will trigger the freeing of the input buffer. If
any input buffers are outstanding and being processed
by the camera device freeing them can cause stability
issues.
Bug:
63682712
Test: Manual using application.
Change-Id: I25da97786d75e82b1b13dce34953de597bea9b2e
Eino-Ville Talvala [Thu, 20 Jul 2017 17:43:18 +0000 (17:43 +0000)]
Merge "Camera3Device: Don't time out on long exposures" into oc-dr1-dev
am:
57cd4032c0
Change-Id: I494687696489d9e5ab57bd420dc6fb594bb392e7
Eino-Ville Talvala [Thu, 20 Jul 2017 17:37:41 +0000 (17:37 +0000)]
Merge "Camera3Device: Don't time out on long exposures" into oc-dr1-dev
TreeHugger Robot [Thu, 20 Jul 2017 03:26:45 +0000 (03:26 +0000)]
Merge "Move xmlparser to under libstagefright"
TreeHugger Robot [Thu, 20 Jul 2017 03:26:37 +0000 (03:26 +0000)]
Merge "Add non-treble IOMXStore interface"
TreeHugger Robot [Thu, 20 Jul 2017 03:26:31 +0000 (03:26 +0000)]
Merge "Remove unused symbolic links to OMX header files"
Yin-Chia Yeh [Thu, 20 Jul 2017 00:41:37 +0000 (00:41 +0000)]
Merge "Camera: fix deadlock with flush" into oc-dr1-dev am:
679b6f6eaa
am:
9e0561a787
Change-Id: I688acc2229679fab0ae38f4c256619a96c0f291b
Yin-Chia Yeh [Thu, 20 Jul 2017 00:34:21 +0000 (00:34 +0000)]
Merge "Camera: fix deadlock with flush" into oc-dr1-dev
am:
679b6f6eaa
Change-Id: I9fa7a09448ff4b61584e91d04ba974c48e2f4854
TreeHugger Robot [Thu, 20 Jul 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Camera: fix deadlock with flush" into oc-dr1-dev
Lajos Molnar [Wed, 19 Jul 2017 23:40:25 +0000 (16:40 -0700)]
increase OWNERS to the audio/video team
Change-Id: If3bf0b99162b55ab5a745264134de9f3db6b8311
Eric Laurent [Wed, 19 Jul 2017 22:51:33 +0000 (22:51 +0000)]
audioflinger: enable volume listener on direct outputs am:
3e4de77666
am:
31b16502cf
Change-Id: I0fc13815954933454665dd3765f88be7a863e7a7
Eric Laurent [Wed, 19 Jul 2017 22:47:44 +0000 (22:47 +0000)]
audioflinger: enable volume listener on direct outputs
am:
3e4de77666
Change-Id: I4be0cd0d693626c9049583942239fdd35b2e53c6
Pawin Vongmasa [Tue, 11 Jul 2017 00:31:11 +0000 (17:31 -0700)]
Move xmlparser to under libstagefright
Test: make cts -j123 && cts-tradefed run cts-dev --module \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
37657124
Change-Id: Ib78f983635586558b99850b2fd54143b0a418d1d
Pawin Vongmasa [Tue, 11 Jul 2017 02:19:07 +0000 (19:19 -0700)]
Add non-treble IOMXStore interface
Test: Compiles
Bug:
37657124
Change-Id: If1c800ff0560357c6d0d380a83e7e77f621f93da
Pawin Vongmasa [Wed, 19 Jul 2017 01:29:19 +0000 (18:29 -0700)]
Remove unused symbolic links to OMX header files
Test: Compiles
Bug:
63821829
Change-Id: I11f29e5390470c0c8fe30683444d07d450f6fe23
Dan Albert [Wed, 19 Jul 2017 21:43:49 +0000 (21:43 +0000)]
Merge "Use int32_t instead of off_t when necessary." am:
cf6eb0a136 am:
5c38332e6b am:
088db676d6
am:
a617486fd9
Change-Id: I5cedd6d7fa82bb7f24c005cb656184c3b2a7ff03
Dan Albert [Wed, 19 Jul 2017 21:40:47 +0000 (21:40 +0000)]
Merge "Use int32_t instead of off_t when necessary." am:
cf6eb0a136 am:
5c38332e6b
am:
088db676d6
Change-Id: I10336a928394e7f646cb14fde9eb9bae0b9e2452
Dan Albert [Wed, 19 Jul 2017 21:37:19 +0000 (21:37 +0000)]
Merge "Use int32_t instead of off_t when necessary." am:
cf6eb0a136
am:
5c38332e6b
Change-Id: I041150af148d5dda6e5abbb375d6213980521bae
Dan Albert [Wed, 19 Jul 2017 21:34:17 +0000 (21:34 +0000)]
Merge "Use int32_t instead of off_t when necessary."
am:
cf6eb0a136
Change-Id: Id68c84efd00693f3b0d11e4385a12debced4c1aa
Treehugger Robot [Wed, 19 Jul 2017 21:26:22 +0000 (21:26 +0000)]
Merge "Use int32_t instead of off_t when necessary."
Eric Laurent [Sun, 16 Jul 2017 23:55:08 +0000 (16:55 -0700)]
audioflinger: enable volume listener on direct outputs
Always allow effects with no process function on any output
thread type as there is no impact on performance and no risk of
the audio properties not being supported by the effect.
Bug:
63015903
Test: place a Skype call over SCO and verify the volume listener
can be created.
Change-Id: I99db7802cec88a618808e500b74f4c78165199fe
Yin-Chia Yeh [Wed, 19 Jul 2017 01:09:57 +0000 (18:09 -0700)]
Camera: fix deadlock with flush
Test: CTS, run testReprocessAbort 50 times
Bug:
63701864
Change-Id: Id41b68da143c9292437f35f8960ce4f80b9d59f7
John Bruce [Wed, 19 Jul 2017 17:33:46 +0000 (17:33 +0000)]
Merge "Marshal Metrics"
Marco Nelissen [Wed, 19 Jul 2017 17:31:58 +0000 (17:31 +0000)]
Merge "Add owner"
Marco Nelissen [Wed, 19 Jul 2017 17:30:17 +0000 (10:30 -0700)]
Add owner
for drm includes
Change-Id: I8a471a75f9cbbb48494c0bc16766f6aecb804edd
TreeHugger Robot [Wed, 19 Jul 2017 17:08:38 +0000 (17:08 +0000)]
Merge "Close all open drm sessions before destroying a plugin."
Dan Albert [Mon, 17 Jul 2017 20:37:56 +0000 (13:37 -0700)]
Use int32_t instead of off_t when necessary.
Test: make checkbuild
Bug: https://github.com/android-ndk/ndk/issues/459
Change-Id: I72528ca13d1f82debec977efbab62e638b000dfc
Sanna Catherine de Treville Wager [Wed, 19 Jul 2017 03:04:57 +0000 (03:04 +0000)]
Merge "Write audio performance data to file"
Sanna Catherine de Treville Wager [Tue, 11 Jul 2017 21:07:59 +0000 (14:07 -0700)]
Write audio performance data to file
Created new file ReportPerformacne.cpp with file writing
functionality. When short-term histogram array is full,
its data is aggregated into a long-term histogram array.
Cleaned up documentation and comments.
Test: dumpsys media.log
Change-Id: I19f48ea27ffc8205e67ea4ded04615d33a422966
John W. Bruce [Mon, 3 Apr 2017 23:49:05 +0000 (16:49 -0700)]
Marshal Metrics
Because DRM Plugins will not be allowed to call the AMI API under
Treble, the mediadrmservice will need to marshal the metrics out of the
plugin in protobuf format and report them to the AMI API instead. This
patch implements the pulling and interpreting of metrics from DRM
Plugins.
Bug:
36497276
Test: Played Google Play Movies, verified that playback still worked and
Widevine metrics appeared in a dump of the system media metrics.
Change-Id: If07717c1b87022bc1fcdedfbc62b9193899742d5
Jeff Tinker [Mon, 15 May 2017 23:53:10 +0000 (16:53 -0700)]
Close all open drm sessions before destroying a plugin.
MediaDrm relies on each plugin to close its open sessions
when the plugin is destroyed. This change ensures that all
sessions will be closed even if the plugin does not do it.
b/
38323088
Change-Id: I8b6e36182f3b3bc765963819101868fc46001527
Chong Zhang [Tue, 18 Jul 2017 23:21:47 +0000 (23:21 +0000)]
Merge "Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed am:
8a4f540bdf am:
f62d2cf89a am:
c3a8c93bc1" into oc-dr1-dev-plus-aosp
am:
c8d65474e1
Change-Id: Iff4059de466ebf2ffced85ea550288f35e32a397
Chong Zhang [Tue, 18 Jul 2017 23:21:22 +0000 (23:21 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed am:
8a4f540bdf am:
f62d2cf89a am:
719e24e823
am:
c039e42534
Change-Id: Ifdd159b31a4c1caae63b987dca71614df4054a7b
Chong Zhang [Tue, 18 Jul 2017 23:20:59 +0000 (23:20 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3 am:
dfd2808073 am:
db22689ffa am:
6fa5e38154
am:
62a307a826
Change-Id: I006a7829d6ee0d6f2c1ccb61d869c9a0a4c2bf8f
Android Build Merger (Role) [Tue, 18 Jul 2017 23:12:51 +0000 (23:12 +0000)]
Merge "Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed am:
8a4f540bdf am:
f62d2cf89a am:
c3a8c93bc1" into oc-dr1-dev-plus-aosp
Chong Zhang [Tue, 18 Jul 2017 23:11:57 +0000 (23:11 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed am:
8a4f540bdf am:
f62d2cf89a
am:
719e24e823
Change-Id: I97fadf1674b9158656c39f2a5f6d289e6483a381
Chong Zhang [Tue, 18 Jul 2017 23:11:51 +0000 (23:11 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed am:
8a4f540bdf am:
f62d2cf89a
am:
c3a8c93bc1
Change-Id: Ib638389b3b2240dfd7f8e8b9463fb12c1183bda6
Chong Zhang [Tue, 18 Jul 2017 23:03:50 +0000 (23:03 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed am:
8a4f540bdf
am:
f62d2cf89a
Change-Id: I94dd3c484f858660b4d97e7689dd2fbba845db7e
Chong Zhang [Tue, 18 Jul 2017 23:03:50 +0000 (23:03 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed am:
8a4f540bdf
am:
f62d2cf89a
Change-Id: I502a1b8fe8a7344b2ecf34b4145b3b1de7f303a6
Chong Zhang [Tue, 18 Jul 2017 23:02:18 +0000 (23:02 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3 am:
dfd2808073 am:
db22689ffa
am:
6fa5e38154
Change-Id: I31bb503ed6c1dbb21866d576bc7988a3c5e30019
Chong Zhang [Tue, 18 Jul 2017 23:01:50 +0000 (23:01 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b am:
24145427ed
am:
8a4f540bdf
Change-Id: I54c720b3fedd046d9b308c33882f80a4a38466a5
Chong Zhang [Tue, 18 Jul 2017 23:01:34 +0000 (23:01 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3 am:
dfd2808073 am:
db22689ffa am:
9ada6f85bf
am:
865b5dc8ad
Change-Id: I100a7f4db5df765ec151ee63dc0951a64fcb1d21
Phil Burk [Tue, 18 Jul 2017 23:00:50 +0000 (23:00 +0000)]
Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev am:
c1fe2634dc
am:
2dd56c9e2c
Change-Id: I2324f99835d005d46cc2838888c3cc65e66730a1
Chong Zhang [Tue, 18 Jul 2017 22:59:19 +0000 (22:59 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213 am:
a06a77509b
am:
24145427ed
Change-Id: I55ab577a8a2cee7d819439a0c6e04d88248523b9
Chong Zhang [Tue, 18 Jul 2017 22:56:46 +0000 (22:56 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65 am:
0ac0157213
am:
a06a77509b
Change-Id: Id4dda801e6a078d897c0c44dcd66231a2e6fc089
Chong Zhang [Tue, 18 Jul 2017 22:56:45 +0000 (22:56 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3 am:
dfd2808073 am:
db22689ffa
am:
9ada6f85bf
Change-Id: I48c1ee9bd7593da5ff952f1dd5d281a30eb77702
Chong Zhang [Tue, 18 Jul 2017 22:54:44 +0000 (22:54 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d am:
8486817a65
am:
0ac0157213
Change-Id: I77a86457602647bd6eeeb16582497df3ab4274aa
Chong Zhang [Tue, 18 Jul 2017 22:52:49 +0000 (22:52 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3 am:
dfd2808073
am:
db22689ffa
Change-Id: I8e581c4db0b00ab4211c3a807d0370d56bf43ea1
Chong Zhang [Tue, 18 Jul 2017 22:52:48 +0000 (22:52 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173 am:
ee1f46846d
am:
8486817a65
Change-Id: I94eb3461b170d5695111ce12208713221e5ebb17
Chong Zhang [Tue, 18 Jul 2017 22:52:47 +0000 (22:52 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3 am:
dfd2808073
am:
db22689ffa
Change-Id: Ic7105fcbfa58d46d0c33d8e8c26c6ad9cc44c960
Chong Zhang [Tue, 18 Jul 2017 22:49:46 +0000 (22:49 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3
am:
dfd2808073
Change-Id: Ia5a7017d7c4e12b8ef57017c4ff5b11d591ce8a2
Chong Zhang [Tue, 18 Jul 2017 22:49:46 +0000 (22:49 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db am:
fb7c6d9173
am:
ee1f46846d
Change-Id: I7c171b235bdb3349b43824616fedde741e626fde
Chong Zhang [Tue, 18 Jul 2017 22:47:44 +0000 (22:47 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a am:
b38111a0db
am:
fb7c6d9173
Change-Id: Ib8172b10fb3e8df9310662555976cc93d90c87a4
Chong Zhang [Tue, 18 Jul 2017 22:47:43 +0000 (22:47 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787
am:
33e76e05a3
Change-Id: I09e13de158a6de8e283e8e62c7eafdccc562d76b
Chong Zhang [Tue, 18 Jul 2017 22:45:47 +0000 (22:45 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97 am:
2b1df0008a
am:
b38111a0db
Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc
Chong Zhang [Tue, 18 Jul 2017 22:43:44 +0000 (22:43 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820 am:
8d579abf97
am:
2b1df0008a
Change-Id: I2a8d904849b71156cda43aa7e44c377b34a17f10
Chong Zhang [Tue, 18 Jul 2017 22:43:43 +0000 (22:43 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545
am:
3fd727d787
Change-Id: I4e7d44aae1663f1bc0f3d3954cccc8a6fc79bb18
Chong Zhang [Tue, 18 Jul 2017 22:41:13 +0000 (22:41 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820
am:
8d579abf97
Change-Id: I91ae5b377da3c8b253ef481ec66646dfcc7fa590
Chong Zhang [Tue, 18 Jul 2017 22:41:12 +0000 (22:41 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709
am:
d7c144c545
Change-Id: I123cc98202640afedae7854ef00daa02061f1be0
Chong Zhang [Tue, 18 Jul 2017 22:39:13 +0000 (22:39 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18
am:
b226bba820
Change-Id: Iab6732cf5c86c6dec646df209e0f18b6c355780e
Chong Zhang [Tue, 18 Jul 2017 22:39:12 +0000 (22:39 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19
am:
a29bd6a709
Change-Id: If392d8e94a7973026ae9f26beae944bfe7256c16
OSDN Git Service
