Marco Nelissen
7f08b552a5
Merge "Fix tiny memory leak" am: 84f7e6acb9
...
am: 112af391b2
Change-Id: I76cae10e3a2b894add6dd4479d8cced8db5f7cd3
7 years ago
Marco Nelissen
112af391b2
Merge "Fix tiny memory leak"
...
am: 84f7e6acb9
Change-Id: Ie060723c5336dd166c3cbdf4d19ede7f7bbab3f2
7 years ago
Marco Nelissen
bd4bad2ce9
Fix parsing of gps location atom in mp4
...
Allow for missing trailing slash and longer strings, validate
string length.
Bug: 62802112
Test: manual
Change-Id: Ief32fb1aff925fe80d636b811beed3c2362bbf01
7 years ago
Marco Nelissen
84f7e6acb9
Merge "Fix tiny memory leak"
7 years ago
Venkatarama Avadhani
5db07aaab9
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
7 years ago
Venkatarama Avadhani
4226c955b6
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
7 years ago
Venkatarama Avadhani
7a22cc8944
Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3
am: 1c0389cc5f
am: 4ff3666a51
am: b56bc9e762
am: f36fb2deb3
am: 25c4535f04
...
am: b866f43754
Change-Id: I4c3070b63449a82ebcb6a2053c9bc1c1563c1787
7 years ago
Venkatarama Avadhani
b866f43754
Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3
am: 1c0389cc5f
am: 4ff3666a51
am: b56bc9e762
am: f36fb2deb3
...
am: 25c4535f04
Change-Id: I0b085ef570fdd3a9f9a61428e6ea66ec98bdf6cd
7 years ago
Venkatarama Avadhani
25c4535f04
Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3
am: 1c0389cc5f
am: 4ff3666a51
am: b56bc9e762
...
am: f36fb2deb3
Change-Id: Ie0786d3f1896e42c9ee879e3f43943641bc503b1
7 years ago
Venkatarama Avadhani
f36fb2deb3
Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3
am: 1c0389cc5f
am: 4ff3666a51
...
am: b56bc9e762
Change-Id: Id27edb4426a7c4c2fad7bac2582663667d58ad75
7 years ago
Venkatarama Avadhani
b56bc9e762
Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3
am: 1c0389cc5f
...
am: 4ff3666a51
Change-Id: Ide20e7836e3feff6eb5aa7ce5c533277af243b6b
7 years ago
Venkatarama Avadhani
4ff3666a51
Change MPEG2 reinit Error Handling am: a67eacace7
am: a16f5a1fb3
...
am: 1c0389cc5f
Change-Id: I1331b4b2263d956de7de7e882cf38d4ddb743a8b
7 years ago
Venkatarama Avadhani
1c0389cc5f
Change MPEG2 reinit Error Handling am: a67eacace7
...
am: a16f5a1fb3
Change-Id: Id5c3640af7130aeadf6e5f810cdb2f79690a6428
7 years ago
Venkatarama Avadhani
a16f5a1fb3
Change MPEG2 reinit Error Handling
...
am: a67eacace7
Change-Id: I7ba8378fe66c57f595fee2368408cc426d3e5eaf
7 years ago
Venkatarama Avadhani
a67eacace7
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
7 years ago
Jiyong Park
f64ced003d
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
7 years ago
Jiyong Park
21c2d3dd09
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
7 years ago
Jiyong Park
21f2422857
DO NOT MERGE: fix build error due to duplicated fields in Android.bp
...
Test: m -j
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: I203c9a8530f2232959e25ebdfc2aea63c98b3f9f
7 years ago
Jiyong Park
ab5efd5c46
Merge changes from topic 'vendor_available_libeffects' am: 82289efbd8
...
am: 467023e4a3
-s ours
Change-Id: I9450608ae8ce1d839da3afebfeead5e5612ced82
7 years ago
Jiyong Park
bd5609f0a3
DO NOT MERGE: Merge commit '89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64
...
Merged-In: Iabcb5469c4fd936c2d7c1f9a1113c557c8beab88
Change-Id: Iac8c115a9e2195cd2df1ba507985e5f663587502
7 years ago
Jiyong Park
4c86beec46
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 093f0b7ab9
)
7 years ago
Jiyong Park
467023e4a3
Merge changes from topic 'vendor_available_libeffects'
...
am: 82289efbd8
Change-Id: I3a437b411b38172cd5a545f4d04087e7e0aecacb
7 years ago
Vijay Venkatraman
89f1f99d64
Merge changes Iabcb5469,Id8302f88,Iadfa594e,If0b10ed9
...
am: 3d53d7a819
Change-Id: I3afa3e96da75135acf991cee49c1e8ddf8ed8558
7 years ago
Treehugger Robot
82289efbd8
Merge changes from topic 'vendor_available_libeffects'
...
* changes:
Change libeffect from vendor:true to vendor_available:true
Add libeffects_headers.
libeffects: move to vendor
7 years ago
Treehugger Robot
3d53d7a819
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
7 years ago
Andy Hung
6d67fc6a9e
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
7 years ago
Andy Hung
3c956b6c20
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
7 years ago
Andy Hung
c786f7b12c
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
7 years ago
Andy Hung
ec3e56c07c
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
7 years ago
Andy Hung
5e3fb0f4ea
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
7 years ago
Andy Hung
0a6a9bfad0
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
7 years ago
Andy Hung
036d7252a2
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
7 years ago
Andy Hung
1f3a28ec6b
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
7 years ago
Andy Hung
bf5cbd0298
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
7 years ago
Andy Hung
9a5104ddf1
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
7 years ago
Andy Hung
adf9f84880
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
7 years ago
Andy Hung
ef0a06bae0
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
7 years ago
Andy Hung
a816170b85
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
7 years ago
Andy Hung
849b3d0cdb
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
7 years ago
Andy Hung
1d66db35e5
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
7 years ago
Andy Hung
af5d0135db
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
7 years ago
Andy Hung
346941bcde
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
7 years ago
Andy Hung
69b0154d59
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
7 years ago
Andy Hung
3ab2ec59a1
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
7 years ago
Andy Hung
c343fd2846
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
7 years ago
Andy Hung
81c98dbb7e
Track: Check buffer size of static tracks am: cf39f0e67a
am: 6790e790ef
am: 6235afe24e
-s ours
...
am: abbc9ab006
-s ours
Change-Id: I9a4455d512225d9e0c2f1588ed4e8c593e66df9c
7 years ago
Andy Hung
7779f826d4
Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab
am: a3416fc6b4
am: 42f2fab126
am: 483cf88382
...
am: f89b2427ad
Change-Id: I6d32c77c6e4cdd2868c9b58254a36e26fa10695a
7 years ago
Andy Hung
abbc9ab006
Track: Check buffer size of static tracks am: cf39f0e67a
am: 6790e790ef
...
am: 6235afe24e
-s ours
Change-Id: I950a142a05c0ff60026502078b95ca27b66f1fdd
7 years ago
Andy Hung
f89b2427ad
Merge "Track: Check buffer size of static tracks" into lmp-dev am: 782a30d2ab
am: a3416fc6b4
am: 42f2fab126
...
am: 483cf88382
Change-Id: I745c19ce57ca9055b5cb11a9ac5072b0b8954cd6
7 years ago
Andy Hung
6235afe24e
Track: Check buffer size of static tracks am: cf39f0e67a
...
am: 6790e790ef
Change-Id: I2cb0ce9e086e15b037f6de6086072d107fbaf571
7 years ago