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
  • abdsaber000/vlc
  • falbrechtskirchinger/vlc
405 results
Show changes
Commits on Source (5)
...@@ -48,14 +48,7 @@ typedef struct ...@@ -48,14 +48,7 @@ typedef struct
/* The following fields of decoder_sys_t are shared between decoder and spu units */ /* The following fields of decoder_sys_t are shared between decoder and spu units */
vlc_atomic_rc_t rc; vlc_atomic_rc_t rc;
int i_cfg_rendering_backend;
char* psz_cfg_font_name;
bool b_cfg_replace_drcs;
bool b_cfg_force_stroke_text;
bool b_cfg_ignore_background;
bool b_cfg_ignore_ruby;
bool b_cfg_fadeout; bool b_cfg_fadeout;
float f_cfg_stroke_width;
aribcc_context_t *p_context; aribcc_context_t *p_context;
aribcc_decoder_t *p_decoder; aribcc_decoder_t *p_decoder;
...@@ -89,7 +82,6 @@ static void DecSysRelease(decoder_sys_t *p_sys) ...@@ -89,7 +82,6 @@ static void DecSysRelease(decoder_sys_t *p_sys)
aribcc_decoder_free(p_sys->p_decoder); aribcc_decoder_free(p_sys->p_decoder);
if (p_sys->p_context) if (p_sys->p_context)
aribcc_context_free(p_sys->p_context); aribcc_context_free(p_sys->p_context);
free(p_sys->psz_cfg_font_name);
free(p_sys); free(p_sys);
} }
...@@ -344,14 +336,7 @@ static int Open(vlc_object_t *p_this) ...@@ -344,14 +336,7 @@ static int Open(vlc_object_t *p_this)
vlc_atomic_rc_init(&p_sys->rc); vlc_atomic_rc_init(&p_sys->rc);
p_sys->i_cfg_rendering_backend = var_InheritInteger(p_this, ARIBCAPTION_CFG_PREFIX "rendering-backend");
p_sys->psz_cfg_font_name = var_InheritString(p_this, ARIBCAPTION_CFG_PREFIX "font");
p_sys->b_cfg_replace_drcs = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "replace-drcs");
p_sys->b_cfg_force_stroke_text = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "force-stroke-text");
p_sys->b_cfg_ignore_background = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "ignore-background");
p_sys->b_cfg_ignore_ruby = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "ignore-ruby");
p_sys->b_cfg_fadeout = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "fadeout"); p_sys->b_cfg_fadeout = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "fadeout");
p_sys->f_cfg_stroke_width = var_InheritFloat(p_this, ARIBCAPTION_CFG_PREFIX "stroke-width");
vlc_mutex_init(&p_sys->dec_lock); vlc_mutex_init(&p_sys->dec_lock);
p_sys->p_dec = p_dec; p_sys->p_dec = p_dec;
...@@ -400,25 +385,39 @@ static int Open(vlc_object_t *p_this) ...@@ -400,25 +385,39 @@ static int Open(vlc_object_t *p_this)
return VLC_EGENERIC; return VLC_EGENERIC;
} }
int i_cfg_rendering_backend =
var_InheritInteger(p_this, ARIBCAPTION_CFG_PREFIX "rendering-backend");
b_succ = aribcc_renderer_initialize(p_renderer, b_succ = aribcc_renderer_initialize(p_renderer,
ARIBCC_CAPTIONTYPE_CAPTION, ARIBCC_CAPTIONTYPE_CAPTION,
ARIBCC_FONTPROVIDER_TYPE_AUTO, ARIBCC_FONTPROVIDER_TYPE_AUTO,
(aribcc_textrenderer_type_t)p_sys->i_cfg_rendering_backend); (aribcc_textrenderer_type_t)i_cfg_rendering_backend);
if (!b_succ) { if (!b_succ) {
msg_Err(p_dec, "libaribcaption renderer initialization failed"); msg_Err(p_dec, "libaribcaption renderer initialization failed");
DecSysRelease(p_sys); DecSysRelease(p_sys);
return VLC_EGENERIC; return VLC_EGENERIC;
} }
aribcc_renderer_set_storage_policy(p_renderer, ARIBCC_CAPTION_STORAGE_POLICY_MINIMUM, 0); aribcc_renderer_set_storage_policy(p_renderer, ARIBCC_CAPTION_STORAGE_POLICY_MINIMUM, 0);
aribcc_renderer_set_replace_drcs(p_renderer, p_sys->b_cfg_replace_drcs);
aribcc_renderer_set_force_stroke_text(p_renderer, p_sys->b_cfg_force_stroke_text); bool b_cfg_replace_drcs = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "replace-drcs");
aribcc_renderer_set_force_no_background(p_renderer, p_sys->b_cfg_ignore_background); bool b_cfg_force_stroke_text = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "force-stroke-text");
aribcc_renderer_set_force_no_ruby(p_renderer, p_sys->b_cfg_ignore_ruby); bool b_cfg_ignore_background = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "ignore-background");
aribcc_renderer_set_stroke_width(p_renderer, p_sys->f_cfg_stroke_width); bool b_cfg_ignore_ruby = var_InheritBool(p_this, ARIBCAPTION_CFG_PREFIX "ignore-ruby");
float f_cfg_stroke_width = var_InheritFloat(p_this, ARIBCAPTION_CFG_PREFIX "stroke-width");
if (p_sys->psz_cfg_font_name && strlen(p_sys->psz_cfg_font_name) > 0) { aribcc_renderer_set_replace_drcs(p_renderer, b_cfg_replace_drcs);
const char* font_families[] = { p_sys->psz_cfg_font_name }; aribcc_renderer_set_force_stroke_text(p_renderer, b_cfg_force_stroke_text);
aribcc_renderer_set_default_font_family(p_renderer, font_families, 1, true); aribcc_renderer_set_force_no_background(p_renderer, b_cfg_ignore_background);
aribcc_renderer_set_force_no_ruby(p_renderer, b_cfg_ignore_ruby);
aribcc_renderer_set_stroke_width(p_renderer, f_cfg_stroke_width);
char *psz_cfg_font_name = var_InheritString(p_this, ARIBCAPTION_CFG_PREFIX "font");
if (psz_cfg_font_name) {
const char* font_families[] = { psz_cfg_font_name };
aribcc_renderer_set_default_font_family(p_renderer,
font_families,
ARRAY_SIZE(font_families),
true);
free(psz_cfg_font_name);
} }
p_dec->p_sys = p_sys; p_dec->p_sys = p_sys;
......
...@@ -131,7 +131,6 @@ typedef struct ...@@ -131,7 +131,6 @@ typedef struct
IplImage *p_cv_image[VOUT_MAX_PLANES]; IplImage *p_cv_image[VOUT_MAX_PLANES];
filter_t *p_opencv; filter_t *p_opencv;
char* psz_inner_name;
picture_t hacked_pic; picture_t hacked_pic;
} filter_sys_t; } filter_sys_t;
...@@ -166,18 +165,18 @@ static int Create( filter_t* p_filter ) ...@@ -166,18 +165,18 @@ static int Create( filter_t* p_filter )
return VLC_ENOMEM; return VLC_ENOMEM;
} }
p_sys->psz_inner_name = var_InheritString( p_filter, "opencv-filter-name" ); char *psz_inner_name = var_InheritString( p_filter, "opencv-filter-name" );
if( p_sys->psz_inner_name ) if( psz_inner_name )
p_sys->p_opencv->p_module = p_sys->p_opencv->p_module =
module_need( p_sys->p_opencv, module_need( p_sys->p_opencv,
"opencv internal filter", "opencv internal filter",
p_sys->psz_inner_name, psz_inner_name,
true ); true );
if( !p_sys->p_opencv->p_module ) if( !p_sys->p_opencv->p_module )
{ {
msg_Err( p_filter, "can't open internal opencv filter: %s", p_sys->psz_inner_name ); msg_Err( p_filter, "can't open internal opencv filter: %s", psz_inner_name );
free( p_sys->psz_inner_name ); free( psz_inner_name );
vlc_object_delete(p_sys->p_opencv); vlc_object_delete(p_sys->p_opencv);
free( p_sys ); free( p_sys );
...@@ -239,7 +238,8 @@ static int Create( filter_t* p_filter ) ...@@ -239,7 +238,8 @@ static int Create( filter_t* p_filter )
p_sys->f_scale, p_sys->f_scale,
p_sys->i_internal_chroma, p_sys->i_internal_chroma,
p_sys->i_wrapper_output, p_sys->i_wrapper_output,
p_sys->psz_inner_name); psz_inner_name);
free( psz_inner_name );
#ifndef NDEBUG #ifndef NDEBUG
msg_Dbg( p_filter, "opencv_wrapper successfully started" ); msg_Dbg( p_filter, "opencv_wrapper successfully started" );
...@@ -265,8 +265,6 @@ static void Destroy( filter_t* p_filter ) ...@@ -265,8 +265,6 @@ static void Destroy( filter_t* p_filter )
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
ReleaseImages( p_filter ); ReleaseImages( p_filter );
free( p_sys->psz_inner_name );
// Release the internal OpenCV filter. // Release the internal OpenCV filter.
filter_Close( p_sys->p_opencv ); filter_Close( p_sys->p_opencv );
module_unneed( p_sys->p_opencv, p_sys->p_opencv->p_module ); module_unneed( p_sys->p_opencv, p_sys->p_opencv->p_module );
......