Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673760

Change-Id: I4e6a062210c5e08ca207d26c5c39667c2f26a1d8
This commit is contained in:
Wonsik Kim
2021-04-13 03:02:43 +00:00
committed by Automerger Merge Worker
parent 95949aed66 5d41bf1b65
commit 69814e45a1
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
media/java/android/media/MediaCodec.java
View File

@@ -4607,6 +4607,25 @@ final public class MediaCodec {
return mType;
}
@Override
public boolean equals(Object o) {
if (o == null) {
return false;
}
if (!(o instanceof ParameterDescriptor)) {
return false;
}
ParameterDescriptor other = (ParameterDescriptor) o;
return this.mName.equals(other.mName) && this.mType == other.mType;
}
@Override
public int hashCode() {
return Arrays.asList(
(Object) mName,
(Object) Integer.valueOf(mType)).hashCode();
}
private String mName;
private @MediaFormat.Type int mType;
}
@@ -4631,7 +4650,8 @@ final public class MediaCodec {
private native ParameterDescriptor native_getParameterDescriptor(@NonNull String name);
/**
* Subscribe to vendor parameters, so that changes to these parameters generate
* Subscribe to vendor parameters, so that these parameters will be present in
* {@link #getOutputFormat} and changes to these parameters generate
* output format change event.
* <p>
* Unrecognized parameter names or standard (non-vendor) parameter names will be ignored.
@@ -4660,8 +4680,9 @@ final public class MediaCodec {
private native void native_subscribeToVendorParameters(@NonNull List<String> names);
/**
* Unsubscribe from vendor parameters, so that changes to these parameters
* no longer generate output format change event.
* Unsubscribe from vendor parameters, so that these parameters will not be present in
* {@link #getOutputFormat} and changes to these parameters no longer generate
* output format change event.
* <p>
* Unrecognized parameter names, standard (non-vendor) parameter names will be ignored.
* {@link #reset} also resets the list of subscribed parameters.
@@ -4669,7 +4690,8 @@ final public class MediaCodec {
* <p>
* This method can be called in any codec state except for released state. When called in
* running state with newly unsubscribed parameters, it takes effect no later than the
* processing of the subsequently queued buffer.
* processing of the subsequently queued buffer. For the removed parameters, the codec will
* generate output format change event.
* <p>
* Note that any vendor parameters set in a {@link #configure} or
* {@link #setParameters} call are automatically subscribed, and with this method