Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (6)
......@@ -209,13 +209,11 @@ void VLCMenuBar::FileMenu(qt_intf_t *p_intf, QMenu *menu)
addDPStaticEntry( menu, qfut( I_PL_SAVE ), "", &DialogsProvider::savePlayingToPlaylist,
"Ctrl+Y" );
#ifdef ENABLE_SOUT
addDPStaticEntry( menu, qtr( "Conve&rt / Save..." ), "",
&DialogsProvider::openAndTranscodingDialogs, "Ctrl+R" );
addDPStaticEntry( menu, qtr( "&Stream..." ),
":/menu/stream.svg", &DialogsProvider::openAndStreamingDialogs, "Ctrl+S" );
menu->addSeparator();
#endif
action = addMPLStaticEntry( p_intf, menu, qtr( "Quit at the end of playlist" ), "",
&PlaylistControllerModel::playAndExitChanged );
......
......@@ -538,14 +538,12 @@ endif
endif
endif
if ENABLE_SOUT
libvlccore_la_SOURCES += \
stream_output/sap.c \
stream_output/stream_output.c stream_output/stream_output.h
if ENABLE_VLM
libvlccore_la_SOURCES += input/vlm.c input/vlm_event.c input/vlmshell.c
endif
endif
if UPDATE_CHECK
libvlccore_la_SOURCES += \
......
......@@ -1038,8 +1038,6 @@ static inline void DecoderUpdatePreroll( vlc_tick_t *pi_preroll, const vlc_frame
*pi_preroll = __MIN( *pi_preroll, p->i_pts );
}
#ifdef ENABLE_SOUT
static void DecoderSendSubstream(vlc_input_decoder_t *p_owner)
{
decoder_t *p_dec = &p_owner->dec;
......@@ -1153,7 +1151,6 @@ static void DecoderThread_ProcessSout( vlc_input_decoder_t *p_owner, vlc_frame_t
}
}
}
#endif
static void DecoderPlayCc( vlc_input_decoder_t *p_owner, vlc_frame_t *p_cc,
const decoder_cc_desc_t *p_desc )
......@@ -1600,13 +1597,11 @@ static void DecoderThread_ProcessInput( vlc_input_decoder_t *p_owner, vlc_frame_
}
}
#ifdef ENABLE_SOUT
if( p_owner->p_sout != NULL )
{
DecoderThread_ProcessSout( p_owner, frame );
return;
}
#endif
if( packetize )
{
vlc_frame_t *packetized_frame;
......@@ -2024,14 +2019,12 @@ static void DeleteDecoder( vlc_input_decoder_t *p_owner, enum es_format_category
block_FifoEmpty( p_owner->p_fifo );
/* Cleanup */
#ifdef ENABLE_SOUT
if( p_owner->p_sout_input )
{
sout_InputDelete( p_owner->p_sout, p_owner->p_sout_input );
if( p_owner->cc.p_sout_input )
sout_InputDelete( p_owner->p_sout, p_owner->cc.p_sout_input );
}
#endif
switch( i_cat )
{
......@@ -2140,7 +2133,6 @@ decoder_New( vlc_object_t *p_parent, const struct vlc_input_decoder_cfg *cfg )
assert( p_dec->fmt_in->i_cat != UNKNOWN_ES );
#ifdef ENABLE_SOUT
/* Do not delay sout creation for SPU or DATA. */
if( cfg->sout && cfg->fmt->b_packetized &&
(cfg->fmt->i_cat != VIDEO_ES && cfg->fmt->i_cat != AUDIO_ES) )
......@@ -2153,7 +2145,6 @@ decoder_New( vlc_object_t *p_parent, const struct vlc_input_decoder_cfg *cfg )
p_owner->error = true;
}
}
#endif
if( !vlc_input_decoder_IsSynchronous( p_owner ) )
{
......@@ -2294,12 +2285,9 @@ bool vlc_input_decoder_IsEmpty( vlc_input_decoder_t * p_owner )
bool b_empty;
#ifdef ENABLE_SOUT
if( p_owner->p_sout_input != NULL )
b_empty = true;
else
#endif
if( p_owner->fmt.i_cat == VIDEO_ES && p_owner->p_vout != NULL )
else if( p_owner->fmt.i_cat == VIDEO_ES && p_owner->p_vout != NULL )
b_empty = vout_IsEmpty( p_owner->p_vout );
else if( p_owner->fmt.i_cat == AUDIO_ES && p_owner->p_astream != NULL )
b_empty = vlc_aout_stream_IsDrained( p_owner->p_astream );
......@@ -2361,9 +2349,7 @@ void vlc_input_decoder_Flush( vlc_input_decoder_t *p_owner )
if ( p_owner->p_sout_input != NULL )
{
#ifdef ENABLE_SOUT
sout_InputFlush( p_owner->p_sout, p_owner->p_sout_input );
#endif
}
else if( cat == AUDIO_ES )
{
......@@ -2739,11 +2725,9 @@ int vlc_input_decoder_SetSpuHighlight( vlc_input_decoder_t *p_owner,
{
assert( p_owner->dec.fmt_in->i_cat == SPU_ES );
#ifdef ENABLE_SOUT
if( p_owner->p_sout_input )
sout_InputControl( p_owner->p_sout, p_owner->p_sout_input,
SOUT_INPUT_SET_SPU_HIGHLIGHT, spu_hl );
#endif
vlc_fifo_Lock(p_owner->p_fifo);
if( !p_owner->p_vout )
......
......@@ -800,9 +800,7 @@ static int EsOutSetRecord( es_out_t *out, bool b_record, const char *dir_path )
if( !psz_sout )
return VLC_EGENERIC;
#ifdef ENABLE_SOUT
p_sys->p_sout_record = sout_NewInstance( p_input, psz_sout );
#endif
free( psz_sout );
if( !p_sys->p_sout_record )
......@@ -841,9 +839,7 @@ static int EsOutSetRecord( es_out_t *out, bool b_record, const char *dir_path )
vlc_input_decoder_Delete( p_es->p_dec_record );
p_es->p_dec_record = NULL;
}
#ifdef ENABLE_SOUT
sout_StreamChainDelete( p_sys->p_sout_record, NULL );
#endif
p_sys->p_sout_record = NULL;
}
......@@ -2957,7 +2953,6 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
return VLC_SUCCESS;
}
#ifdef ENABLE_SOUT
/* Check for sout mode */
if( input_priv(p_input)->p_sout )
{
......@@ -2969,7 +2964,6 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
input_priv(p_input)->b_out_pace_control = async;
}
}
#endif
/* Decode */
if( es->p_dec_record )
......@@ -3365,12 +3359,10 @@ static int EsOutVaControlLocked( es_out_t *out, input_source_t *source,
}
input_thread_private_t *priv = input_priv(p_sys->p_input);
#ifdef ENABLE_SOUT
if ( priv->p_sout != NULL )
{
sout_StreamSetPCR( priv->p_sout, i_pcr );
}
#endif
/* TODO do not use vlc_tick_now() but proper stream acquisition date */
const bool b_low_delay = priv->b_low_delay;
bool b_extra_buffering_allowed = !b_low_delay && EsOutIsExtraBufferingAllowed( out );
......
......@@ -739,7 +739,6 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
}
}
#ifdef ENABLE_SOUT
static int InitSout( input_thread_t * p_input )
{
input_thread_private_t *priv = input_priv(p_input);
......@@ -782,7 +781,6 @@ static int InitSout( input_thread_t * p_input )
return VLC_SUCCESS;
}
#endif
static void InitProperties( input_thread_t *input )
{
......@@ -805,13 +803,6 @@ static void InitProperties( input_thread_t *input )
if( !master->b_rescale_ts && !master->b_can_pace_control && master->b_can_rate_control )
capabilities |= VLC_INPUT_CAPABILITIES_REWINDABLE;
#ifdef ENABLE_SOUT
capabilities |= VLC_INPUT_CAPABILITIES_RECORDABLE;
#else
if( master->b_can_stream_record )
capabilities |= VLC_INPUT_CAPABILITIES_RECORDABLE;
#endif
input_SendEventCapabilities( input, capabilities );
int i_attachment;
......@@ -1275,10 +1266,8 @@ static int Init( input_thread_t * p_input )
var_SetBool( p_input, "sub-autodetect-file", false );
}
#ifdef ENABLE_SOUT
if( InitSout( p_input ) )
goto error;
#endif
/* Create es out */
priv->p_es_out = input_EsOutTimeshiftNew( p_input, priv->p_es_out_display, priv->rate );
......@@ -1327,14 +1316,12 @@ static int Init( input_thread_t * p_input )
}
}
#ifdef ENABLE_SOUT
if( priv->type != INPUT_TYPE_PREPARSING && priv->p_sout )
{
priv->b_out_pace_control = sout_StreamIsSynchronous(priv->p_sout);
msg_Dbg( p_input, "starting in %ssync mode",
priv->b_out_pace_control ? "a" : "" );
}
#endif
if (!input_item_IsPreparsed(input_priv(p_input)->p_item))
{
......@@ -1814,7 +1801,6 @@ static void ControlNav( input_thread_t *p_input, int i_type )
}
}
#ifdef ENABLE_SOUT
static void ControlUpdateRenderer( input_thread_t *p_input, bool b_enable )
{
if( b_enable )
......@@ -1843,8 +1829,6 @@ static void ControlInsertDemuxFilter( input_thread_t* p_input, const char* psz_d
msg_Dbg(p_input, "Failed to create demux filter %s", psz_demux_chain);
}
#endif // ENABLE_SOUT
void input_SetProgramId(input_thread_t *input, int group_id)
{
......@@ -2365,7 +2349,6 @@ static bool Control( input_thread_t *p_input,
case INPUT_CONTROL_SET_RENDERER:
{
#ifdef ENABLE_SOUT
vlc_renderer_item_t *p_item = param.val.p_address;
input_thread_private_t *p_priv = input_priv( p_input );
// We do not support switching from a renderer to another for now
......@@ -2396,7 +2379,6 @@ static bool Control( input_thread_t *p_input,
}
}
es_out_StartAllEs( priv->p_es_out_display, context );
#endif
break;
}
case INPUT_CONTROL_SET_VBI_PAGE:
......@@ -2805,10 +2787,8 @@ static int InputSourceInit( input_source_t *in, input_thread_t *p_input,
/* Set record capabilities */
if( demux_Control( in->p_demux, DEMUX_CAN_RECORD, &in->b_can_stream_record ) )
in->b_can_stream_record = false;
#ifdef ENABLE_SOUT
if( !var_GetBool( p_input, "input-record-native" ) )
in->b_can_stream_record = false;
#endif
demux_Control( in->p_demux, DEMUX_CAN_PAUSE, &in->b_can_pause );
......
......@@ -155,7 +155,6 @@ typedef enum input_event_type_e
#define VLC_INPUT_CAPABILITIES_PAUSEABLE (1<<1)
#define VLC_INPUT_CAPABILITIES_CHANGE_RATE (1<<2)
#define VLC_INPUT_CAPABILITIES_REWINDABLE (1<<3)
#define VLC_INPUT_CAPABILITIES_RECORDABLE (1<<4)
struct vlc_input_event_state
{
......
......@@ -135,14 +135,12 @@ vout_resource_Remove(struct vout_resource *vout_rsc)
/* */
static void DestroySout( input_resource_t *p_resource )
{
#ifdef ENABLE_SOUT
if( p_resource->p_sout )
{
msg_Dbg( p_resource->p_parent, "destroying stream output" );
sout_StreamChainDelete( p_resource->p_sout, NULL );
free(p_resource->psz_sout);
}
#endif
p_resource->p_sout = NULL;
}
......@@ -595,7 +593,6 @@ sout_stream_t *input_resource_RequestSout( input_resource_t *p_resource, const c
assert(psz_sout != NULL);
vlc_mutex_lock( &p_resource->lock );
#ifdef ENABLE_SOUT
/* Check the validity of the sout */
if (p_resource->p_sout != NULL
&& strcmp(p_resource->psz_sout, psz_sout) != 0)
......@@ -624,9 +621,6 @@ sout_stream_t *input_resource_RequestSout( input_resource_t *p_resource, const c
free(p_resource->psz_sout);
}
}
#else
sout = NULL;
#endif
vlc_mutex_unlock( &p_resource->lock );
return sout;
}
......
......@@ -37,134 +37,6 @@
#include <vlc_common.h>
#include <assert.h>
#ifndef ENABLE_SOUT
# include <vlc_sout.h>
_Noreturn int sout_AccessOutControl(sout_access_out_t *out, int query, ...)
{
VLC_UNUSED (out); VLC_UNUSED (query);
vlc_assert_unreachable ();
}
_Noreturn void sout_AccessOutDelete(sout_access_out_t *out)
{
VLC_UNUSED (out);
vlc_assert_unreachable ();
}
#undef sout_AccessOutNew
sout_access_out_t *sout_AccessOutNew (vlc_object_t *obj,
const char *access, const char *name)
{
VLC_UNUSED (access); VLC_UNUSED (name);
msg_Err (obj, "Output support not compiled-in!");
return NULL;
}
_Noreturn ssize_t sout_AccessOutRead(sout_access_out_t *out, block_t *block)
{
VLC_UNUSED (out); VLC_UNUSED (block);
vlc_assert_unreachable ();
}
_Noreturn int sout_AccessOutSeek(sout_access_out_t *out, uint64_t offset)
{
VLC_UNUSED (out); VLC_UNUSED (offset);
vlc_assert_unreachable ();
}
_Noreturn ssize_t sout_AccessOutWrite(sout_access_out_t *out, block_t *block)
{
VLC_UNUSED (out); VLC_UNUSED (block);
vlc_assert_unreachable ();
}
#undef sout_AnnounceRegisterSDP
session_descriptor_t *sout_AnnounceRegisterSDP (vlc_object_t *obj,
const char *sdp,
const char *dst)
{
VLC_UNUSED (sdp); VLC_UNUSED (dst);
msg_Err (obj, "SDP export not compiled-in!");
return NULL;
}
#undef sout_AnnounceUnRegister
_Noreturn void sout_AnnounceUnRegister(vlc_object_t *obj,
session_descriptor_t *d)
{
VLC_UNUSED (obj); VLC_UNUSED (d);
vlc_assert_unreachable ();
}
#undef sout_EncoderCreate
encoder_t *sout_EncoderCreate( vlc_object_t *p_this, size_t owner_size )
{
(void)owner_size;
msg_Err (p_this, "Encoding support not compiled-in!");
return NULL;
}
_Noreturn sout_input_t *sout_MuxAddStream(sout_mux_t *mux,
const es_format_t *fmt)
{
VLC_UNUSED (mux); VLC_UNUSED (fmt);
vlc_assert_unreachable ();
}
_Noreturn void sout_MuxDelete(sout_mux_t *mux)
{
VLC_UNUSED (mux);
vlc_assert_unreachable ();
}
_Noreturn void sout_MuxDeleteStream(sout_mux_t *mux, sout_input_t *input)
{
VLC_UNUSED (mux); VLC_UNUSED (input);
vlc_assert_unreachable ();
}
_Noreturn int sout_MuxGetStream(sout_mux_t *mux, unsigned n, vlc_tick_t *date)
{
(void) mux; (void) n; (void) date;
vlc_assert_unreachable ();
}
_Noreturn sout_mux_t *sout_MuxNew(sout_access_out_t *out, const char *mux)
{
VLC_UNUSED(out); VLC_UNUSED(mux);
vlc_assert_unreachable ();
}
_Noreturn int sout_MuxSendBuffer(sout_mux_t *mux, sout_input_t *input,
block_t *block)
{
VLC_UNUSED (mux); VLC_UNUSED (input); VLC_UNUSED (block);
vlc_assert_unreachable ();
}
_Noreturn void sout_MuxFlush(sout_mux_t *mux, sout_input_t *input)
{
VLC_UNUSED (mux); VLC_UNUSED (input);
vlc_assert_unreachable ();
}
_Noreturn void sout_StreamChainDelete(sout_stream_t *first,
sout_stream_t *end)
{
(void) first; (void) end;
vlc_assert_unreachable ();
}
_Noreturn sout_stream_t *sout_StreamChainNew(vlc_object_t *sout,
const char *chain,
sout_stream_t *next)
{
(void) sout; (void) chain; (void) next;
vlc_assert_unreachable ();
}
#endif /* !ENABLE_SOUT */
#ifndef ENABLE_VLM
# include <vlc_vlm.h>
......
......@@ -51,18 +51,16 @@ check_PROGRAMS = \
test_modules_demux_timestamps_filter \
test_modules_demux_ts_pes \
test_modules_playlist_m3u \
test_modules_stream_out_pcr_sync \
test_modules_tls \
test_modules_stream_out_transcode \
$(NULL)
if HAVE_DARWIN
check_PROGRAMS += test_src_misc_image_cvpx
endif
if ENABLE_SOUT
check_PROGRAMS += test_modules_tls \
test_modules_stream_out_transcode \
test_modules_stream_out_pcr_sync
endif
if UPDATE_CHECK
check_PROGRAMS += test_src_crypto_update
endif
......
......@@ -403,6 +403,10 @@ VLC_EXPORT const vlc_plugin_cb vlc_static_modules[] = {
int main( int argc, char **argv )
{
(void)argc; (void)argv;
#ifndef ENABLE_SOUT
(void) libvlc_playlist_play;
return 77;
#endif
test_init();
const char * const args[] = {
......