diff --git a/webrtc/modules/utility/include/file_player.h b/webrtc/modules/utility/include/file_player.h index 4ca134a669..b064e3021b 100644 --- a/webrtc/modules/utility/include/file_player.h +++ b/webrtc/modules/utility/include/file_player.h @@ -15,7 +15,6 @@ #include "webrtc/engine_configurations.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/typedefs.h" -#include "webrtc/video_frame.h" namespace webrtc { class FileCallback; @@ -79,30 +78,6 @@ public: // Note: scaleFactor is in the range [0.0 - 2.0] virtual int32_t SetAudioScaling(float scaleFactor) = 0; - // Return the time in ms until next video frame should be pulled (by - // calling GetVideoFromFile(..)). - // Note: this API reads one video frame from file. This means that it should - // be called exactly once per GetVideoFromFile(..) API call. - virtual int32_t TimeUntilNextVideoFrame() { return -1;} - - virtual int32_t StartPlayingVideoFile( - const char* /*fileName*/, - bool /*loop*/, - bool /*videoOnly*/) { return -1;} - - virtual int32_t video_codec_info(VideoCodec& /*videoCodec*/) const - {return -1;} - - virtual int32_t GetVideoFromFile(VideoFrame& /*videoFrame*/) { return -1; } - - // Same as GetVideoFromFile(). videoFrame will have the resolution specified - // by the width outWidth and height outHeight in pixels. - virtual int32_t GetVideoFromFile(VideoFrame& /*videoFrame*/, - const uint32_t /*outWidth*/, - const uint32_t /*outHeight*/) { - return -1; - } - protected: virtual ~FilePlayer() {} diff --git a/webrtc/modules/utility/include/file_recorder.h b/webrtc/modules/utility/include/file_recorder.h index 480a4a9799..92c91bd4b0 100644 --- a/webrtc/modules/utility/include/file_recorder.h +++ b/webrtc/modules/utility/include/file_recorder.h @@ -16,7 +16,6 @@ #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/media_file/media_file_defines.h" #include "webrtc/typedefs.h" -#include "webrtc/video_frame.h" namespace webrtc { @@ -46,11 +45,9 @@ public: uint32_t notification) = 0; // Stop recording. - // Note: this API is for both audio and video. virtual int32_t StopRecording() = 0; // Return true if recording. - // Note: this API is for both audio and video. virtual bool IsRecording() const = 0; virtual int32_t codec_info(CodecInst& codecInst) const = 0; @@ -59,21 +56,6 @@ public: virtual int32_t RecordAudioToFile( const AudioFrame& frame) = 0; - // Open/create the file specified by fileName for writing audio/video data - // (relative path is allowed). audioCodecInst specifies the encoding of the - // audio data. videoCodecInst specifies the encoding of the video data. - // Only video data will be recorded if videoOnly is true. amrFormat - // specifies the amr/amrwb storage format. - // Note: the file format is AVI. - virtual int32_t StartRecordingVideoFile( - const char* fileName, - const CodecInst& audioCodecInst, - const VideoCodec& videoCodecInst, - bool videoOnly = false) = 0; - - // Record the video frame in videoFrame to AVI file. - virtual int32_t RecordVideoToFile(const VideoFrame& videoFrame) = 0; - protected: virtual ~FileRecorder() {} diff --git a/webrtc/modules/utility/source/file_recorder_impl.cc b/webrtc/modules/utility/source/file_recorder_impl.cc index b0a766f22e..82b37f0118 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.cc +++ b/webrtc/modules/utility/source/file_recorder_impl.cc @@ -8,7 +8,6 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/engine_configurations.h" #include "webrtc/modules/media_file/media_file.h" #include "webrtc/modules/utility/source/file_recorder_impl.h" diff --git a/webrtc/modules/utility/source/file_recorder_impl.h b/webrtc/modules/utility/source/file_recorder_impl.h index 96f811d49e..a9dd3a8863 100644 --- a/webrtc/modules/utility/source/file_recorder_impl.h +++ b/webrtc/modules/utility/source/file_recorder_impl.h @@ -8,7 +8,7 @@ * be found in the AUTHORS file in the root of the source tree. */ -// This file contains a class that can write audio and/or video to file in +// This file contains a class that can write audio to file in // multiple file formats. The unencoded input data is written to file in the // encoded format specified. @@ -58,17 +58,6 @@ public: bool IsRecording() const override; int32_t codec_info(CodecInst& codecInst) const override; int32_t RecordAudioToFile(const AudioFrame& frame) override; - int32_t StartRecordingVideoFile( - const char* fileName, - const CodecInst& audioCodecInst, - const VideoCodec& videoCodecInst, - bool videoOnly = false) override - { - return -1; - } - int32_t RecordVideoToFile(const VideoFrame& videoFrame) override { - return -1; - } protected: int32_t WriteEncodedAudioData(const int8_t* audioBuffer,