diff --git a/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h index 94d4271694..d2badf9201 100644 --- a/modules/video_coding/include/video_codec_interface.h +++ b/modules/video_coding/include/video_codec_interface.h @@ -28,9 +28,6 @@ class RTPFragmentationHeader; // forward declaration // with a copy-constructor. See below. struct CodecSpecificInfoVP8 { 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; bool layerSync; int8_t keyIdx; // Negative value to skip keyIdx. @@ -45,9 +42,6 @@ struct CodecSpecificInfoVP9 { bool non_ref_for_inter_layer_pred; 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 inter_layer_predicted; // Frame is dependent on directly lower spatial // layer frame. @@ -67,18 +61,11 @@ struct CodecSpecificInfoVP9 { 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 { H264PacketizationMode packetization_mode; }; union CodecSpecificInfoUnion { - CodecSpecificInfoGeneric generic; CodecSpecificInfoVP8 VP8; CodecSpecificInfoVP9 VP9; CodecSpecificInfoH264 H264;