git.osdn.net Git - android-x86/frameworks-av.git/log

(root) / android-x86 / frameworks-av.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:47:44 +0000 (22:47 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:45:47 +0000 (22:45 +0000)]

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:43:44 +0000 (22:43 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:41:13 +0000 (22:41 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:37:46 +0000 (22:37 +0000)]

Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a am: 0b542a3789
am: e1e8ea6a19

Change-Id: I10c20451e88d85fd8a9a2ba24456708ca3612f53

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:37:45 +0000 (22:37 +0000)]

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d
am: aafbda5a18

Change-Id: I22778c380e1aa3d268e8e32ff7eb2a458f46e7ef

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)]

Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e am: 998521559a
am: 0b542a3789

Change-Id: Ice81acc494ab5405f281f6132c39a7b64fe3e94d

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)]

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88
am: 5f3ac3898d

Change-Id: I22e4c53577164df13e5590d78dbd6796c1db06fe

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:26:47 +0000 (22:26 +0000)]

Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e
am: 998521559a

Change-Id: I5515052572a4c271ebd277b3a4c6380f5327a166

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:26:46 +0000 (22:26 +0000)]

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88

Change-Id: I87cf81565eefd8ed299014e7aa1e10a00daefc31

commit | commitdiff | tree

Phil Burk [Tue, 18 Jul 2017 22:22:19 +0000 (22:22 +0000)]

Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev
am: c1fe2634dc

Change-Id: I44d29f0bc88935ccba6b365fec242568d35f6079

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:22:12 +0000 (22:22 +0000)]

Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
am: 7da8bef65e

Change-Id: I71d87fce28528a608792b2087951d302c8ddfc21

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:20:12 +0000 (22:20 +0000)]

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
am: d371d08bcc

Change-Id: I6b7dcadbed62315968055d98dd2ffba3228016f9

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:16:14 +0000 (22:16 +0000)]

Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 18 Jul 2017 22:15:39 +0000 (22:15 +0000)]

Merge "aaudio: fix intermittent hang and position error" into oc-dr1-dev

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:14:50 +0000 (22:14 +0000)]

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 18 Jul 2017 19:53:39 +0000 (19:53 +0000)]

