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 (14)
......@@ -185,7 +185,7 @@ libvlc_media_discoverer_start( libvlc_media_discoverer_t * p_mdis )
};
/* Here we go */
p_mdis->p_sd = vlc_sd_Create( (vlc_object_t *)p_mdis->p_libvlc_instance->p_libvlc_int,
p_mdis->p_sd = vlc_sd_Create( VLC_OBJECT(p_mdis->p_libvlc_instance->p_libvlc_int),
p_mdis->name, &owner );
if( p_mdis->p_sd == NULL )
{
......
......@@ -876,7 +876,7 @@ static int Seek( stream_t *p_access, uint64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
int val = SeekCommon( (vlc_object_t *)p_access, p_sys, i_pos );
int val = SeekCommon( VLC_OBJECT(p_access), p_sys, i_pos );
if( val )
return val;
......@@ -888,7 +888,7 @@ static int Seek( stream_t *p_access, uint64_t i_pos )
#ifdef ENABLE_SOUT
static int OutSeek( sout_access_out_t *p_access, off_t i_pos )
{
return SeekCommon((vlc_object_t *)p_access, GET_OUT_SYS(p_access), i_pos);
return SeekCommon(VLC_OBJECT(p_access), GET_OUT_SYS(p_access), i_pos);
}
#endif
......
......@@ -513,7 +513,7 @@ static int MMSOpen( stream_t *p_access, vlc_url_t *p_url, int i_proto )
return VLC_EGENERIC;
}
p_sys->i_handle_udp = net_ListenUDP1( (vlc_object_t *)p_access, p_sys->sz_bind_addr,
p_sys->i_handle_udp = net_ListenUDP1( VLC_OBJECT(p_access), p_sys->sz_bind_addr,
7000 );
if( p_sys->i_handle_udp < 0 )
{
......
......@@ -278,7 +278,7 @@ static int Open(vlc_object_t *p_this)
goto failed;
}
if( !rist_add_peers((vlc_object_t *)p_access, p_sys->receiver_ctx, p_access->psz_url, 0, RIST_DEFAULT_VIRT_DST_PORT, i_recovery_length) )
if( !rist_add_peers(VLC_OBJECT(p_access), p_sys->receiver_ctx, p_access->psz_url, 0, RIST_DEFAULT_VIRT_DST_PORT, i_recovery_length) )
goto failed;
/* Start the rist protocol thread */
......
......@@ -286,7 +286,7 @@ static enum rtsp_result rtsp_handle(stream_t *access, bool *interrupted) {
/* Parse header */
while (!have_header) {
in = net_readln_timeout((vlc_object_t*)access, sys->tcp_sock, 5000,
in = net_readln_timeout(VLC_OBJECT(access), sys->tcp_sock, 5000,
interrupted);
if (in == NULL)
break;
......
......@@ -91,7 +91,7 @@ static int Control(stream_t *p_stream, int i_query, va_list args)
static bool srt_schedule_reconnect(stream_t *p_stream)
{
vlc_object_t *strm_obj = (vlc_object_t *) p_stream;
vlc_object_t *strm_obj = VLC_OBJECT(p_stream);
int i_latency=var_InheritInteger( p_stream, SRT_PARAM_LATENCY );
int stat;
char *psz_passphrase = var_InheritString( p_stream, SRT_PARAM_PASSPHRASE );
......
......@@ -189,7 +189,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC;
}
p_sys->i_max_packet_size = rist_get_max_packet_size((vlc_object_t *)p_access);
p_sys->i_max_packet_size = rist_get_max_packet_size(VLC_OBJECT(p_access));
int i_rist_profile = var_InheritInteger(p_access, RIST_CFG_PREFIX RIST_URL_PARAM_PROFILE);
int i_verbose_level = var_InheritInteger(p_access, RIST_CFG_PREFIX RIST_URL_PARAM_VERBOSE_LEVEL);
......@@ -224,7 +224,7 @@ static int Open( vlc_object_t *p_this )
int i_recovery_length = var_InheritInteger(p_access, RIST_CFG_PREFIX RIST_CFG_LATENCY);
p_sys->i_recovery_buffer = i_recovery_length;
if ( !rist_add_peers((vlc_object_t *)p_access, p_sys->sender_ctx, p_access->psz_path, i_multipeer_mode, p_sys->gre_dst_port + 1, i_recovery_length) )
if ( !rist_add_peers(VLC_OBJECT(p_access), p_sys->sender_ctx, p_access->psz_path, i_multipeer_mode, p_sys->gre_dst_port + 1, i_recovery_length) )
goto failed;
if (rist_start(p_sys->sender_ctx) == -1) {
......
......@@ -63,7 +63,7 @@ static void srt_wait_interrupted(void *p_data)
static bool srt_schedule_reconnect(sout_access_out_t *p_access)
{
vlc_object_t *access_obj = (vlc_object_t *) p_access;
vlc_object_t *access_obj = VLC_OBJECT(p_access);
int stat;
char *psz_dst_addr = NULL;
int i_dst_port;
......
......@@ -1724,7 +1724,7 @@ static OMX_ERRORTYPE OmxEventHandler( OMX_HANDLETYPE omx_handle,
unsigned int i;
(void)omx_handle;
PrintOmxEvent((vlc_object_t *) p_dec, event, data_1, data_2, event_data);
PrintOmxEvent(VLC_OBJECT(p_dec), event, data_1, data_2, event_data);
switch (event)
{
case OMX_EventError:
......
......@@ -97,7 +97,7 @@ static int AVI_ChunkReadCommon( stream_t *s, avi_chunk_t *p_chk,
}
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
msg_Dbg( s,
"found chunk, fourcc: %4.4s size:%"PRIu64" pos:%"PRIu64,
(char*)&p_chk->common.i_chunk_fourcc,
p_chk->common.i_chunk_size,
......@@ -153,12 +153,12 @@ static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container )
if( p_container->common.i_chunk_size > 0 && p_container->common.i_chunk_size < 4 )
{
/* empty box */
msg_Warn( (vlc_object_t*)s, "empty list chunk" );
msg_Warn( s, "empty list chunk" );
return VLC_EGENERIC;
}
if( vlc_stream_Peek( s, &p_peek, 12 ) < 12 )
{
msg_Warn( (vlc_object_t*)s, "unexpected end of file while reading list chunk" );
msg_Warn( s, "unexpected end of file while reading list chunk" );
return VLC_EGENERIC;
}
......@@ -178,22 +178,22 @@ static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container )
{
if( !b_seekable )
return VLC_SUCCESS;
msg_Dbg( (vlc_object_t*)s, "skipping movi chunk" );
msg_Dbg( s, "skipping movi chunk" );
return AVI_NextChunk( s, p_container ); /* points at beginning of LIST-movi if not seekable */
}
if( vlc_stream_Read( s, NULL, 12 ) != 12 )
{
msg_Warn( (vlc_object_t*)s, "cannot enter chunk" );
msg_Warn( s, "cannot enter chunk" );
return VLC_EGENERIC;
}
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
msg_Dbg( s,
"found LIST chunk: \'%4.4s\'",
(char*)&p_container->list.i_type );
#endif
msg_Dbg( (vlc_object_t*)s, "<list \'%4.4s\'>", (char*)&p_container->list.i_type );
msg_Dbg( s, "<list \'%4.4s\'>", (char*)&p_container->list.i_type );
union avi_chunk_u **pp_append = &p_container->common.p_first;
for( ; ; )
......@@ -235,7 +235,7 @@ static int AVI_ChunkRead_list( stream_t *s, avi_chunk_t *p_container )
}
}
msg_Dbg( (vlc_object_t*)s, "</list \'%4.4s\'>%x", (char*)&p_container->list.i_type, i_ret );
msg_Dbg( s, "</list \'%4.4s\'>%x", (char*)&p_container->list.i_type, i_ret );
if( i_ret == AVI_ZERO_FOURCC || i_ret == AVI_ZEROSIZED_CHUNK )
return AVI_GotoNextChunk( s, p_container );
......@@ -377,7 +377,7 @@ static int AVI_ChunkRead_avih( stream_t *s, avi_chunk_t *p_chk )
AVI_READ4BYTES( p_chk->avih.i_start );
AVI_READ4BYTES( p_chk->avih.i_length );
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
msg_Dbg( s,
"avih: streams:%d flags:%s%s%s%s %dx%d",
p_chk->avih.i_streams,
p_chk->avih.i_flags&AVIF_HASINDEX?" HAS_INDEX":"",
......@@ -406,7 +406,7 @@ static int AVI_ChunkRead_strh( stream_t *s, avi_chunk_t *p_chk )
AVI_READ4BYTES( p_chk->strh.i_quality );
AVI_READ4BYTES( p_chk->strh.i_samplesize );
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
msg_Dbg( s,
"strh: type:%4.4s handler:0x%8.8x samplesize:%d %.2ffps",
(char*)&p_chk->strh.i_type,
p_chk->strh.i_handler,
......@@ -425,12 +425,12 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
AVI_READCHUNK_ENTER;
if( p_chk->common.p_father == NULL )
{
msg_Err( (vlc_object_t*)s, "malformed avi file" );
msg_Err( s, "malformed avi file" );
AVI_READCHUNK_EXIT( VLC_EGENERIC );
}
if( !( p_strh = AVI_ChunkFind( p_chk->common.p_father, AVIFOURCC_strh, 0, false ) ) )
{
msg_Err( (vlc_object_t*)s, "malformed avi file" );
msg_Err( s, "malformed avi file" );
AVI_READCHUNK_EXIT( p_chk->common.i_chunk_size > 0 ? VLC_EGENERIC : AVI_ZEROSIZED_CHUNK );
}
......@@ -479,7 +479,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
p_chk->strf.auds.p_wf->cbSize );
}
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
msg_Dbg( s,
"strf: audio:0x%4.4x channels:%d %dHz %dbits/sample %dkbps",
p_chk->strf.auds.p_wf->wFormatTag,
p_chk->strf.auds.p_wf->nChannels,
......@@ -544,7 +544,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
}
else p_chk->strf.vids.p_bih->biClrUsed = 0;
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
msg_Dbg( s,
"strf: video:%4.4s %"PRIu32"x%"PRIu32" planes:%d %dbpp",
(char*)&p_chk->strf.vids.p_bih->biCompression,
(uint32_t)p_chk->strf.vids.p_bih->biWidth,
......@@ -562,7 +562,7 @@ static int AVI_ChunkRead_strf( stream_t *s, avi_chunk_t *p_chk )
p_chk->strf.common.i_cat = SPU_ES;
break;
default:
msg_Warn( (vlc_object_t*)s, "unknown stream type: %4.4s",
msg_Warn( s, "unknown stream type: %4.4s",
(char*)&p_strh->strh.i_type );
p_chk->strf.common.i_cat = UNKNOWN_ES;
break;
......@@ -586,7 +586,7 @@ static int AVI_ChunkRead_strd( stream_t *s, avi_chunk_t *p_chk )
{
if ( p_chk->common.i_chunk_size == 0 )
{
msg_Dbg( (vlc_object_t*)s, "Zero sized pre-JUNK section met" );
msg_Dbg( s, "Zero sized pre-JUNK section met" );
return AVI_ZEROSIZED_CHUNK;
}
......@@ -631,7 +631,7 @@ static int AVI_ChunkRead_idx1( stream_t *s, avi_chunk_t *p_chk )
p_chk->idx1.entry = NULL;
}
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s, "idx1: index entry:%d", i_count );
msg_Dbg( s, "idx1: index entry:%d", i_count );
#endif
AVI_READCHUNK_EXIT( VLC_SUCCESS );
}
......@@ -725,11 +725,11 @@ static int AVI_ChunkRead_indx( stream_t *s, avi_chunk_t *p_chk )
}
else
{
msg_Warn( (vlc_object_t*)s, "unknown type/subtype index" );
msg_Warn( s, "unknown type/subtype index" );
}
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s, "indx: type=%d subtype=%d entry=%d",
msg_Dbg( s, "indx: type=%d subtype=%d entry=%d",
p_indx->i_indextype, p_indx->i_indexsubtype, p_indx->i_entriesinuse );
#endif
AVI_READCHUNK_EXIT( i_ret );
......@@ -771,7 +771,7 @@ static int AVI_ChunkRead_vprp( stream_t *s, avi_chunk_t *p_chk )
}
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s, "vprp: format:%d standard:%d",
msg_Dbg( s, "vprp: format:%d standard:%d",
p_vprp->i_video_format_token, p_vprp->i_video_standard );
#endif
AVI_READCHUNK_EXIT( VLC_SUCCESS );
......@@ -786,7 +786,7 @@ static int AVI_ChunkRead_dmlh( stream_t *s, avi_chunk_t *p_chk )
AVI_READ4BYTES( p_dmlh->dwTotalFrames );
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s, "dmlh: dwTotalFrames %d",
msg_Dbg( s, "dmlh: dwTotalFrames %d",
p_dmlh->dwTotalFrames );
#endif
AVI_READCHUNK_EXIT( VLC_SUCCESS );
......@@ -876,7 +876,7 @@ static int AVI_ChunkRead_strz( stream_t *s, avi_chunk_t *p_chk )
p_strz->p_str[p_strz->i_chunk_size] = 0;
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s, "%4.4s: %s : %s",
msg_Dbg( s, "%4.4s: %s : %s",
(char*)&p_strz->i_chunk_fourcc, p_strz->p_type, p_strz->p_str);
#endif
AVI_READCHUNK_EXIT( VLC_SUCCESS );
......@@ -994,7 +994,7 @@ int AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
if( !p_chk )
{
msg_Warn( (vlc_object_t*)s, "cannot read null chunk" );
msg_Warn( s, "cannot read null chunk" );
return VLC_EGENERIC;
}
......@@ -1003,7 +1003,7 @@ int AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
if( p_chk->common.i_chunk_fourcc == VLC_FOURCC( 0, 0, 0, 0 ) )
{
msg_Warn( (vlc_object_t*)s, "found null fourcc chunk (corrupted file?)" );
msg_Warn( s, "found null fourcc chunk (corrupted file?)" );
return AVI_ZERO_FOURCC;
}
p_chk->common.p_father = p_father;
......@@ -1022,7 +1022,7 @@ int AVI_ChunkRead( stream_t *s, avi_chunk_t *p_chk, avi_chunk_t *p_father )
return AVI_ChunkRead_indx( s, p_chk );
}
msg_Warn( (vlc_object_t*)s, "unknown chunk: %4.4s (not loaded)",
msg_Warn( s, "unknown chunk: %4.4s (not loaded)",
(char*)&p_chk->common.i_chunk_fourcc );
return AVI_NextChunk( s, p_chk );
}
......@@ -1052,14 +1052,14 @@ void AVI_ChunkClean( stream_t *s,
if( AVI_Chunk_Function[i_index].AVI_ChunkFree_function )
{
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s, "free chunk %4.4s",
msg_Dbg( s, "free chunk %4.4s",
(char*)&p_chk->common.i_chunk_fourcc );
#endif
AVI_Chunk_Function[i_index].AVI_ChunkFree_function( p_chk);
}
else if( p_chk->common.i_chunk_fourcc != 0 )
{
msg_Warn( (vlc_object_t*)s, "unknown chunk: %4.4s (not unloaded)",
msg_Warn( s, "unknown chunk: %4.4s (not unloaded)",
(char*)&p_chk->common.i_chunk_fourcc );
}
p_chk->common.p_first = NULL;
......@@ -1163,7 +1163,7 @@ int AVI_ChunkReadRoot( stream_t *s, avi_chunk_t *p_root )
p_list->i_chunk_size = stream_Size( s );
AVI_ChunkDumpDebug_level( (vlc_object_t*)s, p_root, 0 );
AVI_ChunkDumpDebug_level( VLC_OBJECT(s), p_root, 0 );
return VLC_SUCCESS;
}
......
......@@ -454,21 +454,21 @@ static int Open( vlc_object_t *p_this )
if( p_sys->csa )
{
psz_csa2 = var_CreateGetStringCommand( p_demux, "ts-csa2-ck" );
i_res = csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_string, true );
i_res = csa_SetCW( VLC_OBJECT(p_demux), p_sys->csa, psz_string, true );
}
else
i_res = VLC_ENOMEM;
if( i_res == VLC_SUCCESS && psz_csa2 && *psz_csa2 )
{
if( csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_csa2, false ) != VLC_SUCCESS )
if( csa_SetCW( VLC_OBJECT(p_demux), p_sys->csa, psz_csa2, false ) != VLC_SUCCESS )
{
csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_string, false );
csa_SetCW( VLC_OBJECT(p_demux), p_sys->csa, psz_string, false );
}
}
else if ( i_res == VLC_SUCCESS )
{
csa_SetCW( (vlc_object_t*)p_demux, p_sys->csa, psz_string, false );
csa_SetCW( VLC_OBJECT(p_demux), p_sys->csa, psz_string, false );
}
else
{
......
......@@ -482,7 +482,7 @@ static const struct input_preparser_callbacks_t preparseCallbacks = {
- (void)parseInputItem
{
_p_parserID = input_item_Parse(_vlcInputItem,
(vlc_object_t *)getIntf(),
VLC_OBJECT(getIntf()),
&parserCallbacks,
(__bridge void *) self);
}
......
......@@ -248,7 +248,7 @@ static int RemoveAnnounce( services_discovery_t *p_sd,
static int InitSocket( services_discovery_t *p_sd, const char *psz_address,
int i_port )
{
int i_fd = net_ListenUDP1 ((vlc_object_t *)p_sd, psz_address, i_port);
int i_fd = net_ListenUDP1 (VLC_OBJECT(p_sd), psz_address, i_port);
if (i_fd == -1)
return VLC_EGENERIC;
......
......@@ -917,17 +917,16 @@ static void* download_thread( void* p )
}
static chunk_t* generate_new_chunk(
vlc_object_t* p_this,
stream_t* s,
chunk_t* last_chunk,
hds_stream_t* hds_stream )
{
stream_t* s = (stream_t*) p_this;
stream_sys_t *sys = s->p_sys;
chunk_t *chunk = chunk_new();
unsigned int frun_entry = 0;
if( ! chunk ) {
msg_Err( p_this, "Couldn't allocate new chunk!" );
msg_Err( s, "Couldn't allocate new chunk!" );
return NULL;
}
......@@ -963,7 +962,7 @@ static chunk_t* generate_new_chunk(
{
if( frun_entry == hds_stream->fragment_run_count - 1 )
{
msg_Err( p_this, "Discontinuity but can't find next timestamp!");
msg_Err( s, "Discontinuity but can't find next timestamp!");
chunk_free( chunk );
return NULL;
}
......@@ -1005,7 +1004,7 @@ static chunk_t* generate_new_chunk(
if( frun_entry == hds_stream->fragment_run_count )
{
msg_Err( p_this, "Couldn'd find the fragment run!" );
msg_Err( s, "Couldn'd find the fragment run!" );
chunk_free( chunk );
return NULL;
}
......@@ -1046,7 +1045,7 @@ static chunk_t* generate_new_chunk(
}
static void maintain_live_chunks(
vlc_object_t* p_this,
stream_t *s,
hds_stream_t* hds_stream
)
{
......@@ -1057,7 +1056,7 @@ static void maintain_live_chunks(
* but then we are right on the edge of buffering, esp for
* small fragments */
hds_stream->chunks_head = generate_new_chunk(
p_this, 0, hds_stream );
s, 0, hds_stream );
hds_stream->chunks_livereadpos = hds_stream->chunks_head;
}
......@@ -1073,7 +1072,7 @@ static void maintain_live_chunks(
}
else
{
chunk->next = generate_new_chunk( p_this, chunk, hds_stream );
chunk->next = generate_new_chunk( s, chunk, hds_stream );
chunk = chunk->next;
dl = true;
}
......@@ -1101,8 +1100,7 @@ static void* live_thread( void* p )
{
vlc_thread_set_name("vlc-hds-live");
vlc_object_t* p_this = (vlc_object_t*)p;
stream_t* s = (stream_t*) p_this;
stream_t *s = (stream_t*)p;
stream_sys_t* sys = s->p_sys;
if ( vlc_array_count( &sys->hds_streams ) == 0 )
......@@ -1139,10 +1137,10 @@ static void* live_thread( void* p )
while( ! sys->closed )
{
last_dl_start_time = vlc_tick_now();
stream_t* download_stream = vlc_stream_NewURL( p_this, abst_url );
stream_t* download_stream = vlc_stream_NewURL( s, abst_url );
if( ! download_stream )
{
msg_Err( p_this, "Failed to download abst %s", abst_url );
msg_Err( s, "Failed to download abst %s", abst_url );
}
else
{
......@@ -1152,17 +1150,17 @@ static void* live_thread( void* p )
size );
if( read < size )
{
msg_Err( p_this, "Requested %"PRIi64" bytes, " \
msg_Err( s, "Requested %"PRIi64" bytes, " \
"but only got %d", size, read );
}
else
{
vlc_mutex_lock( & hds_stream->abst_lock );
parse_BootstrapData( p_this, hds_stream,
parse_BootstrapData( VLC_OBJECT(s), hds_stream,
data, data + read );
vlc_mutex_unlock( & hds_stream->abst_lock );
maintain_live_chunks( p_this, hds_stream );
maintain_live_chunks( s, hds_stream );
}
free( data );
......@@ -1343,7 +1341,7 @@ static int parse_Manifest( stream_t *s, manifest_t *m )
case XML_READER_ENDELEM:
if( current_element && ! strcmp( current_element, "bootstrapInfo") ) {
if( bootstrap_idx + 1 == MAX_BOOTSTRAP_INFO ) {
msg_Warn( (vlc_object_t*) s, "Too many bootstraps, ignoring" );
msg_Warn( s, "Too many bootstraps, ignoring" );
} else {
bootstrap_idx++;
}
......@@ -1365,7 +1363,7 @@ static int parse_Manifest( stream_t *s, manifest_t *m )
{
if( media_idx == MAX_MEDIA_ELEMENTS )
{
msg_Err( (vlc_object_t*) s, "Too many media elements, quitting" );
msg_Err( s, "Too many media elements, quitting" );
free(media_id);
return VLC_EGENERIC;
}
......@@ -1448,7 +1446,7 @@ static int parse_Manifest( stream_t *s, manifest_t *m )
vlc_b64_decode_binary( (uint8_t**)&bootstraps[bootstrap_idx].data, start );
if( ! bootstraps[bootstrap_idx].data )
{
msg_Err( (vlc_object_t*) s, "Couldn't decode bootstrap info" );
msg_Err( s, "Couldn't decode bootstrap info" );
}
}
else if( ! strcmp( current_element, "duration" ) )
......@@ -1490,7 +1488,7 @@ static int parse_Manifest( stream_t *s, manifest_t *m )
if ( ( end_marker < medias[mi].metadata ) ||
memcmp(end_marker, amf_object_end, sizeof(amf_object_end)) != 0 )
{
msg_Dbg( (vlc_object_t*)s, "Ignoring invalid metadata packet on stream %d", mi );
msg_Dbg( s, "Ignoring invalid metadata packet on stream %d", mi );
FREENULL( medias[mi].metadata );
medias[mi].metadata_len = 0;
}
......@@ -1555,7 +1553,7 @@ static int parse_Manifest( stream_t *s, manifest_t *m )
if( ! sys->live )
{
parse_BootstrapData( (vlc_object_t*)s,
parse_BootstrapData( VLC_OBJECT(s),
new_stream,
bootstraps[j].data,
bootstraps[j].data + bootstraps[j].data_len );
......@@ -1563,13 +1561,13 @@ static int parse_Manifest( stream_t *s, manifest_t *m )
new_stream->download_leadtime = 15;
new_stream->chunks_head = generate_new_chunk(
(vlc_object_t*) s, 0, new_stream );
s, 0, new_stream );
chunk_t* chunk = new_stream->chunks_head;
uint64_t total_duration = chunk->duration;
while( chunk && total_duration/new_stream->afrt_timescale < new_stream->download_leadtime )
{
chunk->next = generate_new_chunk(
(vlc_object_t*) s, chunk, new_stream );
s, chunk, new_stream );
chunk = chunk->next;
if( chunk )
total_duration += chunk->duration;
......@@ -1591,7 +1589,7 @@ static int parse_Manifest( stream_t *s, manifest_t *m )
vlc_array_append_or_abort( &sys->hds_streams, new_stream );
msg_Info( (vlc_object_t*)s, "New track with quality_segment(%s), bitrate(%u), timescale(%u), movie_id(%s), segment_run_count(%d), fragment_run_count(%u)",
msg_Info( s, "New track with quality_segment(%s), bitrate(%u), timescale(%u), movie_id(%s), segment_run_count(%d), fragment_run_count(%u)",
new_stream->quality_segment_modifier?new_stream->quality_segment_modifier:"", new_stream->bitrate, new_stream->timescale,
new_stream->movie_id, new_stream->segment_run_count, new_stream->fragment_run_count );
......@@ -1755,11 +1753,10 @@ static int send_flv_header( hds_stream_t *stream, stream_sys_t* p_sys,
}
static unsigned read_chunk_data(
vlc_object_t* p_this,
stream_t* s,
uint8_t* buffer, unsigned read_len,
hds_stream_t* stream )
{
stream_t* s = (stream_t*) p_this;
stream_sys_t* sys = s->p_sys;
chunk_t* chunk = stream->chunks_head;
uint8_t* buffer_start = buffer;
......@@ -1793,7 +1790,7 @@ static unsigned read_chunk_data(
/* make sure there is at least one chunk in the queue */
if( ! chunk->next && ! chunk->eof )
{
chunk->next = generate_new_chunk( p_this, chunk, stream );
chunk->next = generate_new_chunk( s, chunk, stream );
dl = true;
}
......@@ -1826,7 +1823,7 @@ static unsigned read_chunk_data(
{
if( ! chunk->next && ! chunk->eof )
{
chunk->next = generate_new_chunk( p_this, chunk, stream );
chunk->next = generate_new_chunk( s, chunk, stream );
dl = true;
}
......@@ -1868,7 +1865,7 @@ static ssize_t Read( stream_t *s, void *buffer, size_t i_read )
if ( header_unfinished( p_sys ) )
return send_flv_header( stream, p_sys, buffer, i_read );
return read_chunk_data( (vlc_object_t*)s, buffer, i_read, stream );
return read_chunk_data( s, buffer, i_read, stream );
}
static int Control( stream_t *s, int i_query, va_list args )
......
......@@ -50,7 +50,7 @@ static int vlc_vk_start(void *func, bool forced, va_list ap)
*/
vlc_vk_platform_t *vlc_vk_platform_Create(struct vlc_window *wnd, const char *name)
{
vlc_object_t *parent = (vlc_object_t *) wnd;
vlc_object_t *parent = VLC_OBJECT(wnd);
struct vlc_vk_platform_t *vk;
vk = vlc_object_create(parent, sizeof (*vk));
......
......@@ -400,7 +400,7 @@ vlc_window_t *vout_display_window_New(vout_thread_t *vout)
var_Create(vout, "window-fullscreen", VLC_VAR_BOOL);
var_Create(vout, "window-fullscreen-output", VLC_VAR_STRING);
window = vlc_window_New((vlc_object_t *)vout, modlist, &owner, &cfg);
window = vlc_window_New(VLC_OBJECT(vout), modlist, &owner, &cfg);
free(modlist);
if (window == NULL)
free(state);
......