[vlc-commits] [Git][videolan/vlc][master] 5 commits: sout: fix unused parameter warning on Darwin

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
d1140d33 by Marvin Scholz at 2024-05-18T05:40:35+00:00
sout: fix unused parameter warning on Darwin

- - - - -
e91726d6 by Marvin Scholz at 2024-05-18T05:40:35+00:00
freetype: darwin: make getFontIndexInFontFile static

Fixes compiler warning about missing prototype and also this function
is only ever used in this file.

- - - - -
d429fe06 by Marvin Scholz at 2024-05-18T05:40:35+00:00
deinterlace: ivtc: remove write-only variable

Fixes warning: variable 'i_vote_invalid' set but not used

- - - - -
7c558aa8 by Marvin Scholz at 2024-05-18T05:40:35+00:00
vout: caopengllayer: define GL_SILENCE_DEPRECATION

OpenGL is deprecated, nothing we can do about that, so might as well
silence the deprecation warnings for it to not clutter the build log
and drown out actually relevant warnings.

- - - - -
ec76e1cd by Marvin Scholz at 2024-05-18T05:40:35+00:00
vout: VLCSampleBufferDisplay: specify bitmap byte order

Fixes a warning about the implicit conversion of enum type:
  implicit conversion from enumeration type 'enum CGImageAlphaInfo'
  to different enumeration type 'CGBitmapInfo'

- - - - -


5 changed files:

- modules/stream_out/renderer_common.cpp
- modules/text_renderer/freetype/fonts/darwin.c
- modules/video_filter/deinterlace/algo_ivtc.c
- modules/video_output/Makefile.am
- modules/video_output/apple/VLCSampleBufferDisplay.m


Changes:

=====================================
modules/stream_out/renderer_common.cpp
=====================================
@@ -263,7 +263,7 @@ std::string GetVencX264Option( sout_stream_t * /* p_stream */,
 
 #ifdef __APPLE__
 std::string GetVencAvcodecVTOption( sout_stream_t * /* p_stream */,
-                                           const video_format_t * p_vid,
+                                           const video_format_t * /* p_vid */,
                                            int i_quality )
 {
     std::stringstream ssout;


=====================================
modules/text_renderer/freetype/fonts/darwin.c
=====================================
@@ -56,7 +56,7 @@ static char* getPathForFontDescription(CTFontDescriptorRef fontDescriptor)
     return retPath;
 }
 
-CFIndex getFontIndexInFontFile(const char* psz_filePath, const char* psz_family) {
+static CFIndex getFontIndexInFontFile(const char* psz_filePath, const char* psz_family) {
     CFIndex index = kCFNotFound;
     CFURLRef url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault, (const UInt8 *)psz_filePath, strlen(psz_filePath), false);
     if (url == NULL) {


=====================================
modules/video_filter/deinterlace/algo_ivtc.c
=====================================
@@ -1092,13 +1092,12 @@ static void IVTCCadenceAnalyze( filter_t *p_filter )
         if( p_ivtc->b_sequence_valid )
         {
             /* Determine TFF/BFF. */
-            int i_vote_invalid = 0;
             int i_vote_tff     = 0;
             int i_vote_bff     = 0;
             for( int i = 0; i < IVTC_DETECTION_HISTORY_SIZE; ++i )
             {
                 if( pi_tfd[i] == TFD_INVALID )
-                    i_vote_invalid++;
+                    continue;
                 else if( pi_tfd[i] == TFD_TFF )
                     i_vote_tff++;
                 else if( pi_tfd[i] == TFD_BFF )


=====================================
modules/video_output/Makefile.am
=====================================
@@ -65,7 +65,7 @@ libvout_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 
 libcaopengllayer_plugin_la_SOURCES = video_output/caopengllayer.m \
 	$(OPENGL_VOUT_COMMONSOURCES)
-libcaopengllayer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)  -DHAVE_GL_CORE_SYMBOLS
+libcaopengllayer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)  -DHAVE_GL_CORE_SYMBOLS -DGL_SILENCE_DEPRECATION
 libcaopengllayer_plugin_la_LIBADD = libvlc_opengl.la
 libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' \
 	-Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore


=====================================
modules/video_output/apple/VLCSampleBufferDisplay.m
=====================================
@@ -442,7 +442,7 @@ static void UpdateSubpictureRegions(vout_display_t *vd,
         CGImageRef image = CGImageCreate(
             r->p_picture->format.i_visible_width, r->p_picture->format.i_visible_height,
             8, 32, r->p_picture->p->i_pitch,
-            space, kCGImageAlphaFirst,
+            space, kCGBitmapByteOrderDefault | kCGImageAlphaFirst,
             provider, NULL, true, kCGRenderingIntentDefault
             );
         VLCSampleBufferSubpictureRegion *region;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1d2a90155172b147ae8302e1371d50a278701c94...ec76e1cde3233fac5402919a49d2359c000f757e

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1d2a90155172b147ae8302e1371d50a278701c94...ec76e1cde3233fac5402919a49d2359c000f757e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance