Compare commits

...

15 commits

Author SHA1 Message Date
Christopher Ferris
80b3183143 Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: 6b6d429d1d am: 786c188d00 am: d7ff18e034 am: c532332a09
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162

Change-Id: Iac50c4aacc7f20d2fdd0b7cd15204dff04873b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 01:43:31 +00:00
Christopher Ferris
c532332a09 Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: 6b6d429d1d am: 786c188d00 am: d7ff18e034
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162

Change-Id: Ie46cd9ba0b0acc98dc70d5c4914b2ffdbc8f37e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 21:49:24 +00:00
Christopher Ferris
d7ff18e034 Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: 6b6d429d1d am: 786c188d00
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162

Change-Id: I841ebce73c25d49d987976e1746fcf3d74931db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 21:31:56 +00:00
Christopher Ferris
786c188d00 Merge "compress: fix return value of is_codec_supported" am: 53414059ef am: 6b6d429d1d
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162

Change-Id: I51022071f010c6ee47bf313965044e82727f7195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 20:45:09 +00:00
Christopher Ferris
6b6d429d1d Merge "compress: fix return value of is_codec_supported" am: 53414059ef
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/2167162

Change-Id: Ia29cf7ff157a77a12111634eda413eb52453a236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 20:26:55 +00:00
Christopher Ferris
53414059ef Merge "compress: fix return value of is_codec_supported" 2022-08-15 20:02:20 +00:00
Jindong Yue
65c97079d2 compress: fix return value of is_codec_supported
The function return type of oops() is int, which
mismatches the boolean type of is_codec_supported.

Signed-off-by: Jindong Yue <jindong.yue@nxp.com>
Change-Id: I892f232d8fb61c8bf8238f55c39c1978436fdb10
2022-07-27 15:58:13 +08:00
Bob Badour
dacabf034e Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474 am: efc77b356b am: dc32830263 am: f690ffd9a9 am: 1b05ea37e2
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694

Change-Id: If1bb60f8670c1e3b09e25e12b5c1d72228166c43
2021-05-29 14:36:28 +00:00
Bob Badour
1b05ea37e2 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474 am: efc77b356b am: dc32830263 am: f690ffd9a9
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a09eb0c13f1209bb99b104d41a9d79f986147f5
2021-02-17 18:11:15 +00:00
Bob Badour
9bfdf373e9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474 am: efc77b356b am: dc32830263 am: f690ffd9a9
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cfd455d0f8c1ad0aae2f08f7dd3d569362db00f
2021-02-17 18:07:37 +00:00
Bob Badour
f690ffd9a9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474 am: efc77b356b am: dc32830263
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a8b0e6dd5252a5c58bbbcbeefa762a201ab7d09
2021-02-17 17:22:15 +00:00
Bob Badour
dc32830263 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474 am: efc77b356b
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4491ed6c3c41ec571b27e56994858a427b13b2e
2021-02-17 16:47:45 +00:00
Bob Badour
efc77b356b Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" am: 3a930cc474
Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1588694

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3222d1f0d38a06b4f7e9982d927661fce76bb41
2021-02-17 15:53:53 +00:00
Bob Badour
3a930cc474 Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress" 2021-02-17 15:31:56 +00:00
Bob Badour
44dbe0fc15 [LSC] Add LOCAL_LICENSE_KINDS to external/tinycompress
Added SPDX-license-identifier-BSD to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I19d055d78a2c9227c8c521b65d3ff52efc591eca
2021-02-12 15:30:30 -08:00
2 changed files with 25 additions and 2 deletions

View file

@ -1,3 +1,24 @@
package {
default_applicable_licenses: ["external_tinycompress_license"],
}
// Added automatically by a large-scale-change
//
// large-scale-change filtered out the below license kinds as false-positives:
// SPDX-license-identifier-LGPL
// SPDX-license-identifier-LGPL-2.1
// See: http://go/android-license-faq
license {
name: "external_tinycompress_license",
visibility: [":__subpackages__"],
license_kinds: [
"SPDX-license-identifier-BSD",
],
license_text: [
"NOTICE",
],
}
cc_library_shared { cc_library_shared {
name: "libtinycompress", name: "libtinycompress",
vendor: true, vendor: true,

View file

@ -574,9 +574,11 @@ bool is_codec_supported(unsigned int card, unsigned int device,
ops = &compr_hw_ops; ops = &compr_hw_ops;
fd = ops->open(card, device, flags, &data, NULL); fd = ops->open(card, device, flags, &data, NULL);
if (fd < 0) if (fd < 0) {
return oops(&bad_compress, errno, "cannot open card %u, device %u", oops(&bad_compress, errno, "cannot open card %u, device %u",
card, device); card, device);
return false;
}
ret = _is_codec_type_supported(ops, data, codec); ret = _is_codec_type_supported(ops, data, codec);