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 (9)
......@@ -59,6 +59,7 @@
#include <AS_DCP.h>
#include <vector>
#include <algorithm>
#include "dcpparser.h"
......@@ -818,7 +819,7 @@ static int Control( demux_t *p_demux, int query, va_list args )
break;
case DEMUX_GET_TIME:
*va_arg( args, vlc_tick_t * ) = __MAX(p_sys->i_pts, 0);
*va_arg( args, vlc_tick_t * ) = std::max<vlc_tick_t>(p_sys->i_pts, 0);
break;
case DEMUX_SET_TIME:
......
......@@ -32,6 +32,7 @@
#endif
#include <inttypes.h>
#include <algorithm>
#include <vlc_common.h>
#include <vlc_plugin.h>
......@@ -1483,12 +1484,12 @@ static int Demux( demux_t *p_demux )
}
if( p_sys->i_pcr != VLC_TICK_INVALID )
es_out_SetPCR( p_demux->out, VLC_TICK_0 +
__MAX(0, p_sys->i_pcr - PCR_OFF) );
std::max<vlc_tick_t>(0, p_sys->i_pcr - PCR_OFF) );
}
else if( p_sys->i_pcr == VLC_TICK_INVALID ||
i_minpcr > p_sys->i_pcr + PCR_OBS )
{
p_sys->i_pcr = __MAX(0, i_minpcr - PCR_OFF);
p_sys->i_pcr = std::max<vlc_tick_t>(0, i_minpcr - PCR_OFF);
if( p_sys->i_pcr != VLC_TICK_INVALID )
es_out_SetPCR( p_demux->out, VLC_TICK_0 + p_sys->i_pcr );
}
......@@ -1900,7 +1901,7 @@ static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk,
*/
unsigned i_payload;
if( b_length )
i_payload = __MIN( i_length_offset, i_size - i_header_size);
i_payload = std::min( i_length_offset, i_size - i_header_size);
else
i_payload = i_size - i_header_size;
......
......@@ -50,6 +50,7 @@ extern "C" {
#define _VIDEOINFOHEADER_
#include <vlc_codecs.h>
#include <algorithm>
#include <atomic>
#include <new>
......@@ -610,7 +611,7 @@ static int AllocateInputSample(decoder_t *p_dec, DWORD stream_id, ComPtr<IMFSamp
if (FAILED(hr))
goto error;
allocation_size = __MAX(input_info.cbSize, size);
allocation_size = std::max<DWORD>(input_info.cbSize, size);
hr = MFCreateMemoryBuffer(allocation_size, &input_media_buffer);
if (FAILED(hr))
goto error;
......
......@@ -732,7 +732,7 @@ void matroska_segment_c::ParseTrackEntry( const KaxTrackEntry *m )
E_CASE( KaxVideoFrameRate, vfps )
{
ONLY_FMT(VIDEO);
vars.tk->f_fps = __MAX( static_cast<float>( vfps ), 1 );
vars.tk->f_fps = std::max( static_cast<float>(vfps) , 1.0f );
debug( vars, "fps=%f", vars.tk->f_fps );
}
E_CASE( KaxVideoColourSpace, colourspace )
......
......@@ -427,8 +427,8 @@ static void extensionDialogCallback(extension_dialog_t *p_ext_dialog,
int row = widget->i_row - 1;
int col = widget->i_column - 1;
int hsp = __MAX(1, widget->i_horiz_span);
int vsp = __MAX(1, widget->i_vert_span);
int hsp = MAX(1, widget->i_horiz_span);
int vsp = MAX(1, widget->i_vert_span);
if (row < 0) {
row = 4;
col = 0;
......
......@@ -39,6 +39,8 @@
#include <QKeyEvent>
#include "widgets/native/customwidgets.hpp"
#include <algorithm>
static void DialogCallback( extension_dialog_t *p_ext_dialog,
void *p_data );
......@@ -493,8 +495,8 @@ void ExtensionDialog::UpdateWidgets()
}
else if( col < 0 )
col = layout->columnCount();
int hsp = __MAX( 1, p_widget->i_horiz_span );
int vsp = __MAX( 1, p_widget->i_vert_span );
int hsp = std::max( 1, p_widget->i_horiz_span );
int vsp = std::max( 1, p_widget->i_vert_span );
if( !p_widget->p_sys_intf && !p_widget->b_kill )
{
widget = CreateWidget( p_widget );
......
......@@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <algorithm>
#include <math.h>
#include "../utils/var_bool.hpp"
#include "ctrl_tree.hpp"
......@@ -87,16 +88,16 @@ int CtrlTree::itemHeight()
{
if( m_pClosedBitmap )
{
itemHeight = __MAX( m_pClosedBitmap->getHeight(), itemHeight );
itemHeight = std::max( m_pClosedBitmap->getHeight(), itemHeight );
}
if( m_pOpenBitmap )
{
itemHeight = __MAX( m_pOpenBitmap->getHeight(), itemHeight );
itemHeight = std::max( m_pOpenBitmap->getHeight(), itemHeight );
}
}
if( m_pItemBitmap )
{
itemHeight = __MAX( m_pItemBitmap->getHeight(), itemHeight );
itemHeight = std::max( m_pItemBitmap->getHeight(), itemHeight );
}
itemHeight += LINE_INTERVAL;
return itemHeight;
......@@ -109,16 +110,16 @@ int CtrlTree::itemImageWidth()
{
if( m_pClosedBitmap )
{
bitmapWidth = __MAX( m_pClosedBitmap->getWidth(), bitmapWidth );
bitmapWidth = std::max( m_pClosedBitmap->getWidth(), bitmapWidth );
}
if( m_pOpenBitmap )
{
bitmapWidth = __MAX( m_pOpenBitmap->getWidth(), bitmapWidth );
bitmapWidth = std::max( m_pOpenBitmap->getWidth(), bitmapWidth );
}
}
if( m_pItemBitmap )
{
bitmapWidth = __MAX( m_pItemBitmap->getWidth(), bitmapWidth );
bitmapWidth = std::max( m_pItemBitmap->getWidth(), bitmapWidth );
}
return bitmapWidth + 2;
}
......@@ -599,7 +600,7 @@ void CtrlTree::makeImage()
{
if( it->isSelected() )
{
int rectHeight = __MIN( i_itemHeight, height - yPos );
int rectHeight = std::min( i_itemHeight, height - yPos );
m_pImage->fillRect( 0, yPos, width, rectHeight, m_selColor );
}
}
......@@ -612,7 +613,7 @@ void CtrlTree::makeImage()
// Overwrite with alternate colors (bgColor1, bgColor2)
for( int yPos = 0; yPos < height; yPos += i_itemHeight )
{
int rectHeight = __MIN( i_itemHeight, height - yPos );
int rectHeight = std::min( i_itemHeight, height - yPos );
if( it == m_rTree.end() )
m_pImage->fillRect( 0, yPos, width, rectHeight, bgColor );
else
......@@ -661,7 +662,7 @@ void CtrlTree::makeImage()
m_pImage->drawBitmap( *m_pCurBitmap, 0, 0,
bitmapWidth * (depth - 1 ), yPos2,
m_pCurBitmap->getWidth(),
__MIN( m_pCurBitmap->getHeight(),
std::min( m_pCurBitmap->getHeight(),
height - yPos2), true );
}
yPos += (i_itemHeight - pText->getHeight());
......@@ -677,7 +678,7 @@ void CtrlTree::makeImage()
ySrc = - yPos;
yPos = 0;
}
int lineHeight = __MIN( pText->getHeight() - ySrc, height - yPos );
int lineHeight = std::min( pText->getHeight() - ySrc, height - yPos );
// Draw the text
m_pImage->drawBitmap( *pText, 0, ySrc, bitmapWidth * depth, yPos,
pText->getWidth(),
......@@ -689,7 +690,7 @@ void CtrlTree::makeImage()
// Draw the underline bar below the text for drag&drop
m_pImage->fillRect(
bitmapWidth * (depth - 1 ), yPos - 2,
bitmapWidth + pText->getWidth(), __MAX( lineHeight/5, 3 ),
bitmapWidth + pText->getWidth(), std::max( lineHeight/5, 3 ),
m_selColor );
}
delete pText;
......
......@@ -203,8 +203,8 @@ GenericBitmap *FT2Font::drawString( const UString &rString, uint32_t color,
pos[n] = penX;
width1 = penX + glyph.m_size.xMax - glyph.m_size.xMin;
yMin = __MIN( yMin, glyph.m_size.yMin );
yMax = __MAX( yMax, glyph.m_size.yMax );
yMin = std::min<int>( yMin, glyph.m_size.yMin );
yMax = std::max<int>( yMax, glyph.m_size.yMax );
// Next position
penX += glyph.m_advance;
......@@ -254,11 +254,11 @@ GenericBitmap *FT2Font::drawString( const UString &rString, uint32_t color,
#endif
// Adjust the size for vertical padding
yMax = __MAX( yMax, m_ascender );
yMin = __MIN( yMin, m_descender );
yMax = std::max<int>( yMax, m_ascender );
yMin = std::min<int>( yMin, m_descender );
// Create the bitmap
FT2Bitmap *pBmp = new FT2Bitmap( getIntf(), __MIN( width1, width2 ),
FT2Bitmap *pBmp = new FT2Bitmap( getIntf(), std::min( width1, width2 ),
yMax - yMin );
// Draw the glyphs on the bitmap
......
......@@ -643,7 +643,7 @@ static void ReadMetaFromId3v2( ID3v2::Tag* tag, demux_meta_t* p_demux_meta, vlc_
* but in our case it will be a '\0'
* terminated string */
char psz_ufid[64];
int max_size = __MIN( p_ufid->identifier().size(), 63);
int max_size = std::min<unsigned>( p_ufid->identifier().size(), 63);
strncpy( psz_ufid, p_ufid->identifier().data(), max_size );
psz_ufid[max_size] = '\0';
vlc_meta_SetTrackID( p_meta, psz_ufid );
......
......@@ -22,6 +22,8 @@
# include "config.h"
#endif
#include <algorithm>
#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_picture.h>
......@@ -709,7 +711,7 @@ int DBMSDIOutput::ProcessAudio(block_t *p_block)
msg_Err(p_stream, "Failed to schedule audio sample:0x%" PRIHR, result);
else
{
lasttimestamp = __MAX(p_block->i_pts, lasttimestamp);
lasttimestamp = std::max(p_block->i_pts, lasttimestamp);
if (sampleFrameCount != written)
msg_Err(p_stream, "Written only %d samples out of %d", written, sampleFrameCount);
}
......@@ -828,7 +830,7 @@ int DBMSDIOutput::doProcessVideo(picture_t *picture, block_t *p_cc)
picture->date, result);
goto error;
}
lasttimestamp = __MAX(scheduleTime, lasttimestamp);
lasttimestamp = std::max(scheduleTime, lasttimestamp);
if(!b_running) /* preroll */
{
......