Remove FrameForStorage:Follow up on r4688
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2201004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4723 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/video_coding/main/test/decode_from_storage_test.cc b/modules/video_coding/main/test/decode_from_storage_test.cc
deleted file mode 100644
index 4bc355b..0000000
--- a/modules/video_coding/main/test/decode_from_storage_test.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2012 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.
- */
-
-#include "webrtc/modules/video_coding/main/test/receiver_tests.h"
-#include "webrtc/modules/video_coding/main/test/test_util.h"
-#include "webrtc/modules/video_coding/main/test/vcm_payload_sink_factory.h"
-#include "webrtc/system_wrappers/interface/trace.h"
-#include "webrtc/test/testsupport/fileutils.h"
-
-namespace {
-
-const bool kConfigProtectionEnabled = false;
-const webrtc::VCMVideoProtection kConfigProtectionMethod =
- webrtc::kProtectionNack;
-const float kConfigLossRate = 0.0f;
-const bool kConfigReordering = false;
-const uint32_t kConfigRttMs = 100;
-const uint32_t kConfigRenderDelayMs = 0;
-const uint32_t kConfigMinPlayoutDelayMs = 0;
-const int64_t kConfigMaxRuntimeMs = -1;
-
-} // namespace
-
-int DecodeFromStorageTest(const CmdArgs& args) {
- std::string trace_file = webrtc::test::OutputPath() +
- "decodeFromStorageTestTrace.txt";
- webrtc::Trace::CreateTrace();
- webrtc::Trace::SetTraceFile(trace_file.c_str());
- webrtc::Trace::set_level_filter(webrtc::kTraceAll);
-
- webrtc::rtpplayer::PayloadTypes payload_types;
- payload_types.push_back(webrtc::rtpplayer::PayloadCodecTuple(
- VCM_VP8_PAYLOAD_TYPE, "VP8", webrtc::kVideoCodecVP8));
-
- std::string output_file = args.outputFile;
- if (output_file == "") {
- output_file = webrtc::test::OutputPath() + "DecodeFromStorage.yuv";
- }
-
- webrtc::SimulatedClock clock(0);
- webrtc::rtpplayer::VcmPayloadSinkFactory factory(output_file, &clock,
- kConfigProtectionEnabled, kConfigProtectionMethod, kConfigRttMs,
- kConfigRenderDelayMs, kConfigMinPlayoutDelayMs, true);
- webrtc::scoped_ptr<webrtc::rtpplayer::RtpPlayerInterface> rtp_player(
- webrtc::rtpplayer::Create(args.inputFile, &factory, &clock, payload_types,
- kConfigLossRate, kConfigRttMs, kConfigReordering));
- if (rtp_player.get() == NULL) {
- return -1;
- }
-
- int ret = 0;
- while ((ret = rtp_player->NextPacket(clock.TimeInMilliseconds())) == 0) {
- ret = factory.DecodeAndProcessAll(false);
- if (ret < 0 || (kConfigMaxRuntimeMs > -1 &&
- clock.TimeInMilliseconds() >= kConfigMaxRuntimeMs)) {
- break;
- }
- clock.AdvanceTimeMilliseconds(1);
- }
-
- rtp_player->Print();
-
- switch (ret) {
- case 1:
- printf("Success\n");
- break;
- case -1:
- printf("Failed\n");
- break;
- case 0:
- printf("Timeout\n");
- break;
- }
-
- webrtc::Trace::ReturnTrace();
- return 0;
-}
diff --git a/modules/video_coding/main/test/vcm_payload_sink_factory.cc b/modules/video_coding/main/test/vcm_payload_sink_factory.cc
index da41497..d5877a4 100644
--- a/modules/video_coding/main/test/vcm_payload_sink_factory.cc
+++ b/modules/video_coding/main/test/vcm_payload_sink_factory.cc
@@ -29,29 +29,21 @@
VcmPayloadSink(VcmPayloadSinkFactory* factory,
RtpStreamInterface* stream,
scoped_ptr<VideoCodingModule>* vcm,
- scoped_ptr<VideoCodingModule>* vcm_playback,
scoped_ptr<FileOutputFrameReceiver>* frame_receiver)
: factory_(factory),
stream_(stream),
vcm_(),
- vcm_playback_(),
frame_receiver_() {
assert(factory);
assert(stream);
assert(vcm);
assert(vcm->get());
- assert(vcm_playback);
assert(frame_receiver);
assert(frame_receiver->get());
vcm_.swap(*vcm);
- vcm_playback_.swap(*vcm_playback);
frame_receiver_.swap(*frame_receiver);
vcm_->RegisterPacketRequestCallback(this);
- if (vcm_playback_.get() == NULL) {
- vcm_->RegisterReceiveCallback(frame_receiver_.get());
- } else {
- vcm_playback_->RegisterReceiveCallback(frame_receiver_.get());
- }
+ vcm_->RegisterReceiveCallback(frame_receiver_.get());
}
virtual ~VcmPayloadSink() {
@@ -110,7 +102,6 @@
VcmPayloadSinkFactory* factory_;
RtpStreamInterface* stream_;
scoped_ptr<VideoCodingModule> vcm_;
- scoped_ptr<VideoCodingModule> vcm_playback_;
scoped_ptr<FileOutputFrameReceiver> frame_receiver_;
DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSink);
@@ -153,8 +144,6 @@
return NULL;
}
- scoped_ptr<VideoCodingModule> vcm_playback;
-
const PayloadTypes& plt = stream->payload_types();
for (PayloadTypesIterator it = plt.begin(); it != plt.end();
++it) {
@@ -180,7 +169,7 @@
scoped_ptr<FileOutputFrameReceiver> frame_receiver(
new FileOutputFrameReceiver(base_out_filename_, stream->ssrc()));
scoped_ptr<VcmPayloadSink> sink(
- new VcmPayloadSink(this, stream, &vcm, &vcm_playback, &frame_receiver));
+ new VcmPayloadSink(this, stream, &vcm, &frame_receiver));
sinks_.push_back(sink.get());
return sink.release();
