admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated MediaTransport methods using VideoCodecType.

Browse Source 
This is a followup, deleting the things marked as deprecated in
https://webrtc-review.googlesource.com/c/113180.

Bug: webrtc:9719
Change-Id: I64dc31c6918f575599fc6b0bbfa47c5b1f2f3019
Reviewed-on: https://webrtc-review.googlesource.com/c/113521
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Peter Slatala <psla@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26465}
This commit is contained in:
Niels Möller 2019-01-30 09:38:43 +01:00 committed by Commit Bot
parent 840b05587f
commit 358c99a66c
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/DEPS
View File

@ -107,7 +107,6 @@ specific_include_rules = {
"media_transport_interface\.h": [ "media_transport_interface\.h": [
"+rtc_base/copy_on_write_buffer.h", # As used by datachannelinterface.h "+rtc_base/copy_on_write_buffer.h", # As used by datachannelinterface.h
"+rtc_base/network_route.h", "+rtc_base/network_route.h",
"+rtc_base/deprecation.h",
], ],
"peer_connection_factory_proxy\.h": [ "peer_connection_factory_proxy\.h": [

16
api/media_transport_interface.cc
View File

@ -63,31 +63,18 @@ MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame() = default;
MediaTransportEncodedVideoFrame::~MediaTransportEncodedVideoFrame() = default; MediaTransportEncodedVideoFrame::~MediaTransportEncodedVideoFrame() = default;
MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame(
int64_t frame_id,
std::vector<int64_t> referenced_frame_ids,
VideoCodecType codec_type,
const webrtc::EncodedImage& encoded_image)
: codec_type_(codec_type),
payload_type_(0),
encoded_image_(encoded_image),
frame_id_(frame_id),
referenced_frame_ids_(std::move(referenced_frame_ids)) {}
MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame( MediaTransportEncodedVideoFrame::MediaTransportEncodedVideoFrame(
int64_t frame_id, int64_t frame_id,
std::vector<int64_t> referenced_frame_ids, std::vector<int64_t> referenced_frame_ids,
int payload_type, int payload_type,
const webrtc::EncodedImage& encoded_image) const webrtc::EncodedImage& encoded_image)
: codec_type_(kVideoCodecGeneric), : payload_type_(payload_type),
payload_type_(payload_type),
encoded_image_(encoded_image), encoded_image_(encoded_image),
frame_id_(frame_id), frame_id_(frame_id),
referenced_frame_ids_(std::move(referenced_frame_ids)) {} referenced_frame_ids_(std::move(referenced_frame_ids)) {}
MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=( MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=(
const MediaTransportEncodedVideoFrame& o) { const MediaTransportEncodedVideoFrame& o) {
codec_type_ = o.codec_type_;
payload_type_ = o.payload_type_; payload_type_ = o.payload_type_;
encoded_image_ = o.encoded_image_; encoded_image_ = o.encoded_image_;
encoded_data_ = o.encoded_data_; encoded_data_ = o.encoded_data_;
@ -102,7 +89,6 @@ MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=(
MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=( MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=(
MediaTransportEncodedVideoFrame&& o) { MediaTransportEncodedVideoFrame&& o) {
codec_type_ = o.codec_type_;
payload_type_ = o.payload_type_; payload_type_ = o.payload_type_;
encoded_image_ = o.encoded_image_; encoded_image_ = o.encoded_image_;
encoded_data_ = std::move(o.encoded_data_); encoded_data_ = std::move(o.encoded_data_);

10
api/media_transport_interface.h
View File

@ -29,7 +29,6 @@
#include "api/units/data_rate.h" #include "api/units/data_rate.h"
#include "api/video/encoded_image.h" #include "api/video/encoded_image.h"
#include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/copy_on_write_buffer.h"
#include "rtc_base/deprecation.h"
#include "rtc_base/network_route.h" #include "rtc_base/network_route.h"
namespace rtc { namespace rtc {
@ -185,12 +184,6 @@ class MediaTransportAudioSinkInterface {
// Represents encoded video frame, along with the codec information. // Represents encoded video frame, along with the codec information.
class MediaTransportEncodedVideoFrame final { class MediaTransportEncodedVideoFrame final {
public: public:
// TODO(bugs.webrtc.org/9719): Switch to payload_type
RTC_DEPRECATED MediaTransportEncodedVideoFrame(
int64_t frame_id,
std::vector<int64_t> referenced_frame_ids,
VideoCodecType codec_type,
const webrtc::EncodedImage& encoded_image);
MediaTransportEncodedVideoFrame(int64_t frame_id, MediaTransportEncodedVideoFrame(int64_t frame_id,
std::vector<int64_t> referenced_frame_ids, std::vector<int64_t> referenced_frame_ids,
int payload_type, int payload_type,
@ -203,8 +196,6 @@ class MediaTransportEncodedVideoFrame final {
MediaTransportEncodedVideoFrame&& other); MediaTransportEncodedVideoFrame&& other);
MediaTransportEncodedVideoFrame(MediaTransportEncodedVideoFrame&&); MediaTransportEncodedVideoFrame(MediaTransportEncodedVideoFrame&&);
// TODO(bugs.webrtc.org/9719): Switch to payload_type
RTC_DEPRECATED VideoCodecType codec_type() const { return codec_type_; }
int payload_type() const { return payload_type_; } int payload_type() const { return payload_type_; }
const webrtc::EncodedImage& encoded_image() const { return encoded_image_; } const webrtc::EncodedImage& encoded_image() const { return encoded_image_; }
@ -220,7 +211,6 @@ class MediaTransportEncodedVideoFrame final {
private: private:
MediaTransportEncodedVideoFrame(); MediaTransportEncodedVideoFrame();
VideoCodecType codec_type_;
int payload_type_; int payload_type_;
// The buffer is not owned by the encoded image. On the sender it means that // The buffer is not owned by the encoded image. On the sender it means that