Automerger Merge Worker
c552796bc2
[automerger skipped] Merge "Move implementations to DataSourceBase.h" into qt-dev am: 1142d3ea28
am: 2075838439
am: 4a677fbb96
-s ours am: 58e1c1ce6f
-s ours
...
am skip reason: Change-Id Ic955189ff9f0fbc48b5b35eccdb2916dc79fdb0f with SHA-1 45bee32c4c
is in history
Change-Id: Ief48e22515b0a2674a1bbe576a6500f2a2f8292d
4 years ago
Ray Essick
7efed09e5a
Merge "Benchmark: Add backward compatibility for vorbis"
4 years ago
Treehugger Robot
df82d62c33
Merge "MPEG4Writer: Initialize mime to NULL in addSource"
4 years ago
Automerger Merge Worker
58e1c1ce6f
[automerger skipped] Merge "Move implementations to DataSourceBase.h" into qt-dev am: 1142d3ea28
am: 2075838439
am: 4a677fbb96
-s ours
...
am skip reason: Change-Id Ic955189ff9f0fbc48b5b35eccdb2916dc79fdb0f with SHA-1 7edb3f7d2f
is in history
Change-Id: Icdc85df2d7d026de8b51b01f9a686ad588acb929
4 years ago
Automerger Merge Worker
4a677fbb96
Merge "Move implementations to DataSourceBase.h" into qt-dev am: 1142d3ea28
am: 2075838439
...
Change-Id: I91bb1f015278f3dad67b74b4d1b25a7862ffb913
4 years ago
Automerger Merge Worker
2075838439
Merge "Move implementations to DataSourceBase.h" into qt-dev am: 1142d3ea28
...
Change-Id: Iec56bcc48e52c69db03489d4ce683c81113d67b5
4 years ago
Oliver Nguyen
1142d3ea28
Merge "Move implementations to DataSourceBase.h" into qt-dev
4 years ago
Automerger Merge Worker
4e3c5603ed
[automerger skipped] Merge "Use libbinderthreadstateutils." am: 7d56473816
am: 04613e1ac7
am: 69dc96fc41
-s ours
...
am skip reason: Change-Id I5615f4e8863487d0de8dad2d0529214750897036 with SHA-1 89a2c5ceef
is in history
Change-Id: I4b0e09349f091cfd3788ecbe6e47fd2d19fc4e63
4 years ago
Automerger Merge Worker
69dc96fc41
Merge "Use libbinderthreadstateutils." am: 7d56473816
am: 04613e1ac7
...
Change-Id: I30474a3797756083df3b16a642e479ddb1dfa60d
4 years ago
Automerger Merge Worker
04613e1ac7
Merge "Use libbinderthreadstateutils." am: 7d56473816
...
Change-Id: I72b0f76a2207f8ec8c0c79dd36b80bbeb32791ea
4 years ago
Steven Moreland
7d56473816
Merge "Use libbinderthreadstateutils."
4 years ago
TreeHugger Robot
fab69be400
Merge "mediaswcodec: Set "default" as preferred service"
4 years ago
Marco Nelissen
1b41d44972
Avoid reading at negative offsets
...
PlayerServiceFileSource had the same logic as FileSource that could
cause reading at negative data source offsets, so fix that too.
Test: build
Bug: 141242340
Change-Id: I60226d85ece83339444d9ec1c0a741271e33e127
4 years ago
Steven Moreland
5d015a6796
Merge "Use libbinderthreadstateutils."
4 years ago
Jiyong Park
6df7f5f72b
Don't re-export libbinder headers from libstagefright_foundation
...
The headers of libstagefright_foundation do not reference libbinder
headers. Therefore, the libbinder headers don't need to be re-exported.
As a good side effect, libbinder is no longer built for
com.android.media APEX where libstagefright_foundation is a member of.
Before this change, due to the re-export of headers, the media APEX
variant of libbinder had to be created.
Also, this is a partial cherry-pick of Ieb731a8112b1f3bdc6862059671e8a9dd31d88e1
from the internal master.
Bug: 147671264
Test: m
Merged-In: Id16054593487f042fba6e46b114da52439e98e07
(cherry picked from commit a959536bd9
)
Change-Id: Id16054593487f042fba6e46b114da52439e98e07
4 years ago
Automerger Merge Worker
7d90c60cd4
[automerger skipped] Merge "RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed" into qt-qpr1-dev am: cf24ad44c4
am: a41f7e30e6
-s ours am: 93afcf00aa
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Idb948e33ea60c72b542dbbe56cf7c9502dec1258
4 years ago
Automerger Merge Worker
e87c13613d
[automerger skipped] RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed am: c155398cd7
am: 892a451f86
-s ours am: caf5959494
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie782aff3be3ee74292779fe8390ae238a0b05b48
4 years ago
Automerger Merge Worker
93afcf00aa
[automerger skipped] Merge "RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed" into qt-qpr1-dev am: cf24ad44c4
am: a41f7e30e6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id6dd78ac299d32af78ce42554930f355cb0bfb89
4 years ago
Automerger Merge Worker
caf5959494
[automerger skipped] RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed am: c155398cd7
am: 892a451f86
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I07924281adf8ae7d7660e24e07f03ee146dc7d26
4 years ago
Automerger Merge Worker
a41f7e30e6
Merge "RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed" into qt-qpr1-dev am: cf24ad44c4
...
Change-Id: I8cf1f07b47f0f5cbdd7f3bb54d47bc558353058a
4 years ago
Automerger Merge Worker
892a451f86
RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed am: c155398cd7
...
Change-Id: Id2367d56dc34b420d1ed242a65ab6c3d4c2ad8fc
4 years ago
TreeHugger Robot
cf24ad44c4
Merge "RESTRICT AUTOMERGE Validate TrackedBuffer in onBufferDestroyed" into qt-qpr1-dev
4 years ago
Robert Shih
2c37787ed7
DrmUtils: return 1.3 hidl factories
...
Bug: 139134043
Test: MediaDrmGenericOpsTest
Change-Id: I0447758344432eff84bd5221e575f9dca3db56d4
4 years ago
TreeHugger Robot
ce22af37c1
Merge "CCodec: don't use array mode if in block model"
4 years ago
Manisha Jajoo
8ff51afd56
Benchmark: Add backward compatibility for vorbis
...
Bug: 148582735
Test: atest com.android.media.benchmark.tests
Change-Id: I9bd90c02a079e03cadcc3c078c274f0903d4ad39
4 years ago
Automerger Merge Worker
265e047963
Merge "MPEG4Writer:Fix MetaData use-after-free issue" am: e6b6db59fc
am: 2308ec5ee0
am: fa02dd1e20
...
Change-Id: I4a313d0407d085c7a417b8077c4d4da39fe335ed
4 years ago
Harish Mahendrakar
f9d5d46591
MPEG4Writer: Initialize mime to NULL in addSource
...
mime was uninitialized before querying from format.
If format doesn't contain mime, then this remained
uninitialized
Test: atest android.mediav2.cts.MuxerUnitTest
Bug: 148916777
Change-Id: I1375dd9e905fe8ee21f6cff9605db0e97114d0fa
4 years ago
Automerger Merge Worker
fa02dd1e20
Merge "MPEG4Writer:Fix MetaData use-after-free issue" am: e6b6db59fc
am: 2308ec5ee0
...
Change-Id: Ia23a044765cdfe27f1d244897a8625b15b85d5a6
4 years ago
Automerger Merge Worker
3cf987e81a
Merge "Benchmark: Consistency in test names" am: b1bac93a52
am: 956e2618bd
am: 9d4867f606
...
Change-Id: I41e095b0a02b91f0d260d553a23ec70500bdbbc9
4 years ago
Automerger Merge Worker
2308ec5ee0
Merge "MPEG4Writer:Fix MetaData use-after-free issue" am: e6b6db59fc
...
Change-Id: I9485f77b567543c5b3cec241ad8c7cccdaff1842
4 years ago
Ray Essick
e6b6db59fc
Merge "MPEG4Writer:Fix MetaData use-after-free issue"
4 years ago
Automerger Merge Worker
9d4867f606
Merge "Benchmark: Consistency in test names" am: b1bac93a52
am: 956e2618bd
...
Change-Id: I5dbaa5535ac8ea57dfdb74acbb3ed6e0a6a63879
4 years ago
Automerger Merge Worker
956e2618bd
Merge "Benchmark: Consistency in test names" am: b1bac93a52
...
Change-Id: Ic122450d1d7bf56cf94840d2626f9182fb6c1e2c
4 years ago
Treehugger Robot
b1bac93a52
Merge "Benchmark: Consistency in test names"
4 years ago
TreeHugger Robot
665c3c4b05
Merge "aaudio: more docs for AAudioStream_release"
4 years ago
Andy Hung
18b58228fc
Merge "MediaMetrics: Minor logging fixes"
4 years ago
Automerger Merge Worker
b5e932a41c
Merge "Revert "audiopolicy: align input and output devices for engine"" into qt-qpr1-dev am: 6302adca26
am: d0a8ff659d
am: 0d1a1207ce
...
Change-Id: Ia110a4d03e65d81b71c05f4b27a2c4fa39e80048
4 years ago
Automerger Merge Worker
0d1a1207ce
Merge "Revert "audiopolicy: align input and output devices for engine"" into qt-qpr1-dev am: 6302adca26
am: d0a8ff659d
...
Change-Id: Ibe604a19c059b0b911730e66ef867099e5328f3f
4 years ago
Automerger Merge Worker
d0a8ff659d
Merge "Revert "audiopolicy: align input and output devices for engine"" into qt-qpr1-dev am: 6302adca26
...
Change-Id: I020e1a408c126c81e0084c932da100d7aa421c5c
4 years ago
Eric Laurent
6302adca26
Merge "Revert "audiopolicy: align input and output devices for engine"" into qt-qpr1-dev
4 years ago
Automerger Merge Worker
7d525bc97e
Merge "use apex_test for test apexes" am: 79cf71eea9
am: 7f4566835c
am: 0848bf51f5
...
Change-Id: I23a5bbf4e26087412fcc3c031961ed744cad0bf4
4 years ago
Automerger Merge Worker
0848bf51f5
Merge "use apex_test for test apexes" am: 79cf71eea9
am: 7f4566835c
...
Change-Id: If3e40fb928ab1be7d5f2947eb81340f2410df8b2
4 years ago
Automerger Merge Worker
7f4566835c
Merge "use apex_test for test apexes" am: 79cf71eea9
...
Change-Id: I0c74e8540a4d110904850a75c034769e478fb354
4 years ago
Treehugger Robot
79cf71eea9
Merge "use apex_test for test apexes"
4 years ago
Automerger Merge Worker
d062603524
[automerger skipped] BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376
am: aca92198a1
am: f0791037c1
am: df156dc766
am: 86021896f0
am: 92b34e48ba
am: 14dd42d061
am: 06219a4467
-s ours
...
am skip reason: Change-Id Id67dc9e793ee886e4cc49370d800c7f3580df313 with SHA-1 9c930d0cac
is in history
Change-Id: I8584409c4607854c50e0d1b07090c09355cfcbda
4 years ago
Automerger Merge Worker
06219a4467
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376
am: aca92198a1
am: f0791037c1
am: df156dc766
am: 86021896f0
am: 92b34e48ba
am: 14dd42d061
...
Change-Id: Iacc674dbc750cab71e6bd01d3cd0026576371d94
4 years ago
Henry Fang
dbaafe08f9
Merge "Add pid override feature to MediaResourceManager"
4 years ago
Automerger Merge Worker
14dd42d061
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376
am: aca92198a1
am: f0791037c1
am: df156dc766
am: 86021896f0
am: 92b34e48ba
...
Change-Id: Ic189504a236afdf7621f658081a6c6dd3571bf97
4 years ago
Automerger Merge Worker
92b34e48ba
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376
am: aca92198a1
am: f0791037c1
am: df156dc766
am: 86021896f0
...
Change-Id: Ia97c658b54e517e1bdbd911bba644e458a193e01
4 years ago
Automerger Merge Worker
86021896f0
BnCrypto: fix use-before-init in CREATE_PLUGIN am: 51aa200376
am: aca92198a1
am: f0791037c1
am: df156dc766
...
Change-Id: I6324e5f0b8be2a3c9dd0d7936fc8379c8daa8365
4 years ago