From 038df3c5d7c77ae5a6047ef99da1ddf79597a985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= <pbos@webrtc.org>
Date: Tue, 28 Apr 2015 11:58:44 +0200
Subject: [PATCH] Remove ViEExternalCodec usage in VideoSendStream.

Replaces interface usage with direct calls on ViEEncoder removing a
layer of indirection.

BUG=1695
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49179004

Cr-Commit-Position: refs/heads/master@{#9095}
---
 webrtc/video/video_send_stream.cc | 15 ++++++---------
 webrtc/video/video_send_stream.h  |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 68b80cefcf..126be98a9d 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -118,7 +118,6 @@ VideoSendStream::VideoSendStream(
       config_(config),
       suspended_ssrcs_(suspended_ssrcs),
       channel_group_(channel_group),
-      external_codec_(nullptr),
       channel_(-1),
       use_config_bitrate_(true),
       stats_proxy_(Clock::GetRealTimeClock(), config) {
@@ -203,10 +202,10 @@ VideoSendStream::VideoSendStream(
   DCHECK(config.encoder_settings.encoder != nullptr);
   DCHECK_GE(config.encoder_settings.payload_type, 0);
   DCHECK_LE(config.encoder_settings.payload_type, 127);
-  external_codec_ = ViEExternalCodec::GetInterface(video_engine);
-  CHECK_EQ(0, external_codec_->RegisterExternalSendCodec(
-                  channel_, config.encoder_settings.payload_type,
-                  config.encoder_settings.encoder, false));
+  // TODO(pbos): Wire up codec internal-source setting or remove setting.
+  CHECK_EQ(0, vie_encoder_->RegisterExternalEncoder(
+                  config.encoder_settings.encoder,
+                  config.encoder_settings.payload_type, false));
 
   codec_ = ViECodec::GetInterface(video_engine);
   CHECK(ReconfigureVideoEncoder(encoder_config));
@@ -257,8 +256,8 @@ VideoSendStream::~VideoSendStream() {
   capture_->DisconnectCaptureDevice(channel_);
   capture_->ReleaseCaptureDevice(capture_id_);
 
-  external_codec_->DeRegisterExternalSendCodec(
-      channel_, config_.encoder_settings.payload_type);
+  vie_encoder_->DeRegisterExternalEncoder(
+      config_.encoder_settings.payload_type);
 
   video_engine_base_->DeleteChannel(channel_);
 
@@ -266,8 +265,6 @@ VideoSendStream::~VideoSendStream() {
   video_engine_base_->Release();
   capture_->Release();
   codec_->Release();
-  if (external_codec_)
-    external_codec_->Release();
   network_->Release();
 }
 
diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index 83849a533d..0a35ce0e1b 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -92,7 +92,6 @@ class VideoSendStream : public webrtc::VideoSendStream,
   ViECodec* codec_;
   ViEEncoder* vie_encoder_;
   ViEExternalCapture* external_capture_;
-  ViEExternalCodec* external_codec_;
   ViENetwork* network_;
   ViEImageProcess* image_process_;