zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define FecControllerOverride and plumb it down to VideoEncoder

Browse Source 
The purpose of this interface is to allow VideoEncoder to override
the bandwidth allocation set by FecController in RtpVideoSender.

This CL defines the interface and sends it down to VideoSender.
Two upcoming CLs will:
1. Make LibvpxVp8Encoder pass it on to the (injectable)
   FrameBufferController, where it might be put to good use.
2. Modify RtpVideoSender to respond to the message sent to it
   via this API.

TBR=kwiberg@webrtc.org

Bug: webrtc:10769
Change-Id: I2ef82f0ddcde7fd078e32d8aabf6efe43e0f7f8a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/143962
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28416}
This commit is contained in:
Elad Alon
2019-06-28 15:19:43 +02:00
committed by Commit Bot
parent 52e5242593
commit 8f01c4e1b6
44 changed files with 224 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h
View File

@ -15,6 +15,7 @@
#include <memory>
#include <vector>
#include "api/fec_controller_override.h"
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_encoder.h"
#include "api/video_codecs/video_encoder_factory.h"
@ -39,6 +40,8 @@ class MultiplexEncoderAdapter : public VideoEncoder {
virtual ~MultiplexEncoderAdapter();
// Implements VideoEncoder
void SetFecControllerOverride(
FecControllerOverride* fec_controller_override) override;
int InitEncode(const VideoCodec* inst,
const VideoEncoder::Settings& settings) override;
int Encode(const VideoFrame& input_image,
@ -46,6 +49,8 @@ class MultiplexEncoderAdapter : public VideoEncoder {
int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
void SetRates(const RateControlParameters& parameters) override;
int Release() override;
// TOD(eladalon): Add OnPacketLossRateUpdate, OnRttUpdate and
// OnLossNotification.
EncoderInfo GetEncoderInfo() const override;
EncodedImageCallback::Result OnEncodedImage(

5
modules/video_coding/codecs/multiplex/multiplex_encoder_adapter.cc
View File

@ -61,6 +61,11 @@ MultiplexEncoderAdapter::~MultiplexEncoderAdapter() {
Release();
}
void MultiplexEncoderAdapter::SetFecControllerOverride(
FecControllerOverride* fec_controller_override) {
// Ignored.
}
int MultiplexEncoderAdapter::InitEncode(
const VideoCodec* inst,
const VideoEncoder::Settings& settings) {

7
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
View File

@ -450,8 +450,13 @@ void LibvpxVp8Encoder::SetStreamState(bool send_stream, int stream_idx) {
send_stream_[stream_idx] = send_stream;
}
void LibvpxVp8Encoder::SetFecControllerOverride(
FecControllerOverride* fec_controller_override) {
RTC_DCHECK(fec_controller_override);
// TODO(bugs.webrtc.og/10769): Pass on to the frame buffer controller.
}
// TODO(eladalon): s/inst/codec_settings/g.
// TODO(bugs.webrtc.org/10720): Pass |capabilities| to frame buffer controller.
int LibvpxVp8Encoder::InitEncode(const VideoCodec* inst,
const VideoEncoder::Settings& settings) {
if (inst == NULL) {

4
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h
View File

@ -15,6 +15,7 @@
#include <string>
#include <vector>
#include "api/fec_controller_override.h"
#include "api/video/encoded_image.h"
#include "api/video/video_frame.h"
#include "api/video_codecs/video_encoder.h"
@ -45,6 +46,9 @@ class LibvpxVp8Encoder : public VideoEncoder {
int Release() override;
void SetFecControllerOverride(
FecControllerOverride* fec_controller_override) override;
int InitEncode(const VideoCodec* codec_settings,
const VideoEncoder::Settings& settings) override;

5
modules/video_coding/codecs/vp9/vp9_impl.cc
View File

@ -251,6 +251,11 @@ VP9EncoderImpl::~VP9EncoderImpl() {
Release();
}
void VP9EncoderImpl::SetFecControllerOverride(
FecControllerOverride* fec_controller_override) {
// Ignored.
}
int VP9EncoderImpl::Release() {
int ret_val = WEBRTC_VIDEO_CODEC_OK;

6
modules/video_coding/codecs/vp9/vp9_impl.h
View File

@ -21,6 +21,7 @@
#include "modules/video_coding/codecs/vp9/include/vp9.h"
#include "api/fec_controller_override.h"
#include "api/video_codecs/video_encoder.h"
#include "media/base/vp9_profile.h"
#include "modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h"
@ -36,7 +37,10 @@ class VP9EncoderImpl : public VP9Encoder {
public:
explicit VP9EncoderImpl(const cricket::VideoCodec& codec);
virtual ~VP9EncoderImpl();
~VP9EncoderImpl() override;
void SetFecControllerOverride(
FecControllerOverride* fec_controller_override) override;
int Release() override;