OSDN Git Service
Ray Essick [Mon, 13 Mar 2017 17:21:07 +0000 (17:21 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6 am:
3754af193c am:
0d9990d9f0
am:
98284d4fe0
Change-Id: I933545664aaf68c77cff760c023c364aa605e394
Ray Essick [Mon, 13 Mar 2017 17:16:37 +0000 (17:16 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6 am:
3754af193c
am:
0d9990d9f0
Change-Id: I709642fdd65cabaeffe4549c1685d2e23e45ed66
Ray Essick [Mon, 13 Mar 2017 17:11:36 +0000 (17:11 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625 am:
8e1aef08e6
am:
3754af193c
Change-Id: I19532dd565f3d1e21427336db5efd7137ddeb92a
Ray Essick [Mon, 13 Mar 2017 17:07:05 +0000 (17:07 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev am:
d4c1d61625
am:
8e1aef08e6
Change-Id: I3e4606ccac6574a786470fcb3ccab962273334c0
Ray Essick [Mon, 13 Mar 2017 17:03:05 +0000 (17:03 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev
am:
d4c1d61625
Change-Id: I1d495aadf1ea82b715680596b086a1f29dd1f37c
Ray Essick [Mon, 13 Mar 2017 16:56:49 +0000 (16:56 +0000)]
Merge "Validate lengths in HEVC metadata parsing" into nyc-dev
Andy Hung [Fri, 10 Mar 2017 23:21:33 +0000 (23:21 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d am:
2a381e6f2f am:
d331c1ec6a -s ours am:
e5b8a38673 am:
39ff645bd2 am:
08d8cd5db3 am:
a1bd4556d5
am:
2c908c6721
Change-Id: I494f96948f6659851ceb8879da0ae24e958fc984
Andy Hung [Fri, 10 Mar 2017 23:18:02 +0000 (23:18 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d am:
2a381e6f2f am:
d331c1ec6a -s ours am:
e5b8a38673 am:
39ff645bd2 am:
08d8cd5db3
am:
a1bd4556d5
Change-Id: I8b43db2164e6ab3775d1e0c5759c1403b1da39c1
Andy Hung [Fri, 10 Mar 2017 23:14:33 +0000 (23:14 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d am:
2a381e6f2f am:
d331c1ec6a -s ours am:
e5b8a38673 am:
39ff645bd2
am:
08d8cd5db3
Change-Id: I61786c730e796767a4a0e1d241d5dedc4eeb5e22
Andy Hung [Fri, 10 Mar 2017 23:11:02 +0000 (23:11 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d am:
2a381e6f2f am:
d331c1ec6a -s ours am:
e5b8a38673
am:
39ff645bd2
Change-Id: I8aa4b21fbe4b54c8a08c3a1fb07c481a525cf19a
Andy Hung [Fri, 10 Mar 2017 23:11:02 +0000 (23:11 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9 am:
12b5b3b008 am:
dfecfdb28f am:
3c93457cfc am:
a447516329
am:
cd0677fdfd
Change-Id: Ie1e192c8b0013797c9e08194b6d4bf75ae536538
Andy Hung [Fri, 10 Mar 2017 23:08:00 +0000 (23:08 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9 am:
12b5b3b008 am:
dfecfdb28f am:
3c93457cfc
am:
a447516329
Change-Id: I63259b73f31fbd64d79a5cfb426767f2f18e0904
Andy Hung [Fri, 10 Mar 2017 23:07:31 +0000 (23:07 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d am:
2a381e6f2f am:
d331c1ec6a -s ours
am:
e5b8a38673
Change-Id: I6db8823cd46490d70fd7f9a0a6cc7ac1a3890321
Andy Hung [Fri, 10 Mar 2017 23:04:32 +0000 (23:04 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9 am:
12b5b3b008 am:
dfecfdb28f
am:
3c93457cfc
Change-Id: I93dfca6c08ba2c9096b1c297c33e0a773d16d054
Andy Hung [Fri, 10 Mar 2017 23:04:02 +0000 (23:04 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d am:
2a381e6f2f
am:
d331c1ec6a -s ours
Change-Id: I002064f85d1b2f40f5f01e3327cfc9e7db70769d
Andy Hung [Fri, 10 Mar 2017 23:00:32 +0000 (23:00 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0 am:
5a18b3d70d
am:
2a381e6f2f
Change-Id: Id9435fdd365f1eb5f1cf759e47cd675549f83a20
Andy Hung [Fri, 10 Mar 2017 23:00:31 +0000 (23:00 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9 am:
12b5b3b008
am:
dfecfdb28f
Change-Id: I0b4de04aab9058db4beb6346c00208b697ed4f78
Andy Hung [Fri, 10 Mar 2017 22:56:31 +0000 (22:56 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732 am:
9262496af9
am:
12b5b3b008
Change-Id: I9a46a6aaa2ff3afc4be729f7877703d1bf97faa7
Andy Hung [Fri, 10 Mar 2017 22:56:31 +0000 (22:56 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours am:
b1c01ac1a0
am:
5a18b3d70d
Change-Id: I90e4e976fd9a07f06a32233ae245134fe372d234
Andy Hung [Fri, 10 Mar 2017 22:53:03 +0000 (22:53 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e am:
3995196b9d -s ours
am:
b1c01ac1a0
Change-Id: I271a41d905cafdb3f4fa2c9fc4fbd183fd0af08b
Andy Hung [Fri, 10 Mar 2017 22:53:00 +0000 (22:53 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2 am:
78ec332732
am:
9262496af9
Change-Id: I8df7a4c1308afb39a1f1a37a588e70e049a868fa
Andy Hung [Fri, 10 Mar 2017 22:49:30 +0000 (22:49 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451 am:
3fb4149ed2
am:
78ec332732
Change-Id: I50a7b9f86a494bff6aa43e719e5c819eb0c191ae
Andy Hung [Fri, 10 Mar 2017 22:49:29 +0000 (22:49 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours am:
fe66ce6f1e
am:
3995196b9d -s ours
Change-Id: I4fa4eb204b244593d03c8bfa7f1169ee047c6652
Andy Hung [Fri, 10 Mar 2017 22:46:29 +0000 (22:46 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334 am:
5562d70451
am:
3fb4149ed2
Change-Id: I9101bb9cc966e9d99c78427697b6c570a7da753d
Andy Hung [Fri, 10 Mar 2017 22:46:29 +0000 (22:46 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours am:
9fe1d60957 -s ours
am:
fe66ce6f1e
Change-Id: I1c49e3520b11aebc987242540b8a3047db72e269
Andy Hung [Fri, 10 Mar 2017 22:42:59 +0000 (22:42 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1 am:
6d4b5fc334
am:
5562d70451
Change-Id: Ia73c4a1d2911cf930700bf796fc7ee18d94500fe
Andy Hung [Fri, 10 Mar 2017 22:42:59 +0000 (22:42 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a am:
de6072164a -s ours
am:
9fe1d60957 -s ours
Change-Id: I06683878d8e39e9d9dcae9f897124c36f6b968bf
Andy Hung [Fri, 10 Mar 2017 22:39:59 +0000 (22:39 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9 am:
5dc0e88cc1
am:
6d4b5fc334
Change-Id: Ie47307f09c5fcb49f81a2d034c42d69b8417c9a6
Andy Hung [Fri, 10 Mar 2017 22:39:58 +0000 (22:39 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57 am:
737754e97a
am:
de6072164a -s ours
Change-Id: I33a81bea7f8e210dbadade3f9bd63a3decbfb478
Andy Hung [Fri, 10 Mar 2017 22:36:28 +0000 (22:36 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev am:
51a3483ec9
am:
5dc0e88cc1
Change-Id: Id24ba3565e66b9e4e6e738d840ad3400ff133a4c
Andy Hung [Fri, 10 Mar 2017 22:36:28 +0000 (22:36 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev am:
e0da30dc57
am:
737754e97a
Change-Id: Ide9fb3f4955a31ade22f99c299f441d8413c1b88
Andy Hung [Fri, 10 Mar 2017 22:32:59 +0000 (22:32 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev
am:
51a3483ec9
Change-Id: I6fe5fb0a7142218b16c84bc1966a84ac920fd70a
Andy Hung [Fri, 10 Mar 2017 22:32:59 +0000 (22:32 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev
am:
e0da30dc57
Change-Id: Ia8aee821949f27b81e5c0ddca2e39aa9e478a432
Andy Hung [Fri, 10 Mar 2017 22:29:51 +0000 (22:29 +0000)]
Merge "DO NOT MERGE AudioFlinger: Check framecount overflow when creating track" into klp-dev
Andy Hung [Fri, 10 Mar 2017 22:29:43 +0000 (22:29 +0000)]
Merge "AudioFlinger: Check framecount overflow when creating track" into lmp-dev
Jerry Zhang [Wed, 8 Mar 2017 00:25:30 +0000 (00:25 +0000)]
Merge "Add support for MTP_RESET_DEVICE operation." am:
52afe9d2cf
am:
bf7c90ad04
Change-Id: I9401a35b6c991925d65ad4be3d55d1770f8c60db
Jerry Zhang [Wed, 8 Mar 2017 00:22:29 +0000 (00:22 +0000)]
Merge "Add support for MTP_RESET_DEVICE operation."
am:
52afe9d2cf
Change-Id: I36c8e325e2b2dde85cb2a3546508c95e5da77e57
Jerry Zhang [Wed, 8 Mar 2017 00:18:31 +0000 (00:18 +0000)]
Merge "Add support for MTP_RESET_DEVICE operation."
Jerry Zhang [Fri, 24 Feb 2017 00:39:30 +0000 (16:39 -0800)]
Add support for MTP_RESET_DEVICE operation.
Since we only support one open session, this
command is the same as CLOSE_SESSION.
Test: mtp-reset
Change-Id: I2e95687a685af239c92473feb7c98419fcd55a1e
Jiwen 'Steve' Cai [Tue, 7 Mar 2017 19:47:12 +0000 (19:47 +0000)]
Merge "Add more AIMAGE_FORMAT for RGB formats" am:
1df67b1b3a
am:
0942860c57
Change-Id: I588c345647455acef2a6322de8039da28128a3e2
Jiwen 'Steve' Cai [Tue, 7 Mar 2017 19:44:41 +0000 (19:44 +0000)]
Merge "Add more AIMAGE_FORMAT for RGB formats"
am:
1df67b1b3a
Change-Id: I8c42e7f3f25dabc79e238407ea6069ce16f77ada
Treehugger Robot [Tue, 7 Mar 2017 19:40:03 +0000 (19:40 +0000)]
Merge "Add more AIMAGE_FORMAT for RGB formats"
Jiwen 'Steve' Cai [Wed, 8 Feb 2017 22:41:41 +0000 (14:41 -0800)]
Add more AIMAGE_FORMAT for RGB formats
As we are adding AHardwareBuffer access through AImage and AImageReader,
we now need buffer formats used by GL/Vulkan.
Bug:
35114769
Test: Built system and ran native camera cts
Change-Id: I4157c933b411ab597799c933d18fc78ad3323eb5
(cherry picked from commit
de2a544846419f61080b8f7db427261807390747)
Marco Nelissen [Tue, 7 Mar 2017 04:08:19 +0000 (04:08 +0000)]
Merge "Guard against sample time overflow" am:
7639616e4f
am:
5dfade5b09
Change-Id: Ied4068d43807308aaf74dbe7e9aca30359c2b68e
Marco Nelissen [Tue, 7 Mar 2017 04:06:18 +0000 (04:06 +0000)]
Merge "Guard against sample time overflow"
am:
7639616e4f
Change-Id: Ia671a67d80f63f7c88763efbe4853d45d5e5e2d2
Marco Nelissen [Tue, 7 Mar 2017 04:02:37 +0000 (04:02 +0000)]
Merge "Guard against sample time overflow"
Bartosz Bialek [Fri, 3 Mar 2017 11:55:25 +0000 (12:55 +0100)]
Guard against sample time overflow
Malformed content that has unexpectedly big delta values in stts atom
might cause integer overflow on calculating sample time while preparing
sample table. This commit prevents this situation.
Test: play mp4 file with quite big 'stts' value
Bug:
35985363
Change-Id: I6bc66f77b8b99a14517e56c3ceba9ddb9bf5524d
Ray Essick [Fri, 24 Feb 2017 00:08:09 +0000 (16:08 -0800)]
Validate lengths in HEVC metadata parsing
Add code to validate the size parameter passed to
HecvParameterSets::addNalUnit(). Previously vulnerable
to decrementing an unsigned past 0, yielding a huge result value.
Bug:
35467107
Test: ran POC, no crash, emitted new "bad length" log entry
Change-Id: Ia169b9edc1e0f7c5302e3c68aa90a54e8863d79e
Caroline Tice [Thu, 2 Mar 2017 05:44:32 +0000 (05:44 +0000)]
Merge "Fix "Dereference of null pointer" compiler warning." am:
18dc831e66
am:
ff95675c5f
Change-Id: Idb1c5013ebd6cecdcf5c0990dc3f57169c2f62c6
Caroline Tice [Thu, 2 Mar 2017 05:38:02 +0000 (05:38 +0000)]
Merge "Fix "Dereference of null pointer" compiler warning."
am:
18dc831e66
Change-Id: I416975454087a747946f55706bce70a7faa6b255
Treehugger Robot [Thu, 2 Mar 2017 05:26:09 +0000 (05:26 +0000)]
Merge "Fix "Dereference of null pointer" compiler warning."
Yunlian Jiang [Wed, 1 Mar 2017 01:19:16 +0000 (01:19 +0000)]
Merge "fix warning: dereference of a null pointer" am:
9a6b9ed394
am:
90b59dbb0d
Change-Id: I032627fd4dfa35421e2dd7c81c008b9e87c8470c
Yunlian Jiang [Wed, 1 Mar 2017 01:16:45 +0000 (01:16 +0000)]
Merge "fix warning: dereference of a null pointer"
am:
9a6b9ed394
Change-Id: I8f944dd30a2663262baa00a08c1e4204a29242eb
Treehugger Robot [Wed, 1 Mar 2017 01:10:01 +0000 (01:10 +0000)]
Merge "fix warning: dereference of a null pointer"
Jerry Zhang [Thu, 23 Feb 2017 18:47:42 +0000 (18:47 +0000)]
Merge "Raise MTP max burst values." am:
b95db7560e
am:
840e2dcbae
Change-Id: I9105677db300d5d4782aa322ffc7c3f0f0230e69
Jerry Zhang [Thu, 23 Feb 2017 18:44:42 +0000 (18:44 +0000)]
Merge "Raise MTP max burst values."
am:
b95db7560e
Change-Id: I56563e74a34598d6e4415f0c2054932f88cd8bd2
Jerry Zhang [Thu, 23 Feb 2017 18:40:59 +0000 (18:40 +0000)]
Merge "Raise MTP max burst values."
Jerry Zhang [Mon, 13 Feb 2017 22:24:13 +0000 (14:24 -0800)]
Raise MTP max burst values.
Slightly increases transfer speeds on USB 3.0 connections.
Test: Transfer files
Change-Id: I25fb0a37fa92063356c4a2a0e0ba7f011b6b0527
Yunlian Jiang [Wed, 22 Feb 2017 02:28:53 +0000 (02:28 +0000)]
Merge "fix warning: Dereference of null pointer" am:
a2e67eb95e
am:
7ac1f99edb
Change-Id: I99cb39bc90224c2c59e392eb02f5ce8d1c5b99ab
Yunlian Jiang [Wed, 22 Feb 2017 02:26:53 +0000 (02:26 +0000)]
Merge "fix warning: Dereference of null pointer"
am:
a2e67eb95e
Change-Id: I37a6738f637cfa1a5fa0ccdf0ed7f3aa2986b207
Treehugger Robot [Wed, 22 Feb 2017 02:21:11 +0000 (02:21 +0000)]
Merge "fix warning: Dereference of null pointer"
Yunlian Jiang [Wed, 22 Feb 2017 02:15:22 +0000 (02:15 +0000)]
Merge "fix warning: struct argument contains uninitialized data" am:
4ad8990c14
am:
fa4baa3422
Change-Id: Ia7a0d46b0a4cb0c1d39b6c9ec9f0e06c733b009b
Yunlian Jiang [Wed, 22 Feb 2017 02:12:54 +0000 (02:12 +0000)]
Merge "fix warning: struct argument contains uninitialized data"
am:
4ad8990c14
Change-Id: If332f7d2f5be4180f4cf32f92ae86d62711f3b9b
Treehugger Robot [Wed, 22 Feb 2017 02:07:35 +0000 (02:07 +0000)]
Merge "fix warning: struct argument contains uninitialized data"
Yunlian Jiang [Wed, 22 Feb 2017 01:53:51 +0000 (01:53 +0000)]
Merge "fix uninitialized warning." am:
2008d8857c
am:
ad17ddb376
Change-Id: I8fd647b38b0a911a9bc7fbcd9cefd046362dec5b
Yunlian Jiang [Wed, 22 Feb 2017 01:52:22 +0000 (01:52 +0000)]
Merge "fix uninitialized warning."
am:
2008d8857c
Change-Id: I867d7b49f827b4817186b0d13a17de62bc143e7c
Treehugger Robot [Wed, 22 Feb 2017 01:46:28 +0000 (01:46 +0000)]
Merge "fix uninitialized warning."
Yunlian Jiang [Wed, 22 Feb 2017 00:10:45 +0000 (16:10 -0800)]
fix uninitialized warning.
This fixes warning: The left operand of '%' is a garbage value.
Bug: None.
Test: The warning is gone.
Change-Id: I191e5bfd9d5f5136afcc2b5d8277c44b7d223998
Yunlian Jiang [Tue, 21 Feb 2017 23:58:09 +0000 (15:58 -0800)]
fix warning: struct argument contains uninitialized data
This fixes the warning warning: Passed-by-value struct argument contains
uninitialized data (e.g., field: 'command') [clang-analyzer-core.CallAndMessage]
Bug: None
Test: The warning is gone.
Change-Id: I3e06ff484bdec995c5125433acb5c3f14dc29dd9
Wei Jia [Tue, 21 Feb 2017 21:50:32 +0000 (21:50 +0000)]
Merge "NuPlayerSource: clarify getFormat API and fix its usage." am:
aeaa5f825c
am:
bed2c85b57
Change-Id: I60eb1ef00366a8196a8355ecdcdb7fadba4685e9
Wei Jia [Tue, 21 Feb 2017 21:48:01 +0000 (21:48 +0000)]
Merge "NuPlayerSource: clarify getFormat API and fix its usage."
am:
aeaa5f825c
Change-Id: I426a5e295bbac1365cf7b21ad6529ba0a544c760
Treehugger Robot [Tue, 21 Feb 2017 21:40:39 +0000 (21:40 +0000)]
Merge "NuPlayerSource: clarify getFormat API and fix its usage."
Wei Jia [Wed, 28 Dec 2016 22:59:59 +0000 (14:59 -0800)]
NuPlayerSource: clarify getFormat API and fix its usage.
Test: manually run mediaplayer
Bug:
33818804
Change-Id: I1a4e551493fa9521b3b1159182d446e8a9e7d523
(cherry picked from commit
9737d3497f6ef8bf6a1083aabd8a03569944795d)
Android Build Merger (Role) [Thu, 16 Feb 2017 02:17:13 +0000 (02:17 +0000)]
Merge "DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32 am:
5b83000768 am:
e45718e94a am:
a9cfe53698" into nyc-mr2-dev-plus-aosp
Wonsik Kim [Thu, 16 Feb 2017 02:16:59 +0000 (02:16 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32 am:
5b83000768 am:
e45718e94a
am:
ba2f1aa053
Change-Id: Iee769ee23546c3f528e19b7c899e62f550da79f0
Wonsik Kim [Thu, 16 Feb 2017 02:16:56 +0000 (02:16 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32 am:
5b83000768 am:
e45718e94a
am:
a9cfe53698
Change-Id: I23c78e8ec2255898d1159367b6aca5f7e80e279b
Wonsik Kim [Thu, 16 Feb 2017 02:13:26 +0000 (02:13 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32 am:
5b83000768
am:
e45718e94a
Change-Id: I4f8dac88320585f148ecdb4c8fcced152a1ed663
Wonsik Kim [Thu, 16 Feb 2017 02:13:25 +0000 (02:13 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32 am:
5b83000768
am:
e45718e94a
Change-Id: I62f8274399590f8278599052c5589bb32dd9869f
Wonsik Kim [Thu, 16 Feb 2017 02:09:56 +0000 (02:09 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours am:
437d60bffb am:
028e36fe32
am:
5b83000768
Change-Id: I2b76f334a0bc07f3fd4cc5db96efb996e894c069
Wonsik Kim [Thu, 16 Feb 2017 02:06:18 +0000 (02:06 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours am:
437d60bffb
am:
028e36fe32
Change-Id: I29ac629e641033bca6bd0ff47ef72ddec1c885bc
Android Build Merger (Role) [Thu, 16 Feb 2017 02:06:14 +0000 (02:06 +0000)]
Merge "codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f am:
c5343a578c am:
9224cc83f7 am:
b67b0afbf5" into nyc-mr2-dev-plus-aosp
Wonsik Kim [Thu, 16 Feb 2017 02:05:56 +0000 (02:05 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f am:
c5343a578c am:
9224cc83f7
am:
a68afd769c
Change-Id: I0889b0b089e7386fd4f779a3b7db1b8ecbe40b25
Wonsik Kim [Thu, 16 Feb 2017 02:05:56 +0000 (02:05 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f am:
c5343a578c am:
9224cc83f7
am:
b67b0afbf5
Change-Id: I26a58fca276ac6d896d62ad4224fa6513bedf86e
Wonsik Kim [Thu, 16 Feb 2017 02:02:54 +0000 (02:02 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0 am:
3b57c387ed -s ours
am:
437d60bffb
Change-Id: Ic71554bdaf82a64d2c10cc6ef194068366211bf1
Wonsik Kim [Thu, 16 Feb 2017 02:02:54 +0000 (02:02 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f am:
c5343a578c
am:
9224cc83f7
Change-Id: Id3cf87221a3e1c8bc7a437079a4cfd121d3096a4
Wonsik Kim [Thu, 16 Feb 2017 02:02:53 +0000 (02:02 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f am:
c5343a578c
am:
9224cc83f7
Change-Id: Iaef9a2b69240cc6517dc78bf85b68b4e23e51c9c
Wonsik Kim [Thu, 16 Feb 2017 01:58:22 +0000 (01:58 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543 am:
dbeeaf29d0
am:
3b57c387ed -s ours
Change-Id: I1fa21c62180e7078289c291a58177cfb6adf6b00
Wonsik Kim [Thu, 16 Feb 2017 01:57:52 +0000 (01:57 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610 am:
e80b15a63f
am:
c5343a578c
Change-Id: Ia4576778d6266485f524fcc4c84dfbdb9750e1be
Wonsik Kim [Thu, 16 Feb 2017 01:55:45 +0000 (01:55 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4 am:
2430ff6610
am:
e80b15a63f
Change-Id: I64b7684e3306b35b96b92cd71fae359d8bb613f5
Wonsik Kim [Thu, 16 Feb 2017 01:54:52 +0000 (01:54 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025 am:
1dfa590543
am:
dbeeaf29d0
Change-Id: I69aa294ccdcc83aa5da29a16368e7ecb7280ab61
Wonsik Kim [Thu, 16 Feb 2017 01:51:22 +0000 (01:51 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e am:
58f7175ed4
am:
2430ff6610
Change-Id: I4099ab29c596f5ad2f03e0c018b0c2fddb078ed7
Wonsik Kim [Thu, 16 Feb 2017 01:51:21 +0000 (01:51 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours am:
292dc7e025
am:
1dfa590543
Change-Id: I766507dac31afdee5755897fb201a961fba66793
Wonsik Kim [Thu, 16 Feb 2017 01:47:52 +0000 (01:47 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0 am:
83485b615e
am:
58f7175ed4
Change-Id: Ib5d28de651178b0ab7cd3e44793a6078d904ff4c
Wonsik Kim [Thu, 16 Feb 2017 01:47:51 +0000 (01:47 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc am:
55d8132edd -s ours
am:
292dc7e025
Change-Id: I50fda0957b316040f2dc4be9b3abe8818f02a3d5
Wonsik Kim [Thu, 16 Feb 2017 01:44:50 +0000 (01:44 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours am:
1760d73fbc
am:
55d8132edd -s ours
Change-Id: Ib1c0af161a2113c2c5f47d091c024ee34cb389e5
Wonsik Kim [Thu, 16 Feb 2017 01:44:21 +0000 (01:44 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799 am:
787a5136f0
am:
83485b615e
Change-Id: I3d18f79b2d7a22122756e0cf4af2b7d46dfe808b
Wonsik Kim [Thu, 16 Feb 2017 01:41:21 +0000 (01:41 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours am:
da9246fa5e -s ours
am:
1760d73fbc
Change-Id: Icecef8789c79bb5b61e05062a2839b2462653004
Wonsik Kim [Thu, 16 Feb 2017 01:41:21 +0000 (01:41 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02 am:
a5e72ec799
am:
787a5136f0
Change-Id: Ie4050fea30e11b772d6a60833ffcf6c000778461
Wonsik Kim [Thu, 16 Feb 2017 01:38:20 +0000 (01:38 +0000)]
DO NOT MERGE codecs: handle onReset() for a few encoders am:
dd447c354e am:
afaa438503 am:
daaabdcaac -s ours
am:
da9246fa5e -s ours
Change-Id: I72b4c927264c5c796b7d52dfe961a5ed15a03fdb
Wonsik Kim [Thu, 16 Feb 2017 01:37:50 +0000 (01:37 +0000)]
codecs: handle onReset() for a few encoders am:
5443b57cc5 am:
89f501d046 am:
4f428b7c02
am:
a5e72ec799
Change-Id: I3c4fc719cae8632fb7223db29ea035ed1a80616a
OSDN Git Service
