Commit 0535571e authored by hshi's avatar hshi Committed by Commit bot

Deprecate CAST1 payload.

BUG=430323
TEST=trybot and manual testing of tab casting
R=hclam@chromium.org
TBR=dalecurtis@chromium.org

Review URL: https://codereview.chromium.org/695643003

Cr-Commit-Position: refs/heads/master@{#302747}
parent f1f59477
...@@ -46,8 +46,6 @@ media::VideoCodecProfile WebRTCVideoCodecToVideoCodecProfile( ...@@ -46,8 +46,6 @@ media::VideoCodecProfile WebRTCVideoCodecToVideoCodecProfile(
return media::H264PROFILE_MAIN; return media::H264PROFILE_MAIN;
} }
} }
case webrtc::kVideoCodecGeneric:
return media::H264PROFILE_MAIN;
default: default:
NOTREACHED() << "Unrecognized video codec type"; NOTREACHED() << "Unrecognized video codec type";
return media::VIDEO_CODEC_PROFILE_UNKNOWN; return media::VIDEO_CODEC_PROFILE_UNKNOWN;
...@@ -714,9 +712,7 @@ void RTCVideoEncoder::ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image, ...@@ -714,9 +712,7 @@ void RTCVideoEncoder::ReturnEncodedImage(scoped_ptr<webrtc::EncodedImage> image,
memset(&header, 0, sizeof(header)); memset(&header, 0, sizeof(header));
switch (video_codec_type_) { switch (video_codec_type_) {
case webrtc::kVideoCodecVP8: case webrtc::kVideoCodecVP8:
case webrtc::kVideoCodecGeneric:
// Generate a header describing a single fragment. // Generate a header describing a single fragment.
// Note that webrtc treats the generic-type payload as an opaque buffer.
header.VerifyAndAllocateFragmentationHeader(1); header.VerifyAndAllocateFragmentationHeader(1);
header.fragmentationOffset[0] = 0; header.fragmentationOffset[0] = 0;
header.fragmentationLength[0] = image->_length; header.fragmentationLength[0] = image->_length;
......
...@@ -38,9 +38,6 @@ void VEAToWebRTCCodecs( ...@@ -38,9 +38,6 @@ void VEAToWebRTCCodecs(
codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec( codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
webrtc::kVideoCodecH264, "H264", width, height, fps)); webrtc::kVideoCodecH264, "H264", width, height, fps));
} }
// TODO(hshi): remove the generic codec type after CASTv1 deprecation.
codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
webrtc::kVideoCodecGeneric, "CAST1", width, height, fps));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment