From 0b556b04e670e692c9f38b40e9f5def15355e8a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Mon, 12 Feb 2018 15:21:48 +0100
Subject: [PATCH] Reduce public inheritance in VideoStreamEncoder.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implementation of the EncodedImageCallback and
AdaptationObserverInterface belongs with the implementation, not the
public interface.

Bug: webrtc:8830
Change-Id: I901ae79ede252599c5fe22284cf649274c5b1422
Reviewed-on: https://webrtc-review.googlesource.com/51862
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22000}
---
 video/video_stream_encoder.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/video/video_stream_encoder.h b/video/video_stream_encoder.h
index ae0a9583bc..5282f403ab 100644
--- a/video/video_stream_encoder.h
+++ b/video/video_stream_encoder.h
@@ -48,8 +48,9 @@ class VideoBitrateAllocationObserver;
 //  Call ConfigureEncoder with the codec settings.
 //  Call Stop() when done.
 class VideoStreamEncoder : public rtc::VideoSinkInterface<VideoFrame>,
-                           public EncodedImageCallback,
-                           public AdaptationObserverInterface {
+                           private EncodedImageCallback,
+                           // Protected only to provide access to tests.
+                           protected AdaptationObserverInterface {
  public:
   // Interface for receiving encoded video frames and notifications about
   // configuration changes.