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

Delete deprecated simulcast and spatial index members

Browse Source 
These attributes were moved from CodecSpecificInfo to EncodedImage in
cl https://webrtc-review.googlesource.com/c/src/+/96780. This followup
deletes the old member variables, which were left temporarily to
transition downstream code.

Bug: webrtc:9378
Change-Id: I1b38ce404a005aec9d48916b73233cfbd7523cfe
Reviewed-on: https://webrtc-review.googlesource.com/97021
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24670}
This commit is contained in:
Niels Möller
2018-08-31 11:11:05 +02:00
committed by Commit Bot
parent 96f2c97161
commit b0fc70303d
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/video_coding/include/video_codec_interface.h
View File

@ -28,9 +28,6 @@ class RTPFragmentationHeader; // forward declaration
// with a copy-constructor. See below. // with a copy-constructor. See below.
struct CodecSpecificInfoVP8 { struct CodecSpecificInfoVP8 {
bool nonReference; bool nonReference;
// TODO(bugs.webrtc.org/9378): Delete simulcastIdx, replaced by spatial index
// member in EncodedImage. Unused, but assigned in downstream code.
uint8_t simulcastIdx;
uint8_t temporalIdx; uint8_t temporalIdx;
bool layerSync; bool layerSync;
int8_t keyIdx; // Negative value to skip keyIdx. int8_t keyIdx; // Negative value to skip keyIdx.
@ -45,9 +42,6 @@ struct CodecSpecificInfoVP9 {
bool non_ref_for_inter_layer_pred; bool non_ref_for_inter_layer_pred;
uint8_t temporal_idx; uint8_t temporal_idx;
// TODO(bugs.webrtc.org/9378): Delete spatial_idx, replaced by spatial index
// member in EncodedImage. Unused, but assigned in downstream code.
uint8_t spatial_idx;
bool temporal_up_switch; bool temporal_up_switch;
bool inter_layer_predicted; // Frame is dependent on directly lower spatial bool inter_layer_predicted; // Frame is dependent on directly lower spatial
// layer frame. // layer frame.
@ -67,18 +61,11 @@ struct CodecSpecificInfoVP9 {
bool end_of_picture; bool end_of_picture;
}; };
// TODO(bugs.webrtc.org/9378): Delete this struct. Unused, except that
// simulcast_idx is assigned in downstream code.
struct CodecSpecificInfoGeneric {
uint8_t simulcast_idx;
};
struct CodecSpecificInfoH264 { struct CodecSpecificInfoH264 {
H264PacketizationMode packetization_mode; H264PacketizationMode packetization_mode;
}; };
union CodecSpecificInfoUnion { union CodecSpecificInfoUnion {
CodecSpecificInfoGeneric generic;
CodecSpecificInfoVP8 VP8; CodecSpecificInfoVP8 VP8;
CodecSpecificInfoVP9 VP9; CodecSpecificInfoVP9 VP9;
CodecSpecificInfoH264 H264; CodecSpecificInfoH264 H264;