Reason for revert:
The WebRtcBrowserTest.NegotiateUnsupportedVideoCodec test has been fixed in Chromium with the following change:
function removeVideoCodec(offerSdp) {
- offerSdp = offerSdp.replace('a=rtpmap:100 VP8/90000\r\n',
- 'a=rtpmap:100 XVP8/90000\r\n');
+ offerSdp = offerSdp.replace(/a=rtpmap:(\d+)\ VP8\/90000\r\n/,
+ 'a=rtpmap:$1 XVP8/90000\r\n');
return offerSdp;
}
Original issue's description:
> Revert of Stop using hardcoded payload types for video codecs (patchset #6 id:210001 of https://codereview.webrtc.org/2493133002/ )
>
> Reason for revert:
> Breaks chromium.fyi test:
> WebRtcBrowserTest.NegotiateUnsupportedVideoCodec
>
> Original issue's description:
> > Stop using hardcoded payload types for video codecs
> >
> > This CL stops using hardcoded payload types for different video codecs
> > and will dynamically assign them payload types incrementally from 96 to
> > 127 instead.
> >
> > This CL:
> > * Replaces 'std::vector<VideoCodec> DefaultVideoCodecList()' in
> > webrtcvideoengine2.cc with an explicit WebRtcVideoEncoderFactory for
> > internally supported software codecs instead. The purpose is to
> > streamline the payload type assignment in webrtcvideoengine2.cc which
> > will now have two encoder factories of the same
> > WebRtcVideoEncoderFactory type; one internal and one external.
> > * Removes webrtc::VideoEncoder::EncoderType and use cricket::VideoCodec
> > instead.
> > * Removes 'static VideoEncoder* Create(EncoderType codec_type)' and
> > moves the create function to the internal encoder factory instead.
> > * Removes video_encoder.cc. webrtc::VideoEncoder is now just an
> > interface without any static functions.
> > * The function GetSupportedCodecs in webrtcvideoengine2.cc unifies
> > the internal and external codecs and assigns them payload types
> > incrementally from 96 to 127.
> > * Updates webrtcvideoengine2_unittest.cc and removes assumptions about
> > what payload types will be used.
> >
> > BUG=webrtc:6677,webrtc:6705
> > R=hta@webrtc.org, ossu@webrtc.org, stefan@webrtc.org
> >
> > Committed: https://crrev.com/42043b95872b51321f508bf255d804ce3dff366b
> > Cr-Commit-Position: refs/heads/master@{#15135}
>
> TBR=hta@webrtc.org,stefan@webrtc.org,ossu@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6677,webrtc:6705
>
> Committed: https://crrev.com/eacbaea920797ff751ca83050d140821f5055591
> Cr-Commit-Position: refs/heads/master@{#15140}
TBR=hta@webrtc.org,stefan@webrtc.org,ossu@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6677,webrtc:6705
Review-Url: https://codereview.webrtc.org/2511933002
Cr-Commit-Position: refs/heads/master@{#15148}
159 lines
5.8 KiB
C++
159 lines
5.8 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_VIDEO_ENCODER_H_
|
|
#define WEBRTC_VIDEO_ENCODER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/typedefs.h"
|
|
#include "webrtc/video_frame.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RTPFragmentationHeader;
|
|
// TODO(pbos): Expose these through a public (root) header or change these APIs.
|
|
struct CodecSpecificInfo;
|
|
class VideoCodec;
|
|
|
|
class EncodedImageCallback {
|
|
public:
|
|
virtual ~EncodedImageCallback() {}
|
|
|
|
struct Result {
|
|
enum Error {
|
|
OK,
|
|
|
|
// Failed to send the packet.
|
|
ERROR_SEND_FAILED,
|
|
};
|
|
|
|
Result(Error error) : error(error) {}
|
|
Result(Error error, uint32_t frame_id) : error(error), frame_id(frame_id) {}
|
|
|
|
Error error;
|
|
|
|
// Frame ID assigned to the frame. The frame ID should be the same as the ID
|
|
// seen by the receiver for this frame. RTP timestamp of the frame is used
|
|
// as frame ID when RTP is used to send video. Must be used only when
|
|
// error=OK.
|
|
uint32_t frame_id = 0;
|
|
|
|
// Tells the encoder that the next frame is should be dropped.
|
|
bool drop_next_frame = false;
|
|
};
|
|
|
|
// Callback function which is called when an image has been encoded.
|
|
virtual Result OnEncodedImage(
|
|
const EncodedImage& encoded_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const RTPFragmentationHeader* fragmentation) = 0;
|
|
};
|
|
|
|
class VideoEncoder {
|
|
public:
|
|
static VideoCodecVP8 GetDefaultVp8Settings();
|
|
static VideoCodecVP9 GetDefaultVp9Settings();
|
|
static VideoCodecH264 GetDefaultH264Settings();
|
|
|
|
virtual ~VideoEncoder() {}
|
|
|
|
// Initialize the encoder with the information from the codecSettings
|
|
//
|
|
// Input:
|
|
// - codec_settings : Codec settings
|
|
// - number_of_cores : Number of cores available for the encoder
|
|
// - max_payload_size : The maximum size each payload is allowed
|
|
// to have. Usually MTU - overhead.
|
|
//
|
|
// Return value : Set bit rate if OK
|
|
// <0 - Errors:
|
|
// WEBRTC_VIDEO_CODEC_ERR_PARAMETER
|
|
// WEBRTC_VIDEO_CODEC_ERR_SIZE
|
|
// WEBRTC_VIDEO_CODEC_LEVEL_EXCEEDED
|
|
// WEBRTC_VIDEO_CODEC_MEMORY
|
|
// WEBRTC_VIDEO_CODEC_ERROR
|
|
virtual int32_t InitEncode(const VideoCodec* codec_settings,
|
|
int32_t number_of_cores,
|
|
size_t max_payload_size) = 0;
|
|
|
|
// Register an encode complete callback object.
|
|
//
|
|
// Input:
|
|
// - callback : Callback object which handles encoded images.
|
|
//
|
|
// Return value : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
|
|
virtual int32_t RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) = 0;
|
|
|
|
// Free encoder memory.
|
|
// Return value : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
|
|
virtual int32_t Release() = 0;
|
|
|
|
// Encode an I420 image (as a part of a video stream). The encoded image
|
|
// will be returned to the user through the encode complete callback.
|
|
//
|
|
// Input:
|
|
// - frame : Image to be encoded
|
|
// - frame_types : Frame type to be generated by the encoder.
|
|
//
|
|
// Return value : WEBRTC_VIDEO_CODEC_OK if OK
|
|
// <0 - Errors:
|
|
// WEBRTC_VIDEO_CODEC_ERR_PARAMETER
|
|
// WEBRTC_VIDEO_CODEC_MEMORY
|
|
// WEBRTC_VIDEO_CODEC_ERROR
|
|
// WEBRTC_VIDEO_CODEC_TIMEOUT
|
|
virtual int32_t Encode(const VideoFrame& frame,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<FrameType>* frame_types) = 0;
|
|
|
|
// Inform the encoder of the new packet loss rate and the round-trip time of
|
|
// the network.
|
|
//
|
|
// Input:
|
|
// - packet_loss : Fraction lost
|
|
// (loss rate in percent = 100 * packetLoss / 255)
|
|
// - rtt : Round-trip time in milliseconds
|
|
// Return value : WEBRTC_VIDEO_CODEC_OK if OK
|
|
// <0 - Errors: WEBRTC_VIDEO_CODEC_ERROR
|
|
virtual int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) = 0;
|
|
|
|
// Inform the encoder about the new target bit rate.
|
|
//
|
|
// Input:
|
|
// - bitrate : New target bit rate
|
|
// - framerate : The target frame rate
|
|
//
|
|
// Return value : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
|
|
virtual int32_t SetRates(uint32_t bitrate, uint32_t framerate) {
|
|
RTC_NOTREACHED() << "SetRate(uint32_t, uint32_t) is deprecated.";
|
|
return -1;
|
|
}
|
|
|
|
// Default fallback: Just use the sum of bitrates as the single target rate.
|
|
// TODO(sprang): Remove this default implementation when we remove SetRates().
|
|
virtual int32_t SetRateAllocation(const BitrateAllocation& allocation,
|
|
uint32_t framerate) {
|
|
return SetRates(allocation.get_sum_kbps(), framerate);
|
|
}
|
|
|
|
virtual int32_t SetPeriodicKeyFrames(bool enable) { return -1; }
|
|
virtual void OnDroppedFrame() {}
|
|
virtual bool SupportsNativeHandle() const { return false; }
|
|
virtual const char* ImplementationName() const { return "unknown"; }
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_VIDEO_ENCODER_H_
|