OSDN Git Service
Tomasz Wasilczyk [Thu, 22 Jun 2017 23:29:00 +0000 (23:29 +0000)]
Fix null pointer dereference.
am:
d0b096052c
Change-Id: Ic11440f05d9b9ba81dded634b417a0b13bf3653b
Tomasz Wasilczyk [Thu, 22 Jun 2017 20:27:11 +0000 (13:27 -0700)]
Fix null pointer dereference.
Bug: b/
62282239
Test: vendor verified it
Change-Id: I9d8560f07044c83f6ab58ef534514061f900319e
Marco Nelissen [Wed, 21 Jun 2017 17:52:48 +0000 (17:52 +0000)]
Merge "Fix tiny memory leak" am:
84f7e6acb9
am:
112af391b2
Change-Id: I76cae10e3a2b894add6dd4479d8cced8db5f7cd3
Marco Nelissen [Wed, 21 Jun 2017 17:50:05 +0000 (17:50 +0000)]
Merge "Fix tiny memory leak"
am:
84f7e6acb9
Change-Id: Ie060723c5336dd166c3cbdf4d19ede7f7bbab3f2
Marco Nelissen [Wed, 21 Jun 2017 17:38:51 +0000 (17:38 +0000)]
Merge "Fix tiny memory leak"
Venkatarama Avadhani [Wed, 21 Jun 2017 17:02:47 +0000 (17:02 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754 am:
7a22cc8944
am:
4226c955b6
Change-Id: I38d98f41e46e62a2a1a1c660ebf1faec58a1d848
Venkatarama Avadhani [Wed, 21 Jun 2017 17:00:18 +0000 (17:00 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04 am:
b866f43754
am:
7a22cc8944
Change-Id: Idd82dbb633faaef7e78fb2d1082b91269926e675
Venkatarama Avadhani [Wed, 21 Jun 2017 16:57:45 +0000 (16:57 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3 am:
25c4535f04
am:
b866f43754
Change-Id: I4c3070b63449a82ebcb6a2053c9bc1c1563c1787
Venkatarama Avadhani [Wed, 21 Jun 2017 16:54:44 +0000 (16:54 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762 am:
f36fb2deb3
am:
25c4535f04
Change-Id: I0b085ef570fdd3a9f9a61428e6ea66ec98bdf6cd
Venkatarama Avadhani [Wed, 21 Jun 2017 16:52:13 +0000 (16:52 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51 am:
b56bc9e762
am:
f36fb2deb3
Change-Id: Ie0786d3f1896e42c9ee879e3f43943641bc503b1
Venkatarama Avadhani [Wed, 21 Jun 2017 16:49:43 +0000 (16:49 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f am:
4ff3666a51
am:
b56bc9e762
Change-Id: Id27edb4426a7c4c2fad7bac2582663667d58ad75
Venkatarama Avadhani [Wed, 21 Jun 2017 16:46:43 +0000 (16:46 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3 am:
1c0389cc5f
am:
4ff3666a51
Change-Id: Ide20e7836e3feff6eb5aa7ce5c533277af243b6b
Venkatarama Avadhani [Wed, 21 Jun 2017 16:44:12 +0000 (16:44 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7 am:
a16f5a1fb3
am:
1c0389cc5f
Change-Id: I1331b4b2263d956de7de7e882cf38d4ddb743a8b
Venkatarama Avadhani [Wed, 21 Jun 2017 16:41:12 +0000 (16:41 +0000)]
Change MPEG2 reinit Error Handling am:
a67eacace7
am:
a16f5a1fb3
Change-Id: Id5c3640af7130aeadf6e5f810cdb2f79690a6428
Venkatarama Avadhani [Wed, 21 Jun 2017 16:38:41 +0000 (16:38 +0000)]
Change MPEG2 reinit Error Handling
am:
a67eacace7
Change-Id: I7ba8378fe66c57f595fee2368408cc426d3e5eaf
Venkatarama Avadhani [Tue, 30 May 2017 10:31:11 +0000 (16:01 +0530)]
Change MPEG2 reinit Error Handling
Changing reinit handling to not notify error in case init fails.
Bug:
37237396
Test: ran poc before/after on nyc-mr2
Change-Id: I694a9d2ccee7622d9c736efac12c9ec8639911f4
Jiyong Park [Tue, 20 Jun 2017 08:22:09 +0000 (17:22 +0900)]
DO NOT MERGE: fix build error caused by incorrect path of RemoteDataSource.h
The header should be under the media/stagefright subdir.
Test: m -j on aosp_fugu
Test: m -j dist platform-java tests on aosp_fugu
Change-Id: I3def467d90173b052a6aec391ca089c091c665b5
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Jiyong Park [Tue, 20 Jun 2017 06:45:58 +0000 (15:45 +0900)]
DO NOT MERGE: fix build error by moving remaining header files
The four header files were not moved as they don't exist in aosp/master.
Test: m -j
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: I578385276204601f78c86fc773ea88a535c9caea
Jiyong Park [Tue, 20 Jun 2017 05:54:53 +0000 (14:54 +0900)]
DO NOT MERGE: fix build error due to duplicated fields in Android.bp
Test: m -j
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: I203c9a8530f2232959e25ebdfc2aea63c98b3f9f
Jiyong Park [Tue, 20 Jun 2017 04:47:33 +0000 (04:47 +0000)]
Merge changes from topic 'vendor_available_libeffects' am:
82289efbd8
am:
467023e4a3 -s ours
Change-Id: I9450608ae8ce1d839da3afebfeead5e5612ced82
Jiyong Park [Tue, 20 Jun 2017 01:50:09 +0000 (10:50 +0900)]
DO NOT MERGE: Merge commit '
89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: Iac8c115a9e2195cd2df1ba507985e5f663587502
Jiyong Park [Thu, 27 Apr 2017 08:32:00 +0000 (17:32 +0900)]
provide libstagefright_foundation_vendor to vendors
libstagefright_foundation_vendor is a vendor-only variant of the
libstagefright_foundation. Vendor libs and other VNDK libs should link
against this _vendor.so library. This vendor-only variant does not have
dependency to libpowermanager which is not available to vendors.
Headers are moved from the global include dir to module-local include
dir. This is because global include dir (e.g. frameworks/av/include) is
not provided when building with BOARD_VNDK_VERSION=current. Instead the
headers are exported via the module's export_include_dirs directive.
Short summary on the directory movement:
"some" libstagefright headers are moved from libstagefright/include to
libstagefright/include/media/stagefright. This is because the headers
are included as <media/stagefright/HEADER_NAME,h>.
libstagefrigut_foundation headers are moved from
libstagefright/include/foundation to
libstagefright/foundation/include/media/stagefright/foundation. Again
this is because the headers are included as
<media/stagefright/foundation/HEADER_NAME.h>.
Furthermore, in order to prevent sudden breakage, symlinks to the
module-local header directories are added to the global include
directory.
frameworks/av/include/media/stagefright ->
<libstagefright>/include/media/stagefright
frameworks/av/include/media/stagefright/foundation ->
<libstagefright_foundation>/include/media/stagefright/foundation
Bug:
37462569
Test: sailfish builds and boots
Test: BOARD_VNDK_VERSION=current m libstagefright_foundation_vendor is
successful
Merged-Id: Iadfa594e885e0bd39837ccb282993d3ba5b62852
Change-Id: Iadfa594e885e0bd39837ccb282993d3ba5b62852
(cherry picked from commit
093f0b7ab981049e7a6e6bbcf1e0712e1995ba68)
Jiyong Park [Tue, 20 Jun 2017 00:28:20 +0000 (00:28 +0000)]
Merge changes from topic 'vendor_available_libeffects'
am:
82289efbd8
Change-Id: I3a437b411b38172cd5a545f4d04087e7e0aecacb
Vijay Venkatraman [Tue, 20 Jun 2017 00:27:43 +0000 (00:27 +0000)]
Merge changes Iabcb5469,Id8302f88,Iadfa594e,If0b10ed9
am:
3d53d7a819
Change-Id: I3afa3e96da75135acf991cee49c1e8ddf8ed8558
Treehugger Robot [Tue, 20 Jun 2017 00:21:43 +0000 (00:21 +0000)]
Merge changes from topic 'vendor_available_libeffects'
* changes:
Change libeffect from vendor:true to vendor_available:true
Add libeffects_headers.
libeffects: move to vendor
Treehugger Robot [Tue, 20 Jun 2017 00:20:58 +0000 (00:20 +0000)]
Merge changes Iabcb5469,Id8302f88,Iadfa594e,If0b10ed9
* changes:
Add libhardware_headers to various modules
libdrmclearkeyplugin is linked against libstagefright_foundation_vendor
provide libstagefright_foundation_vendor to vendors
Move libstagefright headers to media/libstagefright/include
Andy Hung [Mon, 19 Jun 2017 18:17:50 +0000 (18:17 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours am:
a816170b85 -s ours am:
adf9f84880 -s ours am:
bf5cbd0298 -s ours am:
036d7252a2 -s ours am:
5e3fb0f4ea -s ours am:
ec3e56c07c -s ours am:
c786f7b12c -s ours
am:
3c956b6c20 -s ours
Change-Id: I5c689bbb7cd2b01bec1c1485372b248152cb1d95
Andy Hung [Mon, 19 Jun 2017 18:11:50 +0000 (18:11 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours am:
a816170b85 -s ours am:
adf9f84880 -s ours am:
bf5cbd0298 -s ours am:
036d7252a2 -s ours am:
5e3fb0f4ea -s ours am:
ec3e56c07c -s ours
am:
c786f7b12c -s ours
Change-Id: I7b780dec96d68a5825ee615eac0f53669ed95633
Andy Hung [Mon, 19 Jun 2017 18:06:23 +0000 (18:06 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours am:
a816170b85 -s ours am:
adf9f84880 -s ours am:
bf5cbd0298 -s ours am:
036d7252a2 -s ours am:
5e3fb0f4ea -s ours
am:
ec3e56c07c -s ours
Change-Id: Ia73b217f31584f88281feeecdc2dd2e777689b53
Andy Hung [Mon, 19 Jun 2017 18:00:22 +0000 (18:00 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours am:
a816170b85 -s ours am:
adf9f84880 -s ours am:
bf5cbd0298 -s ours am:
036d7252a2 -s ours
am:
5e3fb0f4ea -s ours
Change-Id: I0f4832541054a74d2c9513f76fdb569d5f4757bc
Andy Hung [Mon, 19 Jun 2017 17:54:52 +0000 (17:54 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours am:
a816170b85 -s ours am:
adf9f84880 -s ours am:
bf5cbd0298 -s ours
am:
036d7252a2 -s ours
Change-Id: I11197aeda9bf78225b66d31794c239b36a35dbee
Andy Hung [Mon, 19 Jun 2017 17:54:49 +0000 (17:54 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846 am:
69b0154d59 am:
1d66db35e5 am:
849b3d0cdb am:
ef0a06bae0 am:
9a5104ddf1
am:
1f3a28ec6b
Change-Id: Ic8af8573530b683e045f87b97cacacecc39559b6
Andy Hung [Mon, 19 Jun 2017 17:49:49 +0000 (17:49 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours am:
a816170b85 -s ours am:
adf9f84880 -s ours
am:
bf5cbd0298 -s ours
Change-Id: I2caa1c9b39dd2c898e1652a5375fb82231e2347e
Andy Hung [Mon, 19 Jun 2017 17:49:48 +0000 (17:49 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846 am:
69b0154d59 am:
1d66db35e5 am:
849b3d0cdb am:
ef0a06bae0
am:
9a5104ddf1
Change-Id: Ia053b76c9dc3aa7d2e953bfc2eadadb40ea16b93
Andy Hung [Mon, 19 Jun 2017 17:43:24 +0000 (17:43 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours am:
a816170b85 -s ours
am:
adf9f84880 -s ours
Change-Id: I960496e28d2f1c4d07a7679cc52fa820219db201
Andy Hung [Mon, 19 Jun 2017 17:43:24 +0000 (17:43 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846 am:
69b0154d59 am:
1d66db35e5 am:
849b3d0cdb
am:
ef0a06bae0
Change-Id: I05967a0f1c610d9cbcbc674de6f7c5551024b16d
Andy Hung [Mon, 19 Jun 2017 17:36:48 +0000 (17:36 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours am:
af5d0135db -s ours
am:
a816170b85 -s ours
Change-Id: Icedb70113b6a28e84a040e0fecd281e63dbcade5
Andy Hung [Mon, 19 Jun 2017 17:36:44 +0000 (17:36 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846 am:
69b0154d59 am:
1d66db35e5
am:
849b3d0cdb
Change-Id: Icad90fe25c2d54202216c28488f025ce76cedd3b
Andy Hung [Mon, 19 Jun 2017 17:30:15 +0000 (17:30 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours am:
346941bcde -s ours
am:
af5d0135db -s ours
Change-Id: I362165b142646d6cf2e8748bcbce5473bb0a40a7
Andy Hung [Mon, 19 Jun 2017 17:30:14 +0000 (17:30 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846 am:
69b0154d59
am:
1d66db35e5
Change-Id: I962eeaea659e99f5a9f082ab2f479bbb4cface15
Andy Hung [Mon, 19 Jun 2017 17:24:11 +0000 (17:24 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4 am:
c343fd2846
am:
69b0154d59
Change-Id: Ifbb0da32f562fe5b1001e5dc2fcc3490305e694e
Andy Hung [Mon, 19 Jun 2017 17:23:43 +0000 (17:23 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours am:
3ab2ec59a1 -s ours
am:
346941bcde -s ours
Change-Id: I7e6d7a47ab766367c6ebba0ab30ca7f46e971dbc
Andy Hung [Mon, 19 Jun 2017 17:18:47 +0000 (17:18 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours am:
81c98dbb7e -s ours
am:
3ab2ec59a1 -s ours
Change-Id: I005f78d30df5134d2d54b36a17ad768278a2c2b7
Andy Hung [Mon, 19 Jun 2017 17:18:42 +0000 (17:18 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad am:
7779f826d4
am:
c343fd2846
Change-Id: I72c4c8d74ffaa8b8bc03a265ae3ff06796bbeb5b
Andy Hung [Mon, 19 Jun 2017 17:12:43 +0000 (17:12 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours am:
abbc9ab006 -s ours
am:
81c98dbb7e -s ours
Change-Id: Ibb879c898fd820e2be6fcba55b0246a0645e62bf
Andy Hung [Mon, 19 Jun 2017 17:12:41 +0000 (17:12 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382 am:
f89b2427ad
am:
7779f826d4
Change-Id: I6ec7ea434317d8d3c38314a9dc49f6b620e0db9f
Andy Hung [Mon, 19 Jun 2017 17:08:43 +0000 (17:08 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef am:
6235afe24e -s ours
am:
abbc9ab006 -s ours
Change-Id: I9a4455d512225d9e0c2f1588ed4e8c593e66df9c
Andy Hung [Mon, 19 Jun 2017 17:08:42 +0000 (17:08 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126 am:
483cf88382
am:
f89b2427ad
Change-Id: I6d32c77c6e4cdd2868c9b58254a36e26fa10695a
Andy Hung [Mon, 19 Jun 2017 17:02:13 +0000 (17:02 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a am:
6790e790ef
am:
6235afe24e -s ours
Change-Id: I950a142a05c0ff60026502078b95ca27b66f1fdd
Andy Hung [Mon, 19 Jun 2017 17:02:11 +0000 (17:02 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4 am:
42f2fab126
am:
483cf88382
Change-Id: I745c19ce57ca9055b5cb11a9ac5072b0b8954cd6
Andy Hung [Mon, 19 Jun 2017 16:56:43 +0000 (16:56 +0000)]
Track: Check buffer size of static tracks am:
cf39f0e67a
am:
6790e790ef
Change-Id: I2cb0ce9e086e15b037f6de6086072d107fbaf571
Andy Hung [Mon, 19 Jun 2017 16:56:42 +0000 (16:56 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab am:
a3416fc6b4
am:
42f2fab126
Change-Id: Ifb95a65ef32c643b94554c3904b84678d5459625
Andy Hung [Mon, 19 Jun 2017 16:50:40 +0000 (16:50 +0000)]
Track: Check buffer size of static tracks
am:
cf39f0e67a
Change-Id: Iad9a3f69fa97d8da9db8f1fed864a2e15d5bbb2a
Andy Hung [Mon, 19 Jun 2017 16:50:39 +0000 (16:50 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev am:
782a30d2ab
am:
a3416fc6b4
Change-Id: Ib81560c9faa863c02cad8c5e2979a9d9551021ea
Andy Hung [Mon, 19 Jun 2017 16:45:42 +0000 (16:45 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev
am:
782a30d2ab
Change-Id: Ie27330ced83beccaed5a5a3d69ec6833be7e36e1
Andy Hung [Mon, 19 Jun 2017 16:35:00 +0000 (16:35 +0000)]
Merge "Track: Check buffer size of static tracks" into lmp-dev
Dongwon Kang [Sat, 17 Jun 2017 05:23:13 +0000 (05:23 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f am:
7c70a5482c am:
e4c62e4582 am:
1efa35d1f8 am:
55acba9047 am:
3f05d8a9bc
am:
3aaf1671d5
Change-Id: Ia028f52a02d348f2ae7d6801e9aec1b965bf205b
Dongwon Kang [Sat, 17 Jun 2017 05:20:12 +0000 (05:20 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f am:
7c70a5482c am:
e4c62e4582 am:
1efa35d1f8 am:
55acba9047
am:
3f05d8a9bc
Change-Id: Iaf900312d2517773062f09ae5a19f48b497408d2
Dongwon Kang [Sat, 17 Jun 2017 05:17:44 +0000 (05:17 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f am:
7c70a5482c am:
e4c62e4582 am:
1efa35d1f8
am:
55acba9047
Change-Id: I4c62b8698635b9a328f46203f8a8ee1309da126b
Dongwon Kang [Sat, 17 Jun 2017 05:14:40 +0000 (05:14 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f am:
7c70a5482c am:
e4c62e4582
am:
1efa35d1f8
Change-Id: I685fa7010be06ca791693dad4e367cdaffea8ad0
Dongwon Kang [Sat, 17 Jun 2017 05:11:40 +0000 (05:11 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f am:
7c70a5482c
am:
e4c62e4582
Change-Id: I164f086c1902fe315ae08c69b2a6287d4cbeb135
Dongwon Kang [Sat, 17 Jun 2017 05:09:10 +0000 (05:09 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033 am:
9262a0d58f
am:
7c70a5482c
Change-Id: I975dd858eaf473a3cf9a22c206272c4017e3c95c
Dongwon Kang [Sat, 17 Jun 2017 05:06:09 +0000 (05:06 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc am:
6e5ef73033
am:
9262a0d58f
Change-Id: I8854738e25b4038062cc66b392693792ee3de72d
Dongwon Kang [Sat, 17 Jun 2017 05:03:39 +0000 (05:03 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09 am:
040485c1bc
am:
6e5ef73033
Change-Id: I6d7aef658319bc6bbd43076d43788d2235dd14f6
Dongwon Kang [Sat, 17 Jun 2017 05:00:38 +0000 (05:00 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d am:
6ce4126a09
am:
040485c1bc
Change-Id: I0feb497a42b3e2d10a1f226da308c29b0da46c81
Dongwon Kang [Sat, 17 Jun 2017 04:58:08 +0000 (04:58 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06 am:
18a671762d
am:
6ce4126a09
Change-Id: Ifebdfcfd50c5167bbce4f4680d426ba69b0cbc6a
Dongwon Kang [Sat, 17 Jun 2017 04:55:09 +0000 (04:55 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873 am:
2ace148c06
am:
18a671762d
Change-Id: I38d2d1c89bb6662745a77e5f4fc3ed6b81d40331
Dongwon Kang [Sat, 17 Jun 2017 04:52:07 +0000 (04:52 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev am:
d971d18873
am:
2ace148c06
Change-Id: I461627340f5204d2574dc90c89461373b0c42407
Dongwon Kang [Sat, 17 Jun 2017 04:49:37 +0000 (04:49 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev
am:
d971d18873
Change-Id: I8613293a4bbea17818f873274b80c318a8f3d5b8
TreeHugger Robot [Sat, 17 Jun 2017 04:46:30 +0000 (04:46 +0000)]
Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev
Venkatarama Avadhani [Sat, 17 Jun 2017 02:47:29 +0000 (02:47 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours am:
a51cfb3a00 -s ours am:
d77a443db4 -s ours am:
9dd993e516 -s ours am:
3ed228d80c -s ours am:
e003b8931d -s ours
am:
8c8012d126 -s ours
Change-Id: Iaaed684a5fc05062bb4e8b0ca3c0991c1b3c4368
Venkatarama Avadhani [Sat, 17 Jun 2017 02:45:29 +0000 (02:45 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours am:
a51cfb3a00 -s ours am:
d77a443db4 -s ours am:
9dd993e516 -s ours am:
3ed228d80c -s ours
am:
e003b8931d -s ours
Change-Id: I121c3f12ab8cb2e36d1b6450b03dadac496090b2
Venkatarama Avadhani [Sat, 17 Jun 2017 02:42:59 +0000 (02:42 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours am:
a51cfb3a00 -s ours am:
d77a443db4 -s ours am:
9dd993e516 -s ours
am:
3ed228d80c -s ours
Change-Id: I35507c1d23f2418fe20da09cdb79ab12de0e3d2c
Venkatarama Avadhani [Sat, 17 Jun 2017 02:40:02 +0000 (02:40 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours am:
a51cfb3a00 -s ours am:
d77a443db4 -s ours
am:
9dd993e516 -s ours
Change-Id: Ibd77175c39dcf2df96bd9be1809023f9a3e42279
Venkatarama Avadhani [Sat, 17 Jun 2017 02:35:56 +0000 (02:35 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours am:
a51cfb3a00 -s ours
am:
d77a443db4 -s ours
Change-Id: I731f360c79bb811ce5aa6e37453f382daa0e696c
Venkatarama Avadhani [Sat, 17 Jun 2017 02:33:58 +0000 (02:33 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e am:
e2424e9895 -s ours
am:
a51cfb3a00 -s ours
Change-Id: I59edf5501a076577045c983477b7b18f53372a3a
Venkatarama Avadhani [Sat, 17 Jun 2017 02:31:57 +0000 (02:31 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f am:
41c60ea30e
am:
e2424e9895 -s ours
Change-Id: I2872c2aa5257d0828e1d6c6176844b9827a9f3a4
Venkatarama Avadhani [Sat, 17 Jun 2017 02:29:25 +0000 (02:29 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9 am:
0817640c9f
am:
41c60ea30e
Change-Id: I654945cc7d760d769e7edd024e78a5a883d9602f
Venkatarama Avadhani [Sat, 17 Jun 2017 02:27:27 +0000 (02:27 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am:
74a2af11b9
am:
0817640c9f
Change-Id: If72152b0e19ab8942d56d99819f5670950770a91
Venkatarama Avadhani [Sat, 17 Jun 2017 02:25:11 +0000 (02:25 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev
am:
74a2af11b9
Change-Id: Ia57de4d0172426c590f562d57fbba5fff7ec55bf
TreeHugger Robot [Sat, 17 Jun 2017 02:19:39 +0000 (02:19 +0000)]
Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev
Dongwon Kang [Sat, 17 Jun 2017 01:20:16 +0000 (01:20 +0000)]
Merge "Report error when using buffers for secure codec without providing crypto" into oc-dev
am:
88f181fef3
Change-Id: Ifd5ba30afd8b260ab6b592f7ef6e008f537a5325
TreeHugger Robot [Sat, 17 Jun 2017 01:05:37 +0000 (01:05 +0000)]
Merge "Report error when using buffers for secure codec without providing crypto" into oc-dev
Andy Hung [Sat, 17 Jun 2017 00:51:14 +0000 (00:51 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6 am:
aff0808bcf am:
109247df7a am:
a92d05fc1e am:
85c8828a32 am:
2eed9fd5a0 am:
59e144ffff am:
ab73156cdf
am:
064e8f2e00
Change-Id: I76cd45d32b4fd909600496ee3ce24eec773837e4
Andy Hung [Sat, 17 Jun 2017 00:47:16 +0000 (00:47 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6 am:
aff0808bcf am:
109247df7a am:
a92d05fc1e am:
85c8828a32 am:
2eed9fd5a0 am:
59e144ffff
am:
ab73156cdf
Change-Id: Ifb63a3e5839a8399a33eb387f48f51eb14cf7794
Jeff Tinker [Sat, 17 Jun 2017 00:39:45 +0000 (00:39 +0000)]
Merge "Check for drmhal plugin null pointer deref" into oc-dev
am:
a5f3e42433
Change-Id: Ie563efbf3b0558b89cf3b4d07eec457d307dff70
Andy Hung [Sat, 17 Jun 2017 00:37:48 +0000 (00:37 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6 am:
aff0808bcf am:
109247df7a am:
a92d05fc1e am:
85c8828a32 am:
2eed9fd5a0
am:
59e144ffff
Change-Id: If062d74a0217798101a767536dada4d853238f08
Andy Hung [Sat, 17 Jun 2017 00:32:15 +0000 (00:32 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6 am:
aff0808bcf am:
109247df7a am:
a92d05fc1e am:
85c8828a32
am:
2eed9fd5a0
Change-Id: I452dc4e48876a906a4d44ae40cc97a815ddd81d2
TreeHugger Robot [Sat, 17 Jun 2017 00:31:35 +0000 (00:31 +0000)]
Merge "Check for drmhal plugin null pointer deref" into oc-dev
Andy Hung [Sat, 17 Jun 2017 00:25:06 +0000 (00:25 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6 am:
aff0808bcf am:
109247df7a am:
a92d05fc1e
am:
85c8828a32
Change-Id: I2ac2e1e00639f686905900308b3f675925e44a9d
Andy Hung [Sat, 17 Jun 2017 00:19:16 +0000 (00:19 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6 am:
aff0808bcf am:
109247df7a
am:
a92d05fc1e
Change-Id: I73340a812c24ea421d68fa88f6b18cfa4867a0a5
Andy Hung [Sat, 17 Jun 2017 00:13:12 +0000 (00:13 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6 am:
aff0808bcf
am:
109247df7a
Change-Id: I4f55d2cdd5ef430742e3b6e3680603d2a9618593
Andy Hung [Sat, 17 Jun 2017 00:11:10 +0000 (00:11 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55 am:
0851e2f4c6
am:
aff0808bcf
Change-Id: I4c7698da6176547fd9ebc23ae52e2e9e53e83f61
Andy Hung [Sat, 17 Jun 2017 00:07:09 +0000 (00:07 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d am:
103b751e55
am:
0851e2f4c6
Change-Id: I8401f004580f03d23a7423468f6966aba768e783
Andy Hung [Sat, 17 Jun 2017 00:04:11 +0000 (00:04 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91 am:
d06e47540d
am:
103b751e55
Change-Id: I3d03741eca351ad131d5bae700a5024fda36e1be
Andy Hung [Sat, 17 Jun 2017 00:02:09 +0000 (00:02 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b am:
1ce123cf91
am:
d06e47540d
Change-Id: I22405b81c7351961f8aca57289a15cc99e67525a
Andy Hung [Sat, 17 Jun 2017 00:00:08 +0000 (00:00 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8 am:
a35816475b
am:
1ce123cf91
Change-Id: I414a644145a6da9c9fe4e073d97aa07dd0272267
Andy Hung [Fri, 16 Jun 2017 23:58:10 +0000 (23:58 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4 am:
24ef54ecb8
am:
a35816475b
Change-Id: I77aa056b71679b0d0d6703a59f46c788e77d5351
Andy Hung [Fri, 16 Jun 2017 23:54:39 +0000 (23:54 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3 am:
f242b890c4
am:
24ef54ecb8
Change-Id: I0b413afa5c0e41fadcd0320f7481172cc2398018
Andy Hung [Fri, 16 Jun 2017 23:51:37 +0000 (23:51 +0000)]
AudioFlinger: Fix memory allocation for client-less tracks am:
1159ffd5e3
am:
f242b890c4
Change-Id: I5bd38c33b13de93e641e50c39cdfe37dbae59923
OSDN Git Service
