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

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

Android Build Merger (Role) [Wed, 21 Jun 2017 17:06:06 +0000 (17:06 +0000)]

Merge "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 am: ffd80b92df" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Venkatarama Avadhani [Wed, 21 Jun 2017 17:05:47 +0000 (17:05 +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
am: ffd80b92df

Change-Id: I87d2e73b47f5e8fbec2e2f4878d4a3882e07156a

commit | commitdiff | tree

Venkatarama Avadhani [Wed, 21 Jun 2017 17:05:45 +0000 (17:05 +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
am: 5db07aaab9

Change-Id: I536ec5b47c66636b094fdd6a629c7a406a67c56a

commit | commitdiff | tree

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

commit | commitdiff | tree

Venkatarama Avadhani [Wed, 21 Jun 2017 17:02:46 +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: If43d207f376ff9af9ae63644ce9359a244988f7f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Venkatarama Avadhani [Wed, 21 Jun 2017 16:38:41 +0000 (16:38 +0000)]

Change MPEG2 reinit Error Handling
am: a67eacace7

Change-Id: I7ba8378fe66c57f595fee2368408cc426d3e5eaf

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Laurent [Tue, 20 Jun 2017 17:19:16 +0000 (17:19 +0000)]

Merge "audio policy config: add USB_HEADSET device" into oc-dr1-dev
am: 10c94f7a68

Change-Id: Ie62d2dfb45057ddea806092731152eee4f1889eb

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Jun 2017 17:10:15 +0000 (17:10 +0000)]

Merge "audio policy config: add USB_HEADSET device" into oc-dr1-dev

commit | commitdiff | tree

Jiyong Park [Tue, 20 Jun 2017 09:08:15 +0000 (09:08 +0000)]

DO NOT MERGE: fix build error caused by incorrect path of RemoteDataSource.h
am: f64ced003d -s ours

Change-Id: Ib65400ffa1df5ad4c8a611387eeddfd034ff39a8

commit | commitdiff | tree

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

commit | commitdiff | tree

Jiyong Park [Tue, 20 Jun 2017 06:53:08 +0000 (06:53 +0000)]

DO NOT MERGE: fix build error by moving remaining header files
am: 21c2d3dd09 -s ours

Change-Id: Icb77ef998809b27c70362bd73ef6ca2c688f55d8

commit | commitdiff | tree

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

commit | commitdiff | tree

Jiyong Park [Tue, 20 Jun 2017 06:03:03 +0000 (06:03 +0000)]

DO NOT MERGE: fix build error due to duplicated fields in Android.bp
am: 21f2422857 -s ours

Change-Id: I551916f7226dae58d60863b716c9ffeb85b367cd

commit | commitdiff | tree

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

commit | commitdiff | tree

Jiyong Park [Tue, 20 Jun 2017 04:50:36 +0000 (04:50 +0000)]

Merge changes from topic 'vendor_available_libeffects' am: 82289efbd8 am: 467023e4a3 -s ours
am: ab5efd5c46 -s ours

Change-Id: I3dec5414d4ddad48ac0b1376301e0a9e8b77c778

commit | commitdiff | tree

Jiyong Park [Tue, 20 Jun 2017 04:50:02 +0000 (04:50 +0000)]

DO NOT MERGE: Merge commit '89f1f99d646fc6fbe72edc0d3f48d628543dd841' into manual_merge_89f1f99d64
am: bd5609f0a3 -s ours

Change-Id: I11520624e612cb80ae2ea321d3e76e2a60223581

commit | commitdiff | tree

Jiyong Park [Tue, 20 Jun 2017 04:49:53 +0000 (04:49 +0000)]

provide libstagefright_foundation_vendor to vendors
am: 4c86beec46

Change-Id: I23091c3e8ddf8de2e031caf2949171adb859ad8a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

Vijay Venkatraman [Tue, 20 Jun 2017 00:27:43 +0000 (00:27 +0000)]

Merge changes Iabcb5469,Id8302f88,Iadfa594e,If0b10ed9
am: 3d53d7a819

Change-Id: I3afa3e96da75135acf991cee49c1e8ddf8ed8558

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Steven Moreland [Mon, 19 Jun 2017 21:23:28 +0000 (21:23 +0000)]

Merge "OMX Hal: depend on libavservices_minijail_vendor." into oc-dr1-dev
am: 053359a38a

Change-Id: Ib430cb9fc00ece6df53ed95c4692d86a9acfd128

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 21:17:19 +0000 (21:17 +0000)]

Merge "OMX Hal: depend on libavservices_minijail_vendor." into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 19 Jun 2017 18:24:14 +0000 (18:24 +0000)]

Merge "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 am: 6d67fc6a9e -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 18:24:03 +0000 (18:24 +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
am: 6d67fc6a9e -s ours

Change-Id: Ie8fbbe7a806a3bb33996b8e5d9e8a32e2e1d52b4

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 18:23:47 +0000 (18: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 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
am: da66f79748 -s ours

Change-Id: Ie6328cb990443d9028b558519651c1ef88af623a

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 18:17:53 +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: I5f41bb3b89940668e2d79a3f9a25dbc5e66b8a9e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 18:06:20 +0000 (18:06 +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
am: 5dd96d24e8

Change-Id: I4d27d33bb548924addb41861092736b19c4a79b9

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 18:00:46 +0000 (18:00 +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
am: 0a6a9bfad0

Change-Id: I600a4d0ab13ad5f24f23d0771e6c7f131639776a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 17:54:51 +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: I1243d98ca28b92b6d5f7a2e5a43c86f809cd4941

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 17:43:24 +0000 (17:43 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 17:36:48 +0000 (17:36 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 17:30:15 +0000 (17:30 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 17:23:43 +0000 (17:23 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andy Hung [Mon, 19 Jun 2017 16:35:00 +0000 (16:35 +0000)]

Merge "Track: Check buffer size of static tracks" into lmp-dev

commit | commitdiff | tree

Eric Laurent [Sun, 18 Jun 2017 05:23:21 +0000 (05:23 +0000)]

Merge "audio policy: add method to query dB attenuation for a certain volume and device" into oc-dr1-dev
am: 1165cb67e8

Change-Id: Ic29287cbd4f368146f656e173db51f187435167d

commit | commitdiff | tree

TreeHugger Robot [Sun, 18 Jun 2017 05:15:31 +0000 (05:15 +0000)]

Merge "audio policy: add method to query dB attenuation for a certain volume and device" into oc-dr1-dev

commit | commitdiff | tree

Eric Laurent [Sat, 17 Jun 2017 22:28:14 +0000 (15:28 -0700)]

audio policy config: add USB_HEADSET device

Add definitions and routes for USB_HEADSET device
in default audio policy configuration for USB HAL.

Bug: 36220140
Test: check music/video playback, voice/VoIP
calls, OK google and Camcorder with and without USB headset

Change-Id: Ic62b38fc9628c8ec44ddca17e82419be4f1e0fea

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 05:26:05 +0000 (05:26 +0000)]

Merge "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 am: 36aa8a5f2b" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Dongwon Kang [Sat, 17 Jun 2017 05:25:43 +0000 (05:25 +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
am: af69fd92a9

Change-Id: I5a0f9865a4fcb00a8a91b951edefadbd03136c7e

commit | commitdiff | tree

Dongwon Kang [Sat, 17 Jun 2017 05:25:43 +0000 (05:25 +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
am: 36aa8a5f2b

Change-Id: I7dc5e09fe22ccd1e84b1a5216dd3b4244ff56cb1

commit | commitdiff | tree

Dongwon Kang [Sat, 17 Jun 2017 05:23:17 +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: I2144d812e673c5d2f125af72dd5d3782ce171a72

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 17 Jun 2017 04:46:30 +0000 (04:46 +0000)]

Merge "MPEG4Extractor: check size for yrrc box" into lmp-dev

commit | commitdiff | tree

Android Build Merger (Role) [Sat, 17 Jun 2017 02:50:23 +0000 (02:50 +0000)]

Merge "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 am: 7f145e886d -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Venkatarama Avadhani [Sat, 17 Jun 2017 02:50:04 +0000 (02:50 +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
am: 7f145e886d -s ours

Change-Id: I39070568218d9d5868690b7fb07b4f4c1a745785

commit | commitdiff | tree

Venkatarama Avadhani [Sat, 17 Jun 2017 02:50:00 +0000 (02:50 +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
am: e68f9e02ac -s ours

Change-Id: I30e16cc838fb47f06dc5cba83a853a8849476b94

commit | commitdiff | tree

Venkatarama Avadhani [Sat, 17 Jun 2017 02:47:32 +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: I3c37481d9047c484d14371d182889f4a207894f7

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

frameworks/av

RSS Atom

About OSDN

Find Software

Develop Software

Help