zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate objc video decoder wrapper from InitDecode to Configure

Browse Source 
Bug: webrtc:13045
Change-Id: Iff00489a91379298ac90cd48eb1aea109abd9906
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/228945
Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34825}
This commit is contained in:
Danil Chapovalov
2021-08-16 15:12:47 +02:00
committed by WebRTC LUCI CQ
parent 4c4c744818
commit b74b2b5a99
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sdk/objc/native/src/objc_video_decoder_factory.mm
View File

@ -37,8 +37,9 @@ class ObjCVideoDecoder : public VideoDecoder {
ObjCVideoDecoder(id<RTC_OBJC_TYPE(RTCVideoDecoder)> decoder) ObjCVideoDecoder(id<RTC_OBJC_TYPE(RTCVideoDecoder)> decoder)
: decoder_(decoder), implementation_name_([decoder implementationName].stdString) {} : decoder_(decoder), implementation_name_([decoder implementationName].stdString) {}
int32_t InitDecode(const VideoCodec *codec_settings, int32_t number_of_cores) override { bool Configure(const Settings &settings) override {
return [decoder_ startDecodeWithNumberOfCores:number_of_cores]; return
[decoder_ startDecodeWithNumberOfCores:settings.number_of_cores()] == WEBRTC_VIDEO_CODEC_OK;
} }
int32_t Decode(const EncodedImage &input_image, int32_t Decode(const EncodedImage &input_image,

12
sdk/objc/unittests/objc_video_decoder_factory_tests.mm
View File

@ -55,18 +55,18 @@ std::unique_ptr<webrtc::VideoDecoder> GetObjCDecoder(
#pragma mark - #pragma mark -
TEST(ObjCVideoDecoderFactoryTest, InitDecodeReturnsOKOnSuccess) { TEST(ObjCVideoDecoderFactoryTest, ConfigureReturnsTrueOnSuccess) {
std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateOKDecoderFactory()); std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateOKDecoderFactory());
auto* settings = new webrtc::VideoCodec(); webrtc::VideoDecoder::Settings settings;
EXPECT_EQ(decoder->InitDecode(settings, 1), WEBRTC_VIDEO_CODEC_OK); EXPECT_TRUE(decoder->Configure(settings));
} }
TEST(ObjCVideoDecoderFactoryTest, InitDecodeReturnsErrorOnFail) { TEST(ObjCVideoDecoderFactoryTest, ConfigureReturnsFalseOnFail) {
std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateErrorDecoderFactory()); std::unique_ptr<webrtc::VideoDecoder> decoder = GetObjCDecoder(CreateErrorDecoderFactory());
auto* settings = new webrtc::VideoCodec(); webrtc::VideoDecoder::Settings settings;
EXPECT_EQ(decoder->InitDecode(settings, 1), WEBRTC_VIDEO_CODEC_ERROR); EXPECT_FALSE(decoder->Configure(settings));
} }
TEST(ObjCVideoDecoderFactoryTest, DecodeReturnsOKOnSuccess) { TEST(ObjCVideoDecoderFactoryTest, DecodeReturnsOKOnSuccess) {