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)
......@@ -135,6 +135,7 @@ vlc_player_input_HandleState(struct vlc_player_input *input,
&& state != VLC_PLAYER_STATE_STOPPED)
return;
enum vlc_player_state last_state = input->state;
input->state = state;
/* Override the global state if the player is still playing and has a next
......@@ -167,7 +168,15 @@ vlc_player_input_HandleState(struct vlc_player_input *input,
if (!player->input)
player->started = false;
switch (player->media_stopped_action)
/* If the last input was not even started, always play the next
* media */
enum vlc_player_media_stopped_action stopped_action;
if (last_state == VLC_PLAYER_STATE_STOPPED)
stopped_action = VLC_PLAYER_MEDIA_STOPPED_CONTINUE;
else
stopped_action = player->media_stopped_action;
switch (stopped_action)
{
case VLC_PLAYER_MEDIA_STOPPED_EXIT:
if (player->input && player->started)
......
......@@ -232,9 +232,8 @@ vlc_player_destructor_Thread(void *data)
keep_sout = var_GetBool(input->thread, "sout-keep");
if (input->state == VLC_PLAYER_STATE_STOPPING)
vlc_player_input_HandleState(input, VLC_PLAYER_STATE_STOPPED,
VLC_TICK_INVALID);
vlc_player_input_HandleState(input, VLC_PLAYER_STATE_STOPPED,
VLC_TICK_INVALID);
vlc_list_remove(&input->node);
vlc_player_input_Delete(input);
......@@ -1875,7 +1874,10 @@ vlc_player_Delete(vlc_player_t *player)
vlc_mutex_lock(&player->lock);
if (player->input)
{
vlc_player_destructor_AddInput(player, player->input);
player->input = NULL;
}
player->deleting = true;
vlc_cond_signal(&player->destructor.wait);
......
......@@ -226,6 +226,7 @@ struct ctx
vlc_player_t *player;
vlc_player_listener_id *listener;
struct VLC_VECTOR(input_item_t *) next_medias;
struct VLC_VECTOR(input_item_t *) added_medias;
struct VLC_VECTOR(input_item_t *) played_medias;
size_t program_switch_count;
......@@ -259,7 +260,9 @@ player_get_next(vlc_player_t *player, void *data)
vlc_vector_remove(&ctx->next_medias, 0);
input_item_Hold(next_media);
bool success = vlc_vector_push(&ctx->played_medias, next_media);
bool success = vlc_vector_push(&ctx->added_medias, next_media);
assert(success);
success = vlc_vector_push(&ctx->played_medias, next_media);
assert(success);
}
else
......@@ -686,9 +689,11 @@ REPORT_LIST
}
vlc_vector_clear(&ctx->next_medias);
vlc_vector_foreach(media, &ctx->played_medias)
vlc_vector_foreach(media, &ctx->added_medias)
if (media)
input_item_Release(media);
vlc_vector_clear(&ctx->added_medias);
vlc_vector_clear(&ctx->played_medias);
ctx->extra_start_count = 0;
......@@ -750,14 +755,12 @@ player_set_current_mock_media(struct ctx *ctx, const char *name,
int ret = vlc_player_SetCurrentMedia(ctx->player, media);
assert(ret == VLC_SUCCESS);
if (ignored)
{
if (media)
input_item_Release(media);
}
else
bool success = vlc_vector_push(&ctx->added_medias, media);
assert(success);
if (!ignored)
{
bool success = vlc_vector_push(&ctx->played_medias, media);
success = vlc_vector_push(&ctx->played_medias, media);
assert(success);
}
}
......@@ -768,7 +771,7 @@ player_set_next_mock_media(struct ctx *ctx, const char *name,
{
if (vlc_player_GetCurrentMedia(ctx->player) == NULL)
{
assert(ctx->played_medias.size == 0);
assert(ctx->added_medias.size == 0);
player_set_current_mock_media(ctx, name, params, false);
}
else
......@@ -776,7 +779,7 @@ player_set_next_mock_media(struct ctx *ctx, const char *name,
input_item_t *media = create_mock_media(name, params);
assert(media);
assert(ctx->played_medias.size > 0);
assert(ctx->added_medias.size > 0);
bool success = vlc_vector_push(&ctx->next_medias, media);
assert(success);
}
......@@ -993,9 +996,9 @@ test_end_poststop_medias(struct ctx *ctx)
while (vec->size == oldsize)
vlc_player_CondWait(player, &ctx->wait);
assert(vec->size == ctx->played_medias.size);
assert(vec->size == ctx->added_medias.size);
for (size_t i = 0; i < vec->size; ++i)
assert(vec->data[i] == ctx->played_medias.data[i]);
assert(vec->data[i] == ctx->added_medias.data[i]);
assert(VEC_LAST(vec) == NULL);
assert(vlc_player_GetCurrentMedia(player) == NULL);
......@@ -1661,7 +1664,9 @@ test_unknown_uri(struct ctx *ctx)
assert(ret == VLC_SUCCESS);
ctx->params.error = true;
bool success = vlc_vector_push(&ctx->played_medias, media);
bool success = vlc_vector_push(&ctx->added_medias, media);
assert(success);
success = vlc_vector_push(&ctx->played_medias, media);
assert(success);
player_start(ctx);
......@@ -1888,6 +1893,32 @@ test_next_media(struct ctx *ctx)
test_end(ctx);
}
static void
test_same_media(struct ctx *ctx)
{
test_log("same_media\n");
vlc_player_t *player = ctx->player;
struct media_params params = DEFAULT_MEDIA_PARAMS(VLC_TICK_FROM_MS(10));
player_set_current_mock_media(ctx, "media", &params, false);
input_item_t *media = vlc_player_GetCurrentMedia(player);
assert(media);
input_item_Hold(media);
vlc_player_SetCurrentMedia(player, media);
bool success = vlc_vector_push(&ctx->added_medias, media);
assert(success);
player_start(ctx);
wait_state(ctx, VLC_PLAYER_STATE_STARTED);
wait_state(ctx, VLC_PLAYER_STATE_STOPPED);
test_end(ctx);
}
static void
test_set_current_media(struct ctx *ctx)
{
......@@ -1898,6 +1929,9 @@ test_set_current_media(struct ctx *ctx)
vlc_player_t *player = ctx->player;
struct media_params params = DEFAULT_MEDIA_PARAMS(VLC_TICK_FROM_MS(100));
/* Ensure that this media is not played */
player_set_current_mock_media(ctx, "ignored", &params, true);
player_set_current_mock_media(ctx, media_names[0], &params, false);
player_start(ctx);
......@@ -1907,16 +1941,17 @@ test_set_current_media(struct ctx *ctx)
* the player and without passing by the next_media provider. */
{
vec_on_current_media_changed *vec = &ctx->report.on_current_media_changed;
assert(vec->size == 1);
assert(vec->size == 2);
for (size_t i = 1; i <= media_count; ++i)
{
while (vec->size != i)
while (vec->size - 1 /* ignored */!= i)
vlc_player_CondWait(player, &ctx->wait);
input_item_t *last_media = VEC_LAST(vec);
assert(last_media);
assert(last_media == vlc_player_GetCurrentMedia(player));
assert(last_media == VEC_LAST(&ctx->played_medias));
assert(last_media == VEC_LAST(&ctx->added_medias));
assert_media_name(last_media, media_names[i - 1]);
if (i < media_count)
......@@ -1924,8 +1959,12 @@ test_set_current_media(struct ctx *ctx)
/* Next vlc_player_SetCurrentMedia() call should be
* asynchronous since we are still playing. Therefore,
* vlc_player_GetCurrentMedia() should return the last one. */
player_set_current_mock_media(ctx, "ignored", &params, true);
input_item_t *ignored = create_mock_media("ignored", &params);
assert(ignored);
int ret = vlc_player_SetCurrentMedia(ctx->player, ignored);
assert(ret == VLC_SUCCESS);
assert(vlc_player_GetCurrentMedia(player) == last_media);
input_item_Release(ignored);
/* The previous media is ignored due to this call */
player_set_current_mock_media(ctx, media_names[i], &params, false);
......@@ -1949,7 +1988,7 @@ test_set_current_media(struct ctx *ctx)
/* Playback is stopped: vlc_player_SetCurrentMedia should be synchronous */
player_set_current_mock_media(ctx, media_names[0], &params, false);
assert(vlc_player_GetCurrentMedia(player) == VEC_LAST(&ctx->played_medias));
assert(vlc_player_GetCurrentMedia(player) == VEC_LAST(&ctx->added_medias));
player_start(ctx);
......@@ -2110,6 +2149,7 @@ REPORT_LIST
*ctx = (struct ctx) {
.vlc = vlc,
.next_medias = VLC_VECTOR_INITIALIZER,
.added_medias = VLC_VECTOR_INITIALIZER,
.played_medias = VLC_VECTOR_INITIALIZER,
.program_switch_count = 1,
.extra_start_count = 0,
......@@ -2866,6 +2906,7 @@ main(void)
test_outputs(&ctx); /* Must be the first test */
test_same_media(&ctx);
test_set_current_media(&ctx);
test_next_media(&ctx);
test_seeks(&ctx);
......