mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-20 09:07:52 +01:00
e2fd86a79c
This deprecates the following methods in VideoEncoder: virtual ScalingSettings GetScalingSettings() const; virtual bool SupportsNativeHandle() const; virtual const char* ImplementationName() const; Though they are not marked RTC_DEPRECATED since we still want to call them from within the default GetEncoderInfo() until downstream projects have been updated. Furthmore, implementation name is changed from const char* to std:string, which prevents some lifetime issues with dynamic encoder names, and CodecSpecificInfo.codec_name is removed in favor of getting the implementation name via GetEncoderInfo(). This CL removes calls to these deprecated methods, follow-ups will also remove implementations of the methods and replace them with new GetEncoderInfo() substitutions. Bug: webrtc:9890 Change-Id: I6fd6e531480c0b952f53dbd5105e0b0adc3e3b0c Reviewed-on: https://webrtc-review.googlesource.com/c/106905 Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25351}
89 lines
2.8 KiB
C++
89 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"
|
|
|
|
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 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;
|
|
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 CodecSpecificInfoH264 {
|
|
H264PacketizationMode packetization_mode;
|
|
};
|
|
|
|
union CodecSpecificInfoUnion {
|
|
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(kVideoCodecGeneric), codec_name(nullptr) {
|
|
memset(&codecSpecific, 0, sizeof(codecSpecific));
|
|
}
|
|
VideoCodecType codecType;
|
|
// |codec_name| is deprecated, use name provided by VideoEncoder instead.
|
|
const char* codec_name;
|
|
CodecSpecificInfoUnion codecSpecific;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODEC_INTERFACE_H_
|