<html dir="ltr"><head></head><body style="text-align:left; direction:ltr;"><div>On Thu, 2019-01-17 at 08:45 +0100, Steve Lhomme wrote:</div><blockquote type="cite" style="margin:0 0 0 .8ex; border-left:2px #729fcf solid;padding-left:1ex"><pre>Merged, thanks.</pre><pre><br></pre></blockquote><pre><br></pre><pre>Doesn't seem like it was merged.</pre><pre><br></pre><blockquote type="cite" style="margin:0 0 0 .8ex; border-left:2px #729fcf solid;padding-left:1ex"><pre>On 17/01/2019 05:53, Shaleen Jain wrote:</pre><blockquote type="cite" style="margin:0 0 0 .8ex; border-left:2px #729fcf solid;padding-left:1ex"><pre>Before commit ec61edc0d0292ab37bb1dbafb23a8aed49e966bb</pre><pre>chromecast depended on vlc_sout_renderer_GetVcodecOption</pre><pre>to signal the codec selected to transcode to.</pre><pre>Achieve that by introducing an output parameter</pre><pre>where the codec used is written.</pre><pre><br></pre><pre>---</pre><pre> modules/stream_out/chromecast/cast.cpp | 1 +</pre><pre> modules/stream_out/dlna/dlna.cpp | 1 +</pre><pre> modules/stream_out/renderer_common.cpp | 8 +++++---</pre><pre> modules/stream_out/renderer_common.hpp | 3 ++-</pre><pre> 4 files changed, 9 insertions(+), 4 deletions(-)</pre><pre><br></pre><pre>diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp</pre><pre>index fbcd33ac0e..8e34a994c3 100644</pre><pre>--- a/modules/stream_out/chromecast/cast.cpp</pre><pre>+++ b/modules/stream_out/chromecast/cast.cpp</pre><pre>@@ -1057,6 +1057,7 @@ bool sout_stream_sys_t::UpdateOutput( sout_stream_t *p_stream )</pre><pre> try {</pre><pre> ssout << vlc_sout_renderer_GetVcodecOption( p_stream,</pre><pre> { VLC_CODEC_H264, VLC_CODEC_VP8 },</pre><pre>+ &i_codec_video,</pre><pre> &p_original_video->video, i_quality );</pre><pre> new_transcoding_state |= TRANSCODING_VIDEO;</pre><pre> } catch(const std::exception& e) {</pre><pre>diff --git a/modules/stream_out/dlna/dlna.cpp b/modules/stream_out/dlna/dlna.cpp</pre><pre>index 8716911b0c..da966442f5 100644</pre><pre>--- a/modules/stream_out/dlna/dlna.cpp</pre><pre>+++ b/modules/stream_out/dlna/dlna.cpp</pre><pre>@@ -439,6 +439,7 @@ int sout_stream_sys_t::UpdateOutput( sout_stream_t *p_stream )</pre><pre> try {</pre><pre> ssout << vlc_sout_renderer_GetVcodecOption( p_stream,</pre><pre> { i_codec_video },</pre><pre>+ &i_codec_video,</pre><pre> &p_original_video->video, i_quality );</pre><pre> } catch(const std::exception& e) {</pre><pre> return VLC_EGENERIC ;</pre><pre>diff --git a/modules/stream_out/renderer_common.cpp b/modules/stream_out/renderer_common.cpp</pre><pre>index 1555d7bb46..77b6c8c747 100644</pre><pre>--- a/modules/stream_out/renderer_common.cpp</pre><pre>+++ b/modules/stream_out/renderer_common.cpp</pre><pre>@@ -81,7 +81,7 @@ std::map<vlc_fourcc_t, std::vector<venc_options>> opts = {</pre><pre> </pre><pre> std::string</pre><pre> GetVencOption( sout_stream_t *p_stream, std::vector<vlc_fourcc_t> codecs,</pre><pre>- const video_format_t *p_vid, int i_quality )</pre><pre>+ vlc_fourcc_t *out_codec, const video_format_t *p_vid, int i_quality )</pre><pre> {</pre><pre> for (vlc_fourcc_t codec : codecs) {</pre><pre> auto opt = opts.find(codec);</pre><pre>@@ -131,6 +131,7 @@ GetVencOption( sout_stream_t *p_stream, std::vector<vlc_fourcc_t> codecs,</pre><pre> if( success )</pre><pre> {</pre><pre> msg_Dbg( p_stream, "Converting video to %.4s", (const char*)&codec );</pre><pre>+ *out_codec = codec;</pre><pre> return ssvenc.str();</pre><pre> }</pre><pre> }</pre><pre>@@ -142,13 +143,14 @@ GetVencOption( sout_stream_t *p_stream, std::vector<vlc_fourcc_t> codecs,</pre><pre> </pre><pre> std::string</pre><pre> vlc_sout_renderer_GetVcodecOption(sout_stream_t *p_stream,</pre><pre>- std::vector<vlc_fourcc_t> codecs, const video_format_t *p_vid, int i_quality)</pre><pre>+ std::vector<vlc_fourcc_t> codecs,</pre><pre>+ vlc_fourcc_t *out_codec, const video_format_t *p_vid, int i_quality)</pre><pre> {</pre><pre> std::stringstream ssout;</pre><pre> static const char video_maxres_hd[] = "maxwidth=1920,maxheight=1080";</pre><pre> static const char video_maxres_720p[] = "maxwidth=1280,maxheight=720";</pre><pre> </pre><pre>- ssout << GetVencOption( p_stream, codecs, p_vid, i_quality );</pre><pre>+ ssout << GetVencOption( p_stream, codecs, out_codec, p_vid, i_quality );</pre><pre> </pre><pre> switch ( i_quality )</pre><pre> {</pre><pre>diff --git a/modules/stream_out/renderer_common.hpp b/modules/stream_out/renderer_common.hpp</pre><pre>index 808aa76ffb..46d09716b4 100644</pre><pre>--- a/modules/stream_out/renderer_common.hpp</pre><pre>+++ b/modules/stream_out/renderer_common.hpp</pre><pre>@@ -80,6 +80,7 @@ static const int conversion_quality_list[] = {</pre><pre> </pre><pre> std::string</pre><pre> vlc_sout_renderer_GetVcodecOption(sout_stream_t *p_stream,</pre><pre>- std::vector<vlc_fourcc_t> codecs, const video_format_t *p_vid, int i_quality);</pre><pre>+ std::vector<vlc_fourcc_t> codecs,</pre><pre>+ vlc_fourcc_t *out_codec, const video_format_t *p_vid, int i_quality);</pre><pre> </pre><pre> #endif /* RENDERER_COMMON_H */</pre><pre>-- </pre><pre>2.20.1</pre><pre>_______________________________________________</pre><pre>vlc-devel mailing list</pre><pre>To unsubscribe or modify your subscription options:</pre><a href="https://mailman.videolan.org/listinfo/vlc-devel"><pre>https://mailman.videolan.org/listinfo/vlc-devel</pre></a><pre><br></pre></blockquote><pre><br></pre><pre>_______________________________________________</pre><pre>vlc-devel mailing list</pre><pre>To unsubscribe or modify your subscription options:</pre><a href="https://mailman.videolan.org/listinfo/vlc-devel"><pre>https://mailman.videolan.org/listinfo/vlc-devel</pre></a></blockquote><div><span><pre>-- <br></pre><div style="width: 71ch;">Regards,</div><div style="width: 71ch;">Shaleen Jain</div></span></div></body></html>