6f440ed5b5
This reverts commit 07efe436c9002e139845f62486e3ee4e29f0d85b. Reason for revert: Breaks downstream project. cricket::GetSimulcastConfig method signature has been updated. I think you can get away with a default value for temporal_layers_supported (and then you can remove it after a few days when projects will be updated). Original change's description: > Implement H264 simulcast support and generalize SimulcastEncoderAdapter use for H264 & VP8. > > * Move SimulcastEncoderAdapter out under modules/video_coding > * Move SimulcastRateAllocator back out to modules/video_coding/utility > * Move TemporalLayers and ScreenshareLayers to modules/video_coding/utility > * Move any VP8 specific code - such as temporal layer bitrate budgeting - > under codec type dependent conditionals. > * Plumb the simulcast index for H264 in the codec specific and RTP format data structures. > > Bug: webrtc:5840 > Change-Id: Ieced8a00e38f273c1a6cfd0f5431a87d07b8f44e > Reviewed-on: https://webrtc-review.googlesource.com/64100 > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23705} TBR=sprang@webrtc.org,stefan@webrtc.org,mflodman@webrtc.org,hta@webrtc.org,sergio.garcia.murillo@gmail.com,titovartem@webrtc.org,agouaillard@gmail.com Change-Id: Ic9d3b1eeaf195bb5ec2063954421f5e77866d663 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:5840 Reviewed-on: https://webrtc-review.googlesource.com/84760 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23710}
95 lines
2.8 KiB
C++
95 lines
2.8 KiB
C++
/*
|
|
* Copyright (c) 2012 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 MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|
|
#define MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "api/video/video_frame.h"
|
|
#include "api/video_codecs/video_decoder.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "common_types.h" // NOLINT(build/include)
|
|
#include "modules/include/module_common_types.h"
|
|
#include "modules/video_coding/include/video_error_codes.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
namespace webrtc {
|
|
|
|
class RTPFragmentationHeader; // forward declaration
|
|
|
|
// Note: if any pointers are added to this struct, it must be fitted
|
|
// with a copy-constructor. See below.
|
|
struct CodecSpecificInfoVP8 {
|
|
bool nonReference;
|
|
uint8_t simulcastIdx;
|
|
uint8_t temporalIdx;
|
|
bool layerSync;
|
|
int8_t keyIdx; // Negative value to skip keyIdx.
|
|
};
|
|
|
|
struct CodecSpecificInfoVP9 {
|
|
bool first_frame_in_picture; // First frame, increment picture_id.
|
|
bool inter_pic_predicted; // This layer frame is dependent on previously
|
|
// coded frame(s).
|
|
bool flexible_mode;
|
|
bool ss_data_available;
|
|
bool non_ref_for_inter_layer_pred;
|
|
|
|
uint8_t temporal_idx;
|
|
uint8_t spatial_idx;
|
|
bool temporal_up_switch;
|
|
bool inter_layer_predicted; // Frame is dependent on directly lower spatial
|
|
// layer frame.
|
|
uint8_t gof_idx;
|
|
|
|
// SS data.
|
|
size_t num_spatial_layers; // Always populated.
|
|
bool spatial_layer_resolution_present;
|
|
uint16_t width[kMaxVp9NumberOfSpatialLayers];
|
|
uint16_t height[kMaxVp9NumberOfSpatialLayers];
|
|
GofInfoVP9 gof;
|
|
|
|
// Frame reference data.
|
|
uint8_t num_ref_pics;
|
|
uint8_t p_diff[kMaxVp9RefPics];
|
|
|
|
bool end_of_picture;
|
|
};
|
|
|
|
struct CodecSpecificInfoGeneric {
|
|
uint8_t simulcast_idx;
|
|
};
|
|
|
|
struct CodecSpecificInfoH264 {
|
|
H264PacketizationMode packetization_mode;
|
|
};
|
|
|
|
union CodecSpecificInfoUnion {
|
|
CodecSpecificInfoGeneric generic;
|
|
CodecSpecificInfoVP8 VP8;
|
|
CodecSpecificInfoVP9 VP9;
|
|
CodecSpecificInfoH264 H264;
|
|
};
|
|
|
|
// Note: if any pointers are added to this struct or its sub-structs, it
|
|
// must be fitted with a copy-constructor. This is because it is copied
|
|
// in the copy-constructor of VCMEncodedFrame.
|
|
struct CodecSpecificInfo {
|
|
CodecSpecificInfo() : codecType(kVideoCodecUnknown), codec_name(nullptr) {}
|
|
VideoCodecType codecType;
|
|
const char* codec_name;
|
|
CodecSpecificInfoUnion codecSpecific;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|