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

Revert "Reland "Add multiplex case to webrtc_perf_tests""

Browse Source 
This reverts commit 7c5bc1cbd66d2436f80a1ddafbdc4fbff5389c6e.

Reason for revert: Breaks downstream test that was relying on FrameGeneratorCapturer::Create

Original change's description:
> Reland "Add multiplex case to webrtc_perf_tests"
> 
> This is a reland of d90a7e842437f5760a34bbfa283b3c4182963889
> 
> Original change's description:
> > Add multiplex case to webrtc_perf_tests
> >
> > This CL adds two new tests to perf, covering I420 and I420A input to multiplex
> > codec. In order to have the correct input, it adds I420A case to
> > SquareGenerator and corresponding PSNR and SSIM calculations.
> >
> > Bug: webrtc:7671
> > Change-Id: I9735d725bbfba457e804e29907cee55406ae5c8d
> > Reviewed-on: https://webrtc-review.googlesource.com/52180
> > Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> > Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org>
> > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#22330}
> 
> Bug: webrtc:7671
> Change-Id: Iba2e89aee73a73a0372edea26933d6a7ea2e0ec9
> TBR: niklas.enbom@webrtc.org, phoglund@webrtc.org, sprang@webrtc.org
> Reviewed-on: https://webrtc-review.googlesource.com/60600
> Reviewed-by: Emircan Uysaler <emircan@webrtc.org>
> Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22336}

TBR=phoglund@webrtc.org,sprang@webrtc.org,niklas.enbom@webrtc.org,qiangchen@chromium.org,emircan@webrtc.org

Change-Id: I26d32f9fe8d97ea341aac15cbbd43ed89a0b5b9d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:7671
Reviewed-on: https://webrtc-review.googlesource.com/60680
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22337}
This commit is contained in:
Taylor Brandstetter
2018-03-08 01:54:10 +00:00
committed by Commit Bot
parent 7c5bc1cbd6
commit 081136fe53
15 changed files with 75 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/encoder_settings.cc
View File

@ -12,9 +12,7 @@
#include <algorithm>
#include <string>
#include "media/engine/internaldecoderfactory.h"
#include "modules/video_coding/codecs/h264/include/h264.h"
#include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
#include "modules/video_coding/codecs/vp8/include/vp8.h"
#include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "rtc_base/refcountedobject.h"
@ -104,9 +102,6 @@ VideoReceiveStream::Decoder CreateMatchingDecoder(
decoder.decoder = VP8Decoder::Create().release();
} else if (encoder_settings.payload_name == "VP9") {
decoder.decoder = VP9Decoder::Create().release();
} else if (encoder_settings.payload_name == "multiplex") {
decoder.decoder = new MultiplexDecoderAdapter(
new InternalDecoderFactory(), SdpVideoFormat(cricket::kVp9CodecName));
} else {
decoder.decoder = new FakeDecoder();
}