Commit de48cb58 authored by Eric Roman's avatar Eric Roman Committed by Commit Bot

Remove CastStreamingNativeHandler::FrameReceiverConfigFromArg, as it is unused.

Change-Id: I936c84d79cca2072e324946708762d7990f19ef7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1898774
Auto-Submit: Eric Roman <eroman@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713589}
parent d7f843fd
...@@ -64,8 +64,6 @@ constexpr char kInvalidAesIvMask[] = "Invalid value for AES IV mask"; ...@@ -64,8 +64,6 @@ constexpr char kInvalidAesIvMask[] = "Invalid value for AES IV mask";
constexpr char kInvalidAesKey[] = "Invalid value for AES key"; constexpr char kInvalidAesKey[] = "Invalid value for AES key";
constexpr char kInvalidDestination[] = "Invalid destination"; constexpr char kInvalidDestination[] = "Invalid destination";
constexpr char kInvalidRtpParams[] = "Invalid value for RTP params"; constexpr char kInvalidRtpParams[] = "Invalid value for RTP params";
constexpr char kInvalidLatency[] = "Invalid value for max_latency. (0-1000)";
constexpr char kInvalidRtpTimebase[] = "Invalid rtp_timebase. (1000-1000000)";
constexpr char kInvalidStreamArgs[] = "Invalid stream arguments"; constexpr char kInvalidStreamArgs[] = "Invalid stream arguments";
constexpr char kRtpStreamNotFound[] = "The RTP stream cannot be found"; constexpr char kRtpStreamNotFound[] = "The RTP stream cannot be found";
constexpr char kUdpTransportNotFound[] = "The UDP transport cannot be found"; constexpr char kUdpTransportNotFound[] = "The UDP transport cannot be found";
...@@ -800,90 +798,6 @@ CastUdpTransport* CastStreamingNativeHandler::GetUdpTransportOrThrow( ...@@ -800,90 +798,6 @@ CastUdpTransport* CastStreamingNativeHandler::GetUdpTransportOrThrow(
return NULL; return NULL;
} }
bool CastStreamingNativeHandler::FrameReceiverConfigFromArg(
v8::Isolate* isolate,
const v8::Local<v8::Value>& arg,
media::cast::FrameReceiverConfig* config) const {
std::unique_ptr<base::Value> params_value =
V8ValueConverter::Create()->FromV8Value(arg, context()->v8_context());
if (!params_value) {
isolate->ThrowException(v8::Exception::TypeError(
v8::String::NewFromUtf8(isolate, kUnableToConvertParams,
v8::NewStringType::kNormal)
.ToLocalChecked()));
return false;
}
std::unique_ptr<RtpReceiverParams> params =
RtpReceiverParams::FromValue(*params_value);
if (!params) {
isolate->ThrowException(v8::Exception::TypeError(
v8::String::NewFromUtf8(isolate, kInvalidRtpParams,
v8::NewStringType::kNormal)
.ToLocalChecked()));
return false;
}
config->receiver_ssrc = params->receiver_ssrc;
config->sender_ssrc = params->sender_ssrc;
config->rtp_max_delay_ms = params->max_latency;
if (config->rtp_max_delay_ms < 0 || config->rtp_max_delay_ms > 1000) {
isolate->ThrowException(v8::Exception::TypeError(
v8::String::NewFromUtf8(isolate, kInvalidLatency,
v8::NewStringType::kNormal)
.ToLocalChecked()));
return false;
}
config->channels = 2;
if (params->codec_name == "OPUS") {
config->codec = media::cast::CODEC_AUDIO_OPUS;
config->rtp_timebase = 48000;
config->rtp_payload_type = media::cast::RtpPayloadType::AUDIO_OPUS;
} else if (params->codec_name == "PCM16") {
config->codec = media::cast::CODEC_AUDIO_PCM16;
config->rtp_timebase = 48000;
config->rtp_payload_type = media::cast::RtpPayloadType::AUDIO_PCM16;
} else if (params->codec_name == "AAC") {
config->codec = media::cast::CODEC_AUDIO_AAC;
config->rtp_timebase = 48000;
config->rtp_payload_type = media::cast::RtpPayloadType::AUDIO_AAC;
} else if (params->codec_name == "VP8") {
config->codec = media::cast::CODEC_VIDEO_VP8;
config->rtp_timebase = 90000;
config->rtp_payload_type = media::cast::RtpPayloadType::VIDEO_VP8;
} else if (params->codec_name == "H264") {
config->codec = media::cast::CODEC_VIDEO_H264;
config->rtp_timebase = 90000;
config->rtp_payload_type = media::cast::RtpPayloadType::VIDEO_H264;
}
if (params->rtp_timebase) {
config->rtp_timebase = *params->rtp_timebase;
if (config->rtp_timebase < 1000 || config->rtp_timebase > 1000000) {
isolate->ThrowException(v8::Exception::TypeError(
v8::String::NewFromUtf8(isolate, kInvalidRtpTimebase,
v8::NewStringType::kNormal)
.ToLocalChecked()));
return false;
}
}
if (params->aes_key &&
!HexDecode(*params->aes_key, &config->aes_key)) {
isolate->ThrowException(
v8::Exception::Error(v8::String::NewFromUtf8(isolate, kInvalidAesKey,
v8::NewStringType::kNormal)
.ToLocalChecked()));
return false;
}
if (params->aes_iv_mask &&
!HexDecode(*params->aes_iv_mask, &config->aes_iv_mask)) {
isolate->ThrowException(
v8::Exception::Error(v8::String::NewFromUtf8(isolate, kInvalidAesIvMask,
v8::NewStringType::kNormal)
.ToLocalChecked()));
return false;
}
return true;
}
bool CastStreamingNativeHandler::IPEndPointFromArg( bool CastStreamingNativeHandler::IPEndPointFromArg(
v8::Isolate* isolate, v8::Isolate* isolate,
const v8::Local<v8::Value>& arg, const v8::Local<v8::Value>& arg,
......
...@@ -25,12 +25,6 @@ namespace net { ...@@ -25,12 +25,6 @@ namespace net {
class IPEndPoint; class IPEndPoint;
} }
namespace media {
namespace cast {
struct FrameReceiverConfig;
}
}
namespace extensions { namespace extensions {
class NativeExtensionBindingsSystem; class NativeExtensionBindingsSystem;
...@@ -103,15 +97,6 @@ class CastStreamingNativeHandler : public ObjectBackedNativeHandler { ...@@ -103,15 +97,6 @@ class CastStreamingNativeHandler : public ObjectBackedNativeHandler {
CastRtpStream* GetRtpStreamOrThrow(int stream_id) const; CastRtpStream* GetRtpStreamOrThrow(int stream_id) const;
CastUdpTransport* GetUdpTransportOrThrow(int transport_id) const; CastUdpTransport* GetUdpTransportOrThrow(int transport_id) const;
// Fills out a media::cast::FrameReceiverConfig from the v8
// equivialent. (cast.streaming.receiverSession.RtpReceiverParams)
// Returns true if everything was ok, raises a v8 exception and
// returns false if anything went wrong.
bool FrameReceiverConfigFromArg(
v8::Isolate* isolate,
const v8::Local<v8::Value>& arg,
media::cast::FrameReceiverConfig* config) const;
bool IPEndPointFromArg(v8::Isolate* isolate, bool IPEndPointFromArg(v8::Isolate* isolate,
const v8::Local<v8::Value>& arg, const v8::Local<v8::Value>& arg,
net::IPEndPoint* ip_endpoint) const; net::IPEndPoint* ip_endpoint) const;
......
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