diff options
| author | Colin Cross <ccross@android.com> | 2021-08-26 22:19:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-26 22:19:25 +0000 |
| commit | 307f4f004b06572ec342cc80eba3a1802f57ffc5 (patch) | |
| tree | 08f815bfcdaed1c2137de2d6966e42a8870dedb0 /cast/standalone_receiver/sdl_video_player.cc | |
| parent | 8beec73fbbcaaab6785c3f9cc5a9661afcbc7fa7 (diff) | |
| parent | e9172c38c10a012f2d8db5c28bd283fc4038908c (diff) | |
| download | openscreen-307f4f004b06572ec342cc80eba3a1802f57ffc5.tar.gz | |
Upgrade openscreen to f54d92523c9f2c8c5afb99e05fed70e4b8772b1c am: 6b563cff6f am: 8c1d656299 am: be7732ab4d am: e9172c38c1
Original change: https://android-review.googlesource.com/c/platform/external/openscreen/+/1810936
Change-Id: I1b0f6122794b238c2f819d1e5b61a680816695e9
Diffstat (limited to 'cast/standalone_receiver/sdl_video_player.cc')
| -rw-r--r-- | cast/standalone_receiver/sdl_video_player.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cast/standalone_receiver/sdl_video_player.cc b/cast/standalone_receiver/sdl_video_player.cc index 999545de..a1b89177 100644 --- a/cast/standalone_receiver/sdl_video_player.cc +++ b/cast/standalone_receiver/sdl_video_player.cc @@ -8,6 +8,7 @@ #include <utility> #include "cast/standalone_receiver/avcodec_glue.h" +#include "util/enum_name_table.h" #include "util/osp_logging.h" #include "util/trace_logging.h" @@ -18,6 +19,13 @@ namespace { constexpr char kVideoMediaType[] = "video"; } // namespace +constexpr EnumNameTable<VideoCodec, 6> kFfmpegCodecDescriptors{ + {{"h264", VideoCodec::kH264}, + {"vp8", VideoCodec::kVp8}, + {"hevc", VideoCodec::kHevc}, + {"vp9", VideoCodec::kVp9}, + {"libaom-av1", VideoCodec::kAv1}}}; + SDLVideoPlayer::SDLVideoPlayer(ClockNowFunctionPtr now_function, TaskRunner* task_runner, Receiver* receiver, @@ -27,7 +35,7 @@ SDLVideoPlayer::SDLVideoPlayer(ClockNowFunctionPtr now_function, : SDLPlayerBase(now_function, task_runner, receiver, - CodecToString(codec), + GetEnumName(kFfmpegCodecDescriptors, codec).value(), std::move(error_callback), kVideoMediaType), renderer_(renderer) { |