7dbd77c8b9
This reverts commit 937a59268e2ae56a58f648fba827444f7beb4466. Reason for revert: Breaks downstream project Original change's description: > Call native codec factories from Android ones. > > Android video codec factories are expected to be synchronised with the native ones in terms on supported codecs. But before this change there were differences: > > 1. Native decoder factory keeps AV1 support behind RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY while Android decoder factory advertises AV1 unconditionally; > > 2. Native encoder factory advertises AV1 if RTC_USE_LIBAOM_AV1_ENCODER is enabled while Android encoder factory never advertises AV1. > > This CL synchronises the codecs set in Android factories with that of native factories by calling native factories from Android ones. > > Bug: webrtc:13573, b/257272020 > Change-Id: I99d801eda0c5f3400bac222b9b08d719f1a6ed72 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/282240 > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> > Reviewed-by: Xavier Lepaul <xalep@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#38583} Bug: webrtc:13573, b/257272020 Change-Id: I8128f5fc5d86902e35ab2812c984169c4b106118 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/282800 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Auto-Submit: Andrey Logvin <landrey@google.com> Owners-Override: Mirko Bonadei <mbonadei@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#38586}
56 lines
1.7 KiB
Java
56 lines
1.7 KiB
Java
/*
|
|
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
package org.webrtc;
|
|
|
|
import androidx.annotation.Nullable;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
|
|
public class SoftwareVideoDecoderFactory implements VideoDecoderFactory {
|
|
@Nullable
|
|
@Override
|
|
public VideoDecoder createDecoder(VideoCodecInfo codecInfo) {
|
|
String codecName = codecInfo.getName();
|
|
|
|
if (codecName.equalsIgnoreCase(VideoCodecMimeType.VP8.name())) {
|
|
return new LibvpxVp8Decoder();
|
|
}
|
|
if (codecName.equalsIgnoreCase(VideoCodecMimeType.VP9.name())
|
|
&& LibvpxVp9Decoder.nativeIsSupported()) {
|
|
return new LibvpxVp9Decoder();
|
|
}
|
|
if (codecName.equalsIgnoreCase(VideoCodecMimeType.AV1.name())) {
|
|
return new Dav1dDecoder();
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
@Override
|
|
public VideoCodecInfo[] getSupportedCodecs() {
|
|
return supportedCodecs();
|
|
}
|
|
|
|
static VideoCodecInfo[] supportedCodecs() {
|
|
List<VideoCodecInfo> codecs = new ArrayList<VideoCodecInfo>();
|
|
|
|
codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP8.name(), new HashMap<>()));
|
|
if (LibvpxVp9Decoder.nativeIsSupported()) {
|
|
codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
|
|
}
|
|
|
|
codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
|
|
|
|
return codecs.toArray(new VideoCodecInfo[codecs.size()]);
|
|
}
|
|
}
|