From f6c90903dd65e65e997b1fa39638ff8bb72af15a Mon Sep 17 00:00:00 2001 From: "mark a. foltz" Date: Mon, 23 Dec 2019 20:30:41 +0000 Subject: Revert "Replace namespace cast::something with openscreen::cast." This reverts commit 80ed3d779e3e38de94656bf59ff4b62534c797fe. Reason for revert: Broke chromium bots Original change's description: > Replace namespace cast::something with openscreen::cast. > > ...and fixed a few C++ style issues around use of rvals in files > touched. > > Bug: openscreen:90 > Change-Id: Ib14fb1c47dfafec1fefe0cad31bce764aae0272e > Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1959204 > Commit-Queue: Yuri Wiitala > Reviewed-by: Jordan Bayles TBR=miu@chromium.org,jophba@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: openscreen:90 Change-Id: Ia67dd400b6ffcf98ec64d460855ebd8c3b8dc3de Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1980852 Reviewed-by: mark a. foltz Commit-Queue: mark a. foltz --- cast/standalone_receiver/decoder.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cast/standalone_receiver/decoder.h') diff --git a/cast/standalone_receiver/decoder.h b/cast/standalone_receiver/decoder.h index fef420cf..08d61e43 100644 --- a/cast/standalone_receiver/decoder.h +++ b/cast/standalone_receiver/decoder.h @@ -14,8 +14,8 @@ #include "cast/standalone_receiver/avcodec_glue.h" #include "cast/streaming/frame_id.h" -namespace openscreen { namespace cast { +namespace streaming { // Wraps libavcodec to auto-detect and decode audio or video. class Decoder { @@ -70,8 +70,8 @@ class Decoder { // of the FFMPEG decoder. FrameId DidReceiveFrameFromDecoder(); - // Called when any transient or fatal error occurs, generating an Error and - // notifying the Client of it. + // Called when any transient or fatal error occurs, generating an + // openscreen::Error and notifying the Client of it. void OnError(const char* what, int av_errnum, FrameId frame_id); // Auto-detects the codec needed to decode the data in |buffer|. @@ -90,7 +90,7 @@ class Decoder { std::vector frames_decoding_; }; +} // namespace streaming } // namespace cast -} // namespace openscreen #endif // CAST_STANDALONE_RECEIVER_DECODER_H_ -- cgit v1.2.3