commit 358c99a66c3c8e4e660f6015ff4ab1ae5072760c
author Niels Möller <nisse@webrtc.org> Wed Jan 30 08:38:43 2019
committer Commit Bot <commit-bot@chromium.org> Wed Jan 30 10:31:21 2019
tree 24fcf4c1f5d0bafa6259220ded7b25fd794f71bb
parent 840b05587fb26a0b7a45863ce1de53b5289d662d

Delete deprecated MediaTransport methods using VideoCodecType.

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}

api/DEPS

diff --git a/api/DEPS b/api/DEPS
index ca0726f..edc9a23 100644
--- a/api/DEPS
+++ b/api/DEPS
@@ -107,7 +107,6 @@
   "media_transport_interface\.h": [
     "+rtc_base/copy_on_write_buffer.h",  # As used by datachannelinterface.h
     "+rtc_base/network_route.h",
-    "+rtc_base/deprecation.h",
   ],
 
   "peer_connection_factory_proxy\.h": [

api/media_transport_interface.cc

diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc
index eccb74d..d4f9fd2 100644
--- a/api/media_transport_interface.cc
+++ b/api/media_transport_interface.cc
@@ -66,28 +66,15 @@
 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(
-    int64_t frame_id,
-    std::vector<int64_t> referenced_frame_ids,
     int payload_type,
     const webrtc::EncodedImage& encoded_image)
-    : codec_type_(kVideoCodecGeneric),
-      payload_type_(payload_type),
+    : payload_type_(payload_type),
       encoded_image_(encoded_image),
       frame_id_(frame_id),
       referenced_frame_ids_(std::move(referenced_frame_ids)) {}
 
 MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=(
     const MediaTransportEncodedVideoFrame& o) {
-  codec_type_ = o.codec_type_;
   payload_type_ = o.payload_type_;
   encoded_image_ = o.encoded_image_;
   encoded_data_ = o.encoded_data_;
@@ -102,7 +89,6 @@
 
 MediaTransportEncodedVideoFrame& MediaTransportEncodedVideoFrame::operator=(
     MediaTransportEncodedVideoFrame&& o) {
-  codec_type_ = o.codec_type_;
   payload_type_ = o.payload_type_;
   encoded_image_ = o.encoded_image_;
   encoded_data_ = std::move(o.encoded_data_);

api/media_transport_interface.h

diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h
index 1669b42..96b135d 100644
--- a/api/media_transport_interface.h
+++ b/api/media_transport_interface.h
@@ -29,7 +29,6 @@
 #include "api/units/data_rate.h"
 #include "api/video/encoded_image.h"
 #include "rtc_base/copy_on_write_buffer.h"
-#include "rtc_base/deprecation.h"
 #include "rtc_base/network_route.h"
 
 namespace rtc {
@@ -185,12 +184,6 @@
 // Represents encoded video frame, along with the codec information.
 class MediaTransportEncodedVideoFrame final {
  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,
                                   std::vector<int64_t> referenced_frame_ids,
                                   int payload_type,
@@ -203,8 +196,6 @@
       MediaTransportEncodedVideoFrame&& other);
   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_; }
   const webrtc::EncodedImage& encoded_image() const { return encoded_image_; }
 
@@ -220,7 +211,6 @@
  private:
   MediaTransportEncodedVideoFrame();
 
-  VideoCodecType codec_type_;
   int payload_type_;
 
   // The buffer is not owned by the encoded image. On the sender it means that