[vlc-commits] chromecast: keep the muxer and mime type requested
Steve Lhomme
git at videolan.org
Fri Mar 25 09:06:42 CET 2016
vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Mon Mar 21 15:10:43 2016 +0100| [1f1576ddc5c38e25822dc0074115fb6cddac670d] | committer: Jean-Baptiste Kempf
chromecast: keep the muxer and mime type requested
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1f1576ddc5c38e25822dc0074115fb6cddac670d
---
modules/stream_out/chromecast/chromecast.h | 3 +++
modules/stream_out/chromecast/chromecast_ctrl.cpp | 11 +++++++++++
2 files changed, 14 insertions(+)
diff --git a/modules/stream_out/chromecast/chromecast.h b/modules/stream_out/chromecast/chromecast.h
index de7c466..5b0e947 100644
--- a/modules/stream_out/chromecast/chromecast.h
+++ b/modules/stream_out/chromecast/chromecast.h
@@ -66,6 +66,9 @@ struct intf_sys_t
vlc_object_t * const p_module;
std::string serverIP;
+ std::string mime;
+ std::string muxer;
+
std::string appTransportId;
std::string mediaSessionId;
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 89ae468..dc6d503 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -144,6 +144,17 @@ int Open(vlc_object_t *p_module)
msg_Err( p_module, "Bad muxer provided");
goto error;
}
+ p_sys->muxer = psz_mux;
+ free(psz_mux);
+
+ psz_mux = var_InheritString( p_module, CONTROL_CFG_PREFIX "mime");
+ if (psz_mux == NULL)
+ {
+ msg_Err( p_module, "Bad MIME type provided");
+ goto error;
+ }
+ p_sys->mime = psz_mux; /* TODO get the MIME type from the playlist/input ? */
+ free(psz_mux);
// Start the Chromecast event thread.
if (vlc_clone(&p_sys->chromecastThread, ChromecastThread, p_module,
More information about the vlc-commits
mailing list