Fix standalone build with libs

This patch fixes issues with the standalone build with libraries
enabled, which currently doesn't have a CI bot.

Change-Id: I08fb0f74160555695bcf60dce9e3aa17183303ce
TBR=miu@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2430189
Reviewed-by: Jordan Bayles <jophba@chromium.org>

9 files changed, 14 insertions, 10 deletions

diff --git a/cast/standalone_receiver/sdl_audio_player.cc b/cast/standalone_receiver/sdl_audio_player.cc
index 3392b706..c460a7ed 100644
--- a/cast/standalone_receiver/sdl_audio_player.cc
+++ b/cast/standalone_receiver/sdl_audio_player.cc
@@ -55,12 +55,12 @@ void InterleaveAudioSamples(const uint8_t* const planes[],
 SDLAudioPlayer::SDLAudioPlayer(ClockNowFunctionPtr now_function,
                                TaskRunner* task_runner,
                                Receiver* receiver,
-                               const std::string& codec_name,
+                               AudioCodec codec,
                                std::function<void()> error_callback)
     : SDLPlayerBase(now_function,
                     task_runner,
                     receiver,
-                    codec_name,
+                    CodecToString(codec),
                     std::move(error_callback),
                     kAudioMediaType) {}
 
diff --git a/cast/standalone_receiver/sdl_audio_player.h b/cast/standalone_receiver/sdl_audio_player.h
index 8788d1f5..b21ce2cc 100644
--- a/cast/standalone_receiver/sdl_audio_player.h
+++ b/cast/standalone_receiver/sdl_audio_player.h
@@ -22,7 +22,7 @@ class SDLAudioPlayer final : public SDLPlayerBase {
   SDLAudioPlayer(ClockNowFunctionPtr now_function,
                  TaskRunner* task_runner,
                  Receiver* receiver,
-                 const std::string& codec_name,
+                 AudioCodec codec,
                  std::function<void()> error_callback);
 
   ~SDLAudioPlayer() final;
diff --git a/cast/standalone_receiver/sdl_player_base.cc b/cast/standalone_receiver/sdl_player_base.cc
index ab2f1327..fdc3c065 100644
--- a/cast/standalone_receiver/sdl_player_base.cc
+++ b/cast/standalone_receiver/sdl_player_base.cc
@@ -10,6 +10,7 @@
 
 #include "absl/types/span.h"
 #include "cast/standalone_receiver/avcodec_glue.h"
+#include "cast/streaming/constants.h"
 #include "cast/streaming/encoded_frame.h"
 #include "util/big_endian.h"
 #include "util/chrono_helpers.h"
diff --git a/cast/standalone_receiver/sdl_player_base.h b/cast/standalone_receiver/sdl_player_base.h
index 7338edab..4e268e8a 100644
--- a/cast/standalone_receiver/sdl_player_base.h
+++ b/cast/standalone_receiver/sdl_player_base.h
@@ -13,6 +13,7 @@
 
 #include "cast/standalone_receiver/decoder.h"
 #include "cast/standalone_receiver/sdl_glue.h"
+#include "cast/streaming/message_fields.h"
 #include "cast/streaming/receiver.h"
 #include "platform/api/task_runner.h"
 #include "platform/api/time.h"
diff --git a/cast/standalone_receiver/sdl_video_player.cc b/cast/standalone_receiver/sdl_video_player.cc
index dc540e50..999545de 100644
--- a/cast/standalone_receiver/sdl_video_player.cc
+++ b/cast/standalone_receiver/sdl_video_player.cc
@@ -5,6 +5,7 @@
 #include "cast/standalone_receiver/sdl_video_player.h"
 
 #include <sstream>
+#include <utility>
 
 #include "cast/standalone_receiver/avcodec_glue.h"
 #include "util/osp_logging.h"
@@ -20,13 +21,13 @@ constexpr char kVideoMediaType[] = "video";
 SDLVideoPlayer::SDLVideoPlayer(ClockNowFunctionPtr now_function,
                                TaskRunner* task_runner,
                                Receiver* receiver,
-                               const std::string& codec_name,
+                               VideoCodec codec,
                                SDL_Renderer* renderer,
                                std::function<void()> error_callback)
     : SDLPlayerBase(now_function,
                     task_runner,
                     receiver,
-                    codec_name,
+                    CodecToString(codec),
                     std::move(error_callback),
                     kVideoMediaType),
       renderer_(renderer) {
diff --git a/cast/standalone_receiver/sdl_video_player.h b/cast/standalone_receiver/sdl_video_player.h
index 24b3496c..609c860c 100644
--- a/cast/standalone_receiver/sdl_video_player.h
+++ b/cast/standalone_receiver/sdl_video_player.h
@@ -8,6 +8,7 @@
 #include <string>
 
 #include "cast/standalone_receiver/sdl_player_base.h"
+#include "cast/streaming/constants.h"
 
 namespace openscreen {
 namespace cast {
@@ -21,7 +22,7 @@ class SDLVideoPlayer final : public SDLPlayerBase {
   SDLVideoPlayer(ClockNowFunctionPtr now_function,
                  TaskRunner* task_runner,
                  Receiver* receiver,
-                 const std::string& codec_name,
+                 VideoCodec codec_name,
                  SDL_Renderer* renderer,
                  std::function<void()> error_callback);
 
diff --git a/cast/streaming/message_fields.h b/cast/streaming/message_fields.h
index 890afb3e..ef7b742f 100644
--- a/cast/streaming/message_fields.h
+++ b/cast/streaming/message_fields.h
@@ -20,7 +20,7 @@ namespace cast {
 constexpr char kCastWebrtcNamespace[] = "urn:x-cast:com.google.cast.webrtc";
 
 // JSON message field values specific to the Sender Session.
-constexpr char kMessageKeyType[] = "type";
+constexpr char kMessageType[] = "type";
 constexpr char kMessageTypeOffer[] = "OFFER";
 constexpr char kMessageTypeAnswer[] = "ANSWER";
 
diff --git a/cast/streaming/receiver_session.cc b/cast/streaming/receiver_session.cc
index 3cb90cdf..46152131 100644
--- a/cast/streaming/receiver_session.cc
+++ b/cast/streaming/receiver_session.cc
@@ -46,7 +46,7 @@ const Stream* SelectStream(const std::vector<Codec>& preferred_codecs,
 // Helper method that creates an invalid Answer response.
 Json::Value CreateInvalidAnswerMessage(Error error) {
   Json::Value message_root;
-  message_root[kMessageKeyType] = kMessageTypeAnswer;
+  message_root[kMessageType] = kMessageTypeAnswer;
   message_root[kResult] = kResultError;
   message_root[kErrorMessageBody][kErrorCode] = static_cast<int>(error.code());
   message_root[kErrorMessageBody][kErrorDescription] = error.message();
@@ -58,7 +58,7 @@ Json::Value CreateInvalidAnswerMessage(Error error) {
 Json::Value CreateAnswerMessage(const Answer& answer) {
   OSP_DCHECK(answer.IsValid());
   Json::Value message_root;
-  message_root[kMessageKeyType] = kMessageTypeAnswer;
+  message_root[kMessageType] = kMessageTypeAnswer;
   message_root[kAnswerMessageBody] = answer.ToJson();
   message_root[kResult] = kResultOk;
   return message_root;
diff --git a/cast/streaming/sender_session.cc b/cast/streaming/sender_session.cc
index 1998cc7b..c153d076 100644
--- a/cast/streaming/sender_session.cc
+++ b/cast/streaming/sender_session.cc
@@ -190,7 +190,7 @@ Error SenderSession::Negotiate(std::vector<AudioCaptureConfig> audio_configs,
       std::move(offer), std::move(audio_configs), std::move(video_configs)});
 
   Json::Value message_body;
-  message_body[kMessageKeyType] = kMessageTypeOffer;
+  message_body[kMessageType] = kMessageTypeOffer;
   message_body[kOfferMessageBody] = std::move(json_offer.value());
 
   Message message;