From a47ae560030a9ba3aef808152d89a60466857dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Mon, 17 Jul 2017 15:55:29 +0200 Subject: [PATCH] chromecast: Invert a condition to reduce indentation --- modules/stream_out/chromecast/cast.cpp | 156 ++++++++++++------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp index 598645c450..cf47237a4c 100644 --- a/modules/stream_out/chromecast/cast.cpp +++ b/modules/stream_out/chromecast/cast.cpp @@ -247,100 +247,100 @@ void sout_stream_sys_t::UpdateOutput( sout_stream_t *p_stream ) { assert( p_stream->p_sys == this ); - if ( es_changed ) - { - es_changed = false; + if ( !es_changed ) + return; - bool canRemux = true; - vlc_fourcc_t i_codec_video = 0, i_codec_audio = 0; + es_changed = false; - for (std::vector::iterator it = streams.begin(); it != streams.end(); ++it) + bool canRemux = true; + vlc_fourcc_t i_codec_video = 0, i_codec_audio = 0; + + for (std::vector::iterator it = streams.begin(); it != streams.end(); ++it) + { + const es_format_t *p_es = &(*it)->fmt; + if (p_es->i_cat == AUDIO_ES) { - const es_format_t *p_es = &(*it)->fmt; - if (p_es->i_cat == AUDIO_ES) + if (!canDecodeAudio( p_es->i_codec )) { - if (!canDecodeAudio( p_es->i_codec )) - { - msg_Dbg( p_stream, "can't remux audio track %d codec %4.4s", p_es->i_id, (const char*)&p_es->i_codec ); - canRemux = false; - } - else if (i_codec_audio == 0) - i_codec_audio = p_es->i_codec; - } - else if (b_supports_video && p_es->i_cat == VIDEO_ES) - { - if (!canDecodeVideo( p_es->i_codec )) - { - msg_Dbg( p_stream, "can't remux video track %d codec %4.4s", p_es->i_id, (const char*)&p_es->i_codec ); - canRemux = false; - } - else if (i_codec_video == 0) - i_codec_video = p_es->i_codec; + msg_Dbg( p_stream, "can't remux audio track %d codec %4.4s", p_es->i_id, (const char*)&p_es->i_codec ); + canRemux = false; } + else if (i_codec_audio == 0) + i_codec_audio = p_es->i_codec; } - - std::stringstream ssout; - if ( !canRemux ) + else if (b_supports_video && p_es->i_cat == VIDEO_ES) { - /* TODO: provide audio samplerate and channels */ - ssout << "transcode{"; - char s_fourcc[5]; - if ( i_codec_audio == 0 ) + if (!canDecodeVideo( p_es->i_codec )) { - i_codec_audio = DEFAULT_TRANSCODE_AUDIO; - msg_Dbg( p_stream, "Converting audio to %.4s", (const char*)&i_codec_audio ); - ssout << "acodec="; - vlc_fourcc_to_char( i_codec_audio, s_fourcc ); - s_fourcc[4] = '\0'; - ssout << s_fourcc << ','; + msg_Dbg( p_stream, "can't remux video track %d codec %4.4s", p_es->i_id, (const char*)&p_es->i_codec ); + canRemux = false; } - if ( b_supports_video && i_codec_video == 0 ) - { - i_codec_video = DEFAULT_TRANSCODE_VIDEO; - msg_Dbg( p_stream, "Converting video to %.4s", (const char*)&i_codec_video ); - /* TODO: provide maxwidth,maxheight */ - ssout << "vcodec="; - vlc_fourcc_to_char( i_codec_video, s_fourcc ); - s_fourcc[4] = '\0'; - ssout << s_fourcc; - } - ssout << "}:"; + else if (i_codec_video == 0) + i_codec_video = p_es->i_codec; } - std::string mime; - if ( !b_supports_video && default_muxer == DEFAULT_MUXER ) - mime = "audio/x-matroska"; - else if ( i_codec_audio == VLC_CODEC_VORBIS && - i_codec_video == VLC_CODEC_VP8 && - default_muxer == DEFAULT_MUXER ) - mime = "video/webm"; - else - mime = default_mime; - - ssout << "http{dst=:" << i_port << "/stream" - << ",mux=" << default_muxer - << ",access=http{mime=" << mime << "}}"; + } - if ( sout != ssout.str() ) + std::stringstream ssout; + if ( !canRemux ) + { + /* TODO: provide audio samplerate and channels */ + ssout << "transcode{"; + char s_fourcc[5]; + if ( i_codec_audio == 0 ) { - sout = ssout.str(); - - if ( startSoutChain( p_stream ) ) - { - /* tell the chromecast to load the content */ - p_intf->setHasInput( mime ); - } - else - { - p_intf->requestPlayerStop(); + i_codec_audio = DEFAULT_TRANSCODE_AUDIO; + msg_Dbg( p_stream, "Converting audio to %.4s", (const char*)&i_codec_audio ); + ssout << "acodec="; + vlc_fourcc_to_char( i_codec_audio, s_fourcc ); + s_fourcc[4] = '\0'; + ssout << s_fourcc << ','; + } + if ( b_supports_video && i_codec_video == 0 ) + { + i_codec_video = DEFAULT_TRANSCODE_VIDEO; + msg_Dbg( p_stream, "Converting video to %.4s", (const char*)&i_codec_video ); + /* TODO: provide maxwidth,maxheight */ + ssout << "vcodec="; + vlc_fourcc_to_char( i_codec_video, s_fourcc ); + s_fourcc[4] = '\0'; + ssout << s_fourcc; + } + ssout << "}:"; + } + std::string mime; + if ( !b_supports_video && default_muxer == DEFAULT_MUXER ) + mime = "audio/x-matroska"; + else if ( i_codec_audio == VLC_CODEC_VORBIS && + i_codec_video == VLC_CODEC_VP8 && + default_muxer == DEFAULT_MUXER ) + mime = "video/webm"; + else + mime = default_mime; + + ssout << "http{dst=:" << i_port << "/stream" + << ",mux=" << default_muxer + << ",access=http{mime=" << mime << "}}"; + + if ( sout != ssout.str() ) + { + sout = ssout.str(); - sout_StreamChainDelete( p_out, NULL ); - p_out = NULL; - sout = ""; - } + if ( startSoutChain( p_stream ) ) + { + /* tell the chromecast to load the content */ + p_intf->setHasInput( mime ); } else - msg_Dbg( p_stream, "Stream change doesn't require a new sout chain" ); + { + p_intf->requestPlayerStop(); + + sout_StreamChainDelete( p_out, NULL ); + p_out = NULL; + sout = ""; + } } + else + msg_Dbg( p_stream, "Stream change doesn't require a new sout chain" ); } sout_stream_id_sys_t *sout_stream_sys_t::GetSubId( sout_stream_t *p_stream,