Merge "MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965 am: 29204646b9" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:53:23 +0000 (19:53 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965
am: 650446e758

Change-Id: I80ca91c7b13e441eb885287a3589f848ad910ba5

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:53:23 +0000 (19:53 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1 am: 6b79fa9965
am: 29204646b9

Change-Id: I79df2a2702df30faa4ebf9aa685c419a924c89c4

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:51:24 +0000 (19:51 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1
am: 6b79fa9965

Change-Id: I05c6510ddd4abd449e3bf75ec3d8ae8fdaa45917

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:51:24 +0000 (19:51 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca am: b65bc512d1
am: 6b79fa9965

Change-Id: I69819dad31186c037bd4d52280bf7b18c745a31f

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:49:21 +0000 (19:49 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d am: ee04f896ca
am: b65bc512d1

Change-Id: Id341ee30610d4c1e887a71b0deb1ddef3f325f48

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:46:21 +0000 (19:46 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384 am: 830ecba34d
am: ee04f896ca

Change-Id: I06975720cf540f36b1501bf66dcf9cf16ec7512c

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:43:51 +0000 (19:43 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149 am: 6f7295a384
am: 830ecba34d

Change-Id: Iac159cbf205fb02aa600d8b136e70b6d71b44924

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:40:51 +0000 (19:40 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7 am: d8192c9149
am: 6f7295a384

Change-Id: I7f6837cd4aced5a6d83aaf0279cc3908f80a4027

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:39:21 +0000 (19:39 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44 am: 1a1bb632e7
am: d8192c9149

Change-Id: I25ed67aa5671f7484dc99d3d79e0ed33125117f6

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:36:19 +0000 (19:36 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c am: 93ae13644b am: 50280c1b44
am: 1a1bb632e7

Change-Id: I7cd886d0bbe96dcf8aafe082649d2a9a7c1c303e

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:33:18 +0000 (19:33 +0000)]

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:30:50 +0000 (19:30 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584 am: 5cc9f8780c
am: 93ae13644b

Change-Id: I16649e1417e36610e0731da5c47c90a9de169d13

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:28:47 +0000 (19:28 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8 am: e0f4963584
am: 5cc9f8780c

Change-Id: Icb93a3b48a1674066fbf0b07bf11cda56ab22436

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:25:49 +0000 (19:25 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70 am: 0844e1a3e8
am: e0f4963584

Change-Id: I318dd6a90b2af9c4e879e4ab47cfad110002532d

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:22:49 +0000 (19:22 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f am: 263d5a2a70
am: 0844e1a3e8

Change-Id: Ia6f8979298fdb783f4697734fd93fa4663d3da9b

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:20:19 +0000 (19:20 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6 am: 03fa67202f
am: 263d5a2a70

Change-Id: I24e4ade61cbc0a03d20aa4b79b21fe18baa10e43

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:12:37 +0000 (19:12 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053 am: bd7db202c6
am: 03fa67202f

Change-Id: I9336683351fa531560fadbe554eb218fc663585f

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:05:35 +0000 (19:05 +0000)]

MediaPlayerService: fix access of mPlayer in client am: 502c2f4053
am: bd7db202c6

Change-Id: If691af6c8d3c3849da52da943fd754ed9bd1fe0b

commit | commitdiff | tree

Wei Jia [Tue, 18 Jul 2017 19:01:03 +0000 (19:01 +0000)]

MediaPlayerService: fix access of mPlayer in client
am: 502c2f4053

Change-Id: Ib8920a866131f8db7bc0dce0472c257121297de6

commit | commitdiff | tree

Mikhail Naganov [Tue, 18 Jul 2017 17:02:56 +0000 (17:02 +0000)]

Merge "Fix a crash happening in NBLog's 'writeHistToFile'" into oc-dr1-dev
am: 4f771e05db

Change-Id: I5f98efcc60004463862425b9bc4305ad2bd2369d

commit | commitdiff | tree

TreeHugger Robot [Tue, 18 Jul 2017 16:56:40 +0000 (16:56 +0000)]

Merge "Fix a crash happening in NBLog's 'writeHistToFile'" into oc-dr1-dev

commit | commitdiff | tree

Phil Burk [Tue, 18 Jul 2017 13:53:16 +0000 (13:53 +0000)]

Merge "audio: reduce logspam from MMAP mode" into oc-dr1-dev
am: 4dbbda2d8c

Change-Id: I05dc5fc8eed6e3623f01b87df205d009f04cc3f8

commit | commitdiff | tree

Phil Burk [Tue, 18 Jul 2017 13:47:40 +0000 (13:47 +0000)]

Merge "audio: reduce logspam from MMAP mode" into oc-dr1-dev

commit | commitdiff | tree

Eric Laurent [Tue, 18 Jul 2017 00:39:26 +0000 (00:39 +0000)]

audio flinger: fix AEC and NS suspend logic
am: d8365c54d0

Change-Id: Ibe210d88cbd423dfb6c9840946e3d4e35c27dfd1

commit | commitdiff | tree

Phil Burk [Tue, 18 Jul 2017 00:00:02 +0000 (17:00 -0700)]

aaudio: fix intermittent hang and position error

Fix hang caused by recursive mutex.
Fix disconnect caused by getPosition() failing, which was
just because the stream wasn't ready yet.

Bug: 63775537
Bug: 63709749
Test: run "aaudio_loopback -pl -Pl -c2 -n6 -te -m" many times
Change-Id: Ic1d54360b55cfc8ecc1809584c262bc0976c58bb

commit | commitdiff | tree

Mikhail Naganov [Mon, 17 Jul 2017 23:53:38 +0000 (16:53 -0700)]

Fix a crash happening in NBLog's 'writeHistToFile'

The issue was in the possibility of the 'intervals' vector being
empty if the provided 'samples' vector contains only one
element. That leads to 'intervals.end()' being passed to
'intervals.erase()', and vector::erase produces undefined
behaviour in that case.

I see no other calls to 'erase' or 'max_element' in libnbaio,
so that should be the only fix needed.

Bug: 62536501
Test: see test case at bug
Change-Id: I37f93fa42030ed6f5bcb2d46b0a7a2c0af3c82e4

commit | commitdiff | tree

Wei Jia [Fri, 14 Jul 2017 00:47:56 +0000 (17:47 -0700)]

MediaPlayerService: fix access of mPlayer in client

Test: poc doesn't crash
Bug: 38234812
Change-Id: I6f9be046ff66d2d5bed27bd712287e4ead550830

commit | commitdiff | tree

Eric Laurent [Sun, 16 Jul 2017 22:27:05 +0000 (15:27 -0700)]

audio flinger: fix AEC and NS suspend logic

Make sure we suspend/restore AEC and NS only when the suspend condition
actually changes to avoid mismatch in number of suspends/restores
causing the ref counting mechanism to leave the effects in suspend mode
while they should not.

Also clear the suspend state on an effect session before parking it in
the orphan chains list so that it is in default state whne attached to a
new record thread.

Bug: 63015903
Test: verify that switching BT SCO on/off with Duo enables or disables
AEC and NS accordingly

Change-Id: I4d0f0bf818deca3952da3c67bb7e83cb500429c7

commit | commitdiff | tree

jiabin [Mon, 17 Jul 2017 19:09:34 +0000 (19:09 +0000)]

Merge "Add parameters validation on AAudio MMap server" into oc-dr1-dev
am: 30bf42ca72

Change-Id: I6e200b18f9d1c7a02b702a41715ef061b5cafdd8

commit | commitdiff | tree

TreeHugger Robot [Mon, 17 Jul 2017 19:04:45 +0000 (19:04 +0000)]

Merge "Add parameters validation on AAudio MMap server" into oc-dr1-dev

commit | commitdiff | tree

Phil Burk [Mon, 17 Jul 2017 18:13:37 +0000 (11:13 -0700)]

audio: reduce logspam from MMAP mode

Bug: 63760826
Test: run CTS nativemedia/aaudio and notice less logging
Change-Id: I04564963f85577a53f40f1bad064f5e79723ac76

commit | commitdiff | tree

Yin-Chia Yeh [Mon, 17 Jul 2017 18:06:59 +0000 (18:06 +0000)]

Merge "Camera: fix bufferFreed callback object lifecycle issue" into oc-dr1-dev
am: 32ab0585ff

Change-Id: Ief8f546531f68d6521f69ad0e8d7307b390703c6

commit | commitdiff | tree

TreeHugger Robot [Mon, 17 Jul 2017 18:01:56 +0000 (18:01 +0000)]

Merge "Camera: fix bufferFreed callback object lifecycle issue" into oc-dr1-dev

commit | commitdiff | tree

Shuzhen Wang [Sat, 15 Jul 2017 18:19:40 +0000 (18:19 +0000)]

Merge "Camera: Fix "use after free" for mOutstandingBuffers" into oc-dr1-dev
am: af842eb79e

Change-Id: Ia107339f617ccd73510ab8ceeeb61559fb1de958

commit | commitdiff | tree

TreeHugger Robot [Sat, 15 Jul 2017 18:14:19 +0000 (18:14 +0000)]

Merge "Camera: Fix "use after free" for mOutstandingBuffers" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 15 Jul 2017 01:04:25 +0000 (01:04 +0000)]

Merge "Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73 am: a5d728cce1 am: ccd8680538 am: dd36008b78 am: 80e7e68dbf" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Eric Laurent [Sat, 15 Jul 2017 01:04:08 +0000 (01:04 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73 am: a5d728cce1 am: ccd8680538 am: dd36008b78
am: e68bb33712

Change-Id: Ia8dd203330a310795c71282386ed527f9eb7267f

commit | commitdiff | tree

Eric Laurent [Sat, 15 Jul 2017 01:04:08 +0000 (01:04 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73 am: a5d728cce1 am: ccd8680538 am: dd36008b78
am: 80e7e68dbf

Change-Id: Ibe2bc6fac7a100cfaba5097a3b5ab7ac9a1aa2fa

commit | commitdiff | tree

Eric Laurent [Sat, 15 Jul 2017 01:00:07 +0000 (01:00 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73 am: a5d728cce1 am: ccd8680538
am: dd36008b78

Change-Id: Icd196218ebeaa40b2463b1a35eb2cb9e27d76b0c

commit | commitdiff | tree

Eric Laurent [Sat, 15 Jul 2017 01:00:06 +0000 (01:00 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73 am: a5d728cce1 am: ccd8680538
am: dd36008b78

Change-Id: I4ffd95bcaa4dd9a6637c93e85d4c3c18c0a7f89f

commit | commitdiff | tree

Eric Laurent [Sat, 15 Jul 2017 00:56:06 +0000 (00:56 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73 am: a5d728cce1
am: ccd8680538

Change-Id: I0af69333bcb67ef6534175ce986fc05e5a26ffa6

commit | commitdiff | tree

Eric Laurent [Sat, 15 Jul 2017 00:52:06 +0000 (00:52 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73
am: a5d728cce1

Change-Id: I82e1af7e7ff4b7dcc7a9b1121893f7514fdbf05d

commit | commitdiff | tree

Eric Laurent [Sat, 15 Jul 2017 00:48:07 +0000 (00:48 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev
am: 125fc63d73

Change-Id: I33f038d357f2f698df9b37f09ac03e72c32b9bd8

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 15 Jul 2017 00:44:25 +0000 (00:44 +0000)]

Merge "Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5 am: 8ea826e20d am: 4fa1ff8958 -s ours am: 024216f32b am: aee0c0b508" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:44:10 +0000 (00:44 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5 am: 8ea826e20d am: 4fa1ff8958 -s ours am: 024216f32b
am: 42ab59fcd8

Change-Id: I546f2408089202ae63e1bb26abcde323bb5310d0

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:44:09 +0000 (00:44 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5 am: 8ea826e20d am: 4fa1ff8958 -s ours am: 024216f32b
am: aee0c0b508

Change-Id: I65f56a341033cb350357a7029bcffe3900e9794d

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:40:10 +0000 (00:40 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5 am: 8ea826e20d am: 4fa1ff8958 -s ours
am: 024216f32b

Change-Id: Ic4e20defc6f54e16cd9d8ce284db8a9354b4e53a

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:40:10 +0000 (00:40 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5 am: 8ea826e20d am: 4fa1ff8958 -s ours
am: 024216f32b

Change-Id: I9d8f260ec6c5837930b20076377b2c11774b6cc4

commit | commitdiff | tree

TreeHugger Robot [Sat, 15 Jul 2017 00:39:40 +0000 (00:39 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:35:36 +0000 (00:35 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5 am: 8ea826e20d
am: 4fa1ff8958 -s ours

Change-Id: I9a005a4cd15a78c8cc8147e0820c8861c4a14b54

commit | commitdiff | tree

Hangyu Kuang [Sat, 15 Jul 2017 00:32:22 +0000 (00:32 +0000)]

Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev
am: 1a0af2f643

Change-Id: Ic4ff1df004dfedf338df94df41413c27cbbfa0db

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 15 Jul 2017 00:31:57 +0000 (00:31 +0000)]

Merge "Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c am: 9c8bf537e2 am: 76301f781d -s ours am: d3e64e7e1e am: bfff1b4942" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:31:44 +0000 (00:31 +0000)]

Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c am: 9c8bf537e2 am: 76301f781d -s ours am: d3e64e7e1e
am: bfff1b4942

Change-Id: I63a7ee8f933749776d3c8fe4036942a3988d1b7e

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:31:38 +0000 (00:31 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2 am: 301e363ed5
am: 8ea826e20d

Change-Id: I103d3f965c85f35e99efb9f1ebd30f9d53efaea5

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:31:38 +0000 (00:31 +0000)]

Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c am: 9c8bf537e2 am: 76301f781d -s ours am: d3e64e7e1e
am: 4549b5c4e8

Change-Id: Ia2acef9f062f0bd8a66e64eef73c125611b22531

commit | commitdiff | tree

TreeHugger Robot [Sat, 15 Jul 2017 00:29:53 +0000 (00:29 +0000)]

Merge "media: Add more debug information to help timestamp debugging." into oc-dr1-dev

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:27:11 +0000 (00:27 +0000)]

Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c am: 9c8bf537e2 am: 76301f781d -s ours
am: d3e64e7e1e

Change-Id: I9b9799bfa65cace6f6bab85b293f8ff158f94eab

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:27:07 +0000 (00:27 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0 am: bd6594eaf2
am: 301e363ed5

Change-Id: Ie302f86f5110b63b0c1d866c35c7c88f4577cac9

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:27:07 +0000 (00:27 +0000)]

Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c am: 9c8bf537e2 am: 76301f781d -s ours
am: d3e64e7e1e

Change-Id: I7f92da08275fc9e4e71485dabcd44a9a5a1b85c7

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:23:05 +0000 (00:23 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours am: e68844ffb0
am: bd6594eaf2

Change-Id: I864241ad497a7a59f870103f23e1306fa1dc519d

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:23:04 +0000 (00:23 +0000)]

Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c am: 9c8bf537e2
am: 76301f781d -s ours

Change-Id: I8739fcae53e81f21ab6843a467dd442856666ce2

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 15 Jul 2017 00:19:02 +0000 (00:19 +0000)]

Merge "Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am: 80059d44c4 am: 72840f2216 am: 9e9987c46d am: 9583ca702a -s ours am: acf3c39437 am: d1ce7bb7c8 am: bd951d1c5c am: 570dd1184d am: 7475e7996a -s ours am: 5652b2b4d9 am: 5a27b151ae" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:18:38 +0000 (00:18 +0000)]

Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am: 61df326a5e -s ours am: 3092ed372c am: 74952e9616 -s ours am: 162672a9f6 am: 9215fa05fe am: 6757de98ca am: a32f7beef6 -s ours am: 04e0e9c697 am: eb81b99c4a am: bb3f0c8d1c
am: 9c8bf537e2

Change-Id: I82d00420fc16adcc7104344c7ffb10d2d9b661f7

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:18:37 +0000 (00:18 +0000)]

Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c1f am: b8dfff52ee am: 5445ddc983 -s ours am: 8700c26a91 -s ours am: b063a7ea18 am: 92fce7ece7 -s ours am: 3627617c2b am: 671c88a807 am: 1feb9dca54 am: 29b801537c -s ours
am: e68844ffb0

Change-Id: I6546b41a2da12c64db52ed9081ebf20c53eec469

commit | commitdiff | tree

Wei Jia [Sat, 15 Jul 2017 00:18:37 +0000 (00:18 +0000)]

Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am: 80059d44c4 am: 72840f2216 am: 9e9987c46d am: 9583ca702a -s ours am: acf3c39437 am: d1ce7bb7c8 am: bd951d1c5c am: 570dd1184d am: 7475e7996a -s ours am: 5652b2b4d9
am: b991781730

Change-Id: Id46de2f743aec60db33cf1866643f3c3a5bfb9e3

frameworks/av

RSS Atom

About OSDN

Find Software

Develop Software

Help