[vlc-commits] macosx: Convert and save: Use correct port

2018-08-23 Thread David Fuhrmann 
vlc | branch: master | David Fuhrmann  | Thu Aug 23 
19:09:50 2018 +0200| [4da26c6c9c8137d9d84ae66d64775760da4d1674] | committer: 
David Fuhrmann

macosx: Convert and save: Use correct port

Port must be part of MRL, not as a separate field (which does not
exist).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4da26c6c9c8137d9d84ae66d64775760da4d1674
---

 modules/gui/macosx/VLCConvertAndSaveWindowController.m | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m 
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index 0fff3fe1a2..5b545622e3 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -968,15 +968,17 @@

withString:@"\\\""];
 [composedOptions 
appendFormat:@",access=file{no-overwrite},dst=\"%@\"}", _outputDestination];
 } else {
+NSString *destination = [NSString stringWithFormat:@"\"%@:%@\"", 
_outputDestination, [_streamPortField stringValue]];
+
 /* streaming */
 if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"RTP"])
 [composedOptions appendFormat:@":rtp{mux=ts,dst=%@,port=%@", 
_outputDestination, [_streamPortField stringValue]];
 else if ([[[_streamTypePopup selectedItem] title] 
isEqualToString:@"UDP"])
-[composedOptions 
appendFormat:@":standard{mux=ts,dst=%@,port=%@,access=udp", _outputDestination, 
[_streamPortField stringValue]];
+[composedOptions 
appendFormat:@":standard{mux=ts,dst=%@,access=udp", destination];
 else if ([[[_streamTypePopup selectedItem] title] 
isEqualToString:@"MMSH"])
-[composedOptions 
appendFormat:@":standard{mux=asfh,dst=%@,port=%@,access=mmsh", 
_outputDestination, [_streamPortField stringValue]];
+[composedOptions 
appendFormat:@":standard{mux=asfh,dst=%@,access=mmsh", destination];
 else
-[composedOptions 
appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http", 
[self.currentProfile firstObject], _outputDestination, [_streamPortField 
stringValue]];
+[composedOptions 
appendFormat:@":standard{mux=%@,dst=%@,access=http", [self.currentProfile 
firstObject], destination];
 
 if ([_streamSAPCheckbox state])
 [composedOptions appendFormat:@",sap,name=\"%@\"", 
[_streamChannelField stringValue]];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: Fix streaming using convert and save panel

2018-08-23 Thread David Fuhrmann 
vlc | branch: master | David Fuhrmann  | Thu Aug 23 
18:40:16 2018 +0200| [fdb955057a71eb71bfb635fd099085585d01a767] | committer: 
David Fuhrmann

macosx: Fix streaming using convert and save panel

Closing bracket was missing, also :sout-keep seems to be not supported
(or needed) here anymore.

close #21037

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fdb955057a71eb71bfb635fd099085585d01a767
---

 modules/gui/macosx/VLCConvertAndSaveWindowController.m | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m 
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index f663075179..0fff3fe1a2 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -954,10 +954,13 @@
 [composedOptions appendFormat:@",soverlay"];
 }
 
+// Close transcode
+[composedOptions appendString:@"}"];
+
 if (!b_streaming) {
 /* file transcoding */
 // add muxer
-[composedOptions appendFormat:@"}:standard{mux=%@", 
[self.currentProfile firstObject]];
+[composedOptions appendFormat:@":standard{mux=%@", 
[self.currentProfile firstObject]];
 
 
 // add output destination
@@ -993,7 +996,7 @@
 }
 }
 
-[composedOptions appendString:@"} :sout-keep"];
+[composedOptions appendString:@"}"];
 }
 
 return [NSString stringWithString:composedOptions];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: Convert and save: Use correct port

2018-08-23 Thread David Fuhrmann 
vlc/vlc-3.0 | branch: master | David Fuhrmann  | Thu 
Aug 23 19:09:50 2018 +0200| [042b75e400bb259ba142f91464a214897476488a] | 
committer: David Fuhrmann

macosx: Convert and save: Use correct port

Port must be part of MRL, not as a separate field (which does not
exist).

(cherry picked from commit 4da26c6c9c8137d9d84ae66d64775760da4d1674)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=042b75e400bb259ba142f91464a214897476488a
---

 modules/gui/macosx/VLCConvertAndSaveWindowController.m | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m 
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index c267152612..e78c7cc962 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -958,15 +958,17 @@

withString:@"\\\""];
 [composedOptions 
appendFormat:@",access=file{no-overwrite},dst=\"%@\"}", _outputDestination];
 } else {
+NSString *destination = [NSString stringWithFormat:@"\"%@:%@\"", 
_outputDestination, [_streamPortField stringValue]];
+
 /* streaming */
 if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"RTP"])
 [composedOptions appendFormat:@":rtp{mux=ts,dst=%@,port=%@", 
_outputDestination, [_streamPortField stringValue]];
 else if ([[[_streamTypePopup selectedItem] title] 
isEqualToString:@"UDP"])
-[composedOptions 
appendFormat:@":standard{mux=ts,dst=%@,port=%@,access=udp", _outputDestination, 
[_streamPortField stringValue]];
+[composedOptions 
appendFormat:@":standard{mux=ts,dst=%@,access=udp", destination];
 else if ([[[_streamTypePopup selectedItem] title] 
isEqualToString:@"MMSH"])
-[composedOptions 
appendFormat:@":standard{mux=asfh,dst=%@,port=%@,access=mmsh", 
_outputDestination, [_streamPortField stringValue]];
+[composedOptions 
appendFormat:@":standard{mux=asfh,dst=%@,access=mmsh", destination];
 else
-[composedOptions 
appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http", 
[self.currentProfile firstObject], _outputDestination, [_streamPortField 
stringValue]];
+[composedOptions 
appendFormat:@":standard{mux=%@,dst=%@,access=http", [self.currentProfile 
firstObject], destination];
 
 if ([_streamSAPCheckbox state])
 [composedOptions appendFormat:@",sap,name=\"%@\"", 
[_streamChannelField stringValue]];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: Fix streaming using convert and save panel

2018-08-23 Thread David Fuhrmann 
vlc/vlc-3.0 | branch: master | David Fuhrmann  | Thu 
Aug 23 18:40:16 2018 +0200| [7043b5bc20c30bf225601571679662ac8af6d9a9] | 
committer: David Fuhrmann

macosx: Fix streaming using convert and save panel

Closing bracket was missing, also :sout-keep seems to be not supported
(or needed) here anymore.

close #21037

(cherry picked from commit fdb955057a71eb71bfb635fd099085585d01a767)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7043b5bc20c30bf225601571679662ac8af6d9a9
---

 modules/gui/macosx/VLCConvertAndSaveWindowController.m | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m 
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index fa2cd6884d..c267152612 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -944,10 +944,13 @@
 [composedOptions appendFormat:@",soverlay"];
 }
 
+// Close transcode
+[composedOptions appendString:@"}"];
+
 if (!b_streaming) {
 /* file transcoding */
 // add muxer
-[composedOptions appendFormat:@"}:standard{mux=%@", 
[self.currentProfile firstObject]];
+[composedOptions appendFormat:@":standard{mux=%@", 
[self.currentProfile firstObject]];
 
 
 // add output destination
@@ -983,7 +986,7 @@
 }
 }
 
-[composedOptions appendString:@"} :sout-keep"];
+[composedOptions appendString:@"}"];
 }
 
 return [NSString stringWithString:composedOptions];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] gui:qt: use Vista styling on Windows

2018-08-23 Thread Steve Lhomme 
vlc | branch: master | Steve Lhomme  | Wed Aug 22 08:28:19 
2018 +0200| [0630bfa0436105ae7e24051cc16031c8ce2d77f5] | committer: Hugo 
Beauzée-Luyssen

gui:qt: use Vista styling on Windows

Fixes #20780

Signed-off-by: Hugo Beauzée-Luyssen 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0630bfa0436105ae7e24051cc16031c8ce2d77f5
---

 modules/gui/qt/qt.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index 1128633386..6fdbda06fa 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -76,6 +76,9 @@ extern "C" char **environ;
   #if !HAS_QT56
Q_IMPORT_PLUGIN(AccessibleFactory)
   #endif
+  #ifdef _WIN32
+   Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
+  #endif
  #endif
 #endif
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contribs:qt: add Vista styling when building for Win32

2018-08-23 Thread Steve Lhomme 
vlc | branch: master | Steve Lhomme  | Wed Aug 22 08:28:18 
2018 +0200| [07c35dcde98e25fba642085ea89080d94a0698d8] | committer: Hugo 
Beauzée-Luyssen

contribs:qt: add Vista styling when building for Win32

Signed-off-by: Hugo Beauzée-Luyssen 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=07c35dcde98e25fba642085ea89080d94a0698d8
---

 contrib/src/qt/rules.mak | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 85c5f50b99..5f0c8865c8 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -65,6 +65,9 @@ QT_CONFIG += -release
cd $< && $(MAKE) -C src/plugins sub-platforms-install_subtargets
 ifdef HAVE_WIN32
mv $(PREFIX)/plugins/platforms/libqwindows.a $(PREFIX)/lib/ && rm -rf 
$(PREFIX)/plugins
+   # Vista styling
+   cd $< && $(MAKE) -C src -C plugins sub-styles-install_subtargets
+   mv $(PREFIX)/plugins/styles/libqwindowsvistastyle.a $(PREFIX)/lib/ && 
rm -rf $(PREFIX)/plugins
# Move includes to match what VLC expects
mkdir -p $(PREFIX)/include/QtGui/qpa
cp 
$(PREFIX)/include/QtGui/$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h 
$(PREFIX)/include/QtGui/qpa
@@ -73,7 +76,9 @@ ifdef HAVE_WIN32
# Fix .pc files to remove debug version (d)
cd $(PREFIX)/lib/pkgconfig; for i in Qt5Core.pc Qt5Gui.pc 
Qt5Widgets.pc; do sed -i.orig -e 's/d\.a/.a/g' -e 's/d $$/ /' $$i; done
# Fix Qt5Gui.pc file to include qwindows (QWindowsIntegrationPlugin) 
and platform support libraries
-   cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Gui/ -lqwindows 
-ldwmapi -lQt5ThemeSupport -lQt5FontDatabaseSupport -lQt5EventDispatcherSupport 
-lQt5WindowsUIAutomationSupport -lqtfreetype -lQt5Gui/g' Qt5Gui.pc
+   cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Gui/ -lqwindows 
-luxtheme -ldwmapi -lQt5ThemeSupport -lQt5FontDatabaseSupport 
-lQt5EventDispatcherSupport -lQt5WindowsUIAutomationSupport -lqtfreetype 
-lQt5Gui/g' Qt5Gui.pc
+   # Fix Qt5Widget.pc file to include qwindowsvistastyle before Qt5Widget, 
as it depends on it
+   cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Widget/ 
-lqwindowsvistastyle -lQt5Widget/' Qt5Widgets.pc
 endif
 ifdef HAVE_CROSS_COMPILE
# Building Qt build tools for Xcompilation

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] medialibrary: Bump version & reflect API changes

2018-08-23 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Sat Aug 18 
19:28:46 2018 +0200| [8514106fffdeb1c8760ba3984e6d9c78c96d4e85] | committer: 
Hugo Beauzée-Luyssen

medialibrary: Bump version & reflect API changes

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8514106fffdeb1c8760ba3984e6d9c78c96d4e85
---

 contrib/src/medialibrary/rules.mak   |  2 +-
 modules/misc/medialibrary/medialib.cpp   | 30 +++---
 modules/misc/medialibrary/medialibrary.h | 30 +++---
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/contrib/src/medialibrary/rules.mak 
b/contrib/src/medialibrary/rules.mak
index a34e964a67..b6a0cbc69b 100644
--- a/contrib/src/medialibrary/rules.mak
+++ b/contrib/src/medialibrary/rules.mak
@@ -1,4 +1,4 @@
-MEDIALIBRARY_HASH := cc76d54fd87e9376e6fb9dfbdc10b86762256006
+MEDIALIBRARY_HASH := bc1399bf5c3d131596c3e54f6b88e2d983d1e2d8
 MEDIALIBRARY_VERSION := git-$(MEDIALIBRARY_HASH)
 MEDIALIBRARY_GITURL := https://code.videolan.org/videolan/medialibrary.git
 
diff --git a/modules/misc/medialibrary/medialib.cpp 
b/modules/misc/medialibrary/medialib.cpp
index 86652a32ec..f42c1f6948 100644
--- a/modules/misc/medialibrary/medialib.cpp
+++ b/modules/misc/medialibrary/medialib.cpp
@@ -108,77 +108,77 @@ void wrapEntityDeletedEventCallback( 
vlc_medialibrary_module_t* ml,
 
 } // end of anonymous namespace
 
-void MediaLibrary::onMediaAdded( std::vector media )
+void MediaLibrary::onMediaAdded( const std::vector& 
media )
 {
 wrapEntityEventCallback( m_vlc_ml, media, 
VLC_ML_EVENT_MEDIA_ADDED );
 }
 
-void MediaLibrary::onMediaModified( std::vector media )
+void MediaLibrary::onMediaModified( const std::vector& 
media )
 {
 wrapEntityEventCallback( m_vlc_ml, media, 
VLC_ML_EVENT_MEDIA_UPDATED );
 }
 
-void MediaLibrary::onMediaDeleted( std::vector mediaIds )
+void MediaLibrary::onMediaDeleted( const std::vector& mediaIds )
 {
 wrapEntityDeletedEventCallback( m_vlc_ml, mediaIds, 
VLC_ML_EVENT_MEDIA_DELETED );
 }
 
-void MediaLibrary::onArtistsAdded( std::vector 
artists )
+void MediaLibrary::onArtistsAdded( const std::vector& 
artists )
 {
 wrapEntityEventCallback( m_vlc_ml, artists, 
VLC_ML_EVENT_ARTIST_ADDED );
 }
 
-void MediaLibrary::onArtistsModified( std::vector 
artists )
+void MediaLibrary::onArtistsModified( const 
std::vector& artists )
 {
 wrapEntityEventCallback( m_vlc_ml, artists, 
VLC_ML_EVENT_ARTIST_UPDATED );
 }
 
-void MediaLibrary::onArtistsDeleted( std::vector artistIds )
+void MediaLibrary::onArtistsDeleted( const std::vector& artistIds )
 {
 wrapEntityDeletedEventCallback( m_vlc_ml, artistIds, 
VLC_ML_EVENT_ARTIST_DELETED );
 }
 
-void MediaLibrary::onAlbumsAdded( std::vector albums )
+void MediaLibrary::onAlbumsAdded( const std::vector& 
albums )
 {
 wrapEntityEventCallback( m_vlc_ml, albums, 
VLC_ML_EVENT_ALBUM_ADDED );
 }
 
-void MediaLibrary::onAlbumsModified( std::vector 
albums )
+void MediaLibrary::onAlbumsModified( const 
std::vector& albums )
 {
 wrapEntityEventCallback( m_vlc_ml, albums, 
VLC_ML_EVENT_ALBUM_UPDATED );
 }
 
-void MediaLibrary::onAlbumsDeleted( std::vector albumIds )
+void MediaLibrary::onAlbumsDeleted( const std::vector& albumIds )
 {
 wrapEntityDeletedEventCallback( m_vlc_ml, albumIds, 
VLC_ML_EVENT_ALBUM_DELETED );
 }
 
-void MediaLibrary::onPlaylistsAdded( std::vector 
playlists )
+void MediaLibrary::onPlaylistsAdded( const 
std::vector& playlists )
 {
 wrapEntityEventCallback( m_vlc_ml, playlists, 
VLC_ML_EVENT_PLAYLIST_ADDED );
 }
 
-void MediaLibrary::onPlaylistsModified( std::vector 
playlists )
+void MediaLibrary::onPlaylistsModified( const 
std::vector& playlists )
 {
 wrapEntityEventCallback( m_vlc_ml, playlists, 
VLC_ML_EVENT_PLAYLIST_UPDATED );
 }
 
-void MediaLibrary::onPlaylistsDeleted( std::vector playlistIds )
+void MediaLibrary::onPlaylistsDeleted( const std::vector& playlistIds 
)
 {
 wrapEntityDeletedEventCallback( m_vlc_ml, playlistIds, 
VLC_ML_EVENT_PLAYLIST_DELETED );
 }
 
-void MediaLibrary::onGenresAdded( std::vector genres )
+void MediaLibrary::onGenresAdded( const std::vector& 
genres )
 {
 wrapEntityEventCallback( m_vlc_ml, genres, 
VLC_ML_EVENT_GENRE_ADDED );
 }
 
-void MediaLibrary::onGenresModified( std::vector 
genres )
+void MediaLibrary::onGenresModified( const 
std::vector& genres )
 {
 wrapEntityEventCallback( m_vlc_ml, genres, 
VLC_ML_EVENT_GENRE_UPDATED );
 }
 
-void MediaLibrary::onGenresDeleted( std::vector genreIds )
+void MediaLibrary::onGenresDeleted( const std::vector& genreIds )
 {
 wrapEntityDeletedEventCallback( m_vlc_ml, genreIds, 
VLC_ML_EVENT_GENRE_DELETED );
 }
diff --git a/modules/misc/medialibrary/medialibrary.h 
b/modules/misc/medialibrary/medialibrary.h
index 133ca0f30c..f32cc6bcff 100644
--- a/modules/misc/medialibrary/medialibrary.h
+++ b/modules/misc/medialibrary/medialibrary.h
@@ -125,21 +125,21 @@ private:
 
 // IMediaLibraryCb interface
 public:
-virtual void

[vlc-commits] core: config: Fix leak on error

2018-08-23 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Thu Aug 23 
09:57:15 2018 +0200| [3fc25197fa809428a3f555741cca1e3b8dfd6436] | committer: 
Hugo Beauzée-Luyssen

core: config: Fix leak on error

CID #1062584

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3fc25197fa809428a3f555741cca1e3b8dfd6436
---

 src/config/core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/config/core.c b/src/config/core.c
index 0c9e4184f5..b1904e1f64 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -306,6 +306,7 @@ error:
 }
 free(vals);
 free(txts);
+module_list_free (list);
 *values = *texts = NULL;
 return -1;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] add IMM4 support via libavcodec

2018-08-23 Thread Paul B Mahol 
vlc | branch: master | Paul B Mahol  | Thu Aug 23 12:33:44 
2018 +0200| [ad6de6b1add3403f90c78cc9a7d809e1ac6ac208] | committer: Steve Lhomme

add IMM4 support via libavcodec

Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad6de6b1add3403f90c78cc9a7d809e1ac6ac208
---

 NEWS   | 1 +
 modules/codec/avcodec/fourcc.c | 4 
 2 files changed, 5 insertions(+)

diff --git a/NEWS b/NEWS
index 527c9da518..6bc94096de 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ Codecs:
  * WebP image decoding
  * Support for SMPTE-TT image profile
  * Support for 16-bit greyscale
+ * Support IMM4 decoder
 
 Access:
  * Enable SMB2 / SMB3 support on mobile ports with libsmb2
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 0844ca7013..7711090c03 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -300,6 +300,10 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
 #if LIBAVCODEC_VERSION_CHECK( 57, 999, 999, 79, 100 )
 { VLC_CODEC_FMVC, AV_CODEC_ID_FMVC },
 #endif
+
+#if LIBAVCODEC_VERSION_CHECK( 58, 999, 999, 24, 100 )
+{ VLC_CODEC_IMM4, AV_CODEC_ID_IMM4 },
+#endif
 };
 
 /*

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] add IMM4 fourcc

2018-08-23 Thread Paul B Mahol 
vlc | branch: master | Paul B Mahol  | Thu Aug 23 12:33:43 
2018 +0200| [d70689f014cfd9f5252dd68f6c4a6b8a507bde59] | committer: Steve Lhomme

add IMM4 fourcc

Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d70689f014cfd9f5252dd68f6c4a6b8a507bde59
---

 include/vlc_fourcc.h   | 1 +
 src/misc/fourcc_list.h | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index d5f8c208b0..871f01043a 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -187,6 +187,7 @@
 #define VLC_CODEC_SPEEDHQ VLC_FOURCC('S','H','Q','2')
 #define VLC_CODEC_PIXLET  VLC_FOURCC('p','x','l','t')
 #define VLC_CODEC_MAGICYUVVLC_FOURCC('M','8','Y','0')
+#define VLC_CODEC_IMM4VLC_FOURCC('I','M','M','4')
 
 /***
  * Chromas
diff --git a/src/misc/fourcc_list.h b/src/misc/fourcc_list.h
index 284e2afb4d..296dad36a9 100644
--- a/src/misc/fourcc_list.h
+++ b/src/misc/fourcc_list.h
@@ -1151,6 +1151,9 @@ static const staticentry_t p_list_video[] = {
 A("M8Y2"),
 A("M8Y4"),
 A("M8YA"),
+
+B(VLC_CODEC_IMM4, "Infinity IMM4"),
+A("IMM4"),
 };
 
 static const staticentry_t p_list_audio[] = {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] doc: sdl_opengl_player: don't use precision qualifier

2018-08-23 Thread Zhao Zhili 
vlc | branch: master | Zhao Zhili  | Thu Aug 23 
16:43:01 2018 +0800| [7abd50b55ad4323903a0333a056da5a8e55b3030] | committer: 
Thomas Guillem

doc: sdl_opengl_player: don't use precision qualifier

Fix fragment shader compilation error:
0:1(1): error: syntax error, unexpected NEW_IDENTIFIER

Signed-off-by: Thomas Guillem 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7abd50b55ad4323903a0333a056da5a8e55b3030
---

 doc/libvlc/sdl_opengl_player.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/libvlc/sdl_opengl_player.cpp b/doc/libvlc/sdl_opengl_player.cpp
index b36c4685f0..6858e1fba1 100644
--- a/doc/libvlc/sdl_opengl_player.cpp
+++ b/doc/libvlc/sdl_opengl_player.cpp
@@ -35,7 +35,6 @@ const GLchar* vertexSource =
 "} \n";
 
 const GLchar* fragmentSource =
-"precision mediump float;  \n"
 "uniform sampler2D u_videotex; \n"
 "varying vec2 v_TexCoordinate; \n"
 "void main()   \n"

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vgl: don't call cleanup callback if nothing has done

2018-08-23 Thread Zhao Zhili 
vlc | branch: master | Zhao Zhili  | Thu Aug 23 
17:24:19 2018 +0800| [1089b77dc9f315f946881f38250d04bf265da270] | committer: 
Thomas Guillem

vgl: don't call cleanup callback if nothing has done

Signed-off-by: Thomas Guillem 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1089b77dc9f315f946881f38250d04bf265da270
---

 modules/video_output/vgl.c | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/vgl.c b/modules/video_output/vgl.c
index 6af8c674e4..6a69a3751e 100644
--- a/modules/video_output/vgl.c
+++ b/modules/video_output/vgl.c
@@ -99,7 +99,7 @@ static void Close(vlc_object_t *object)
 var = var_InheritAddress(gl, varname); \
 if( !var ) {   \
 msg_Err( gl, "%s address is missing", varname );   \
-goto error;\
+return VLC_EGENERIC;   \
 }  \
 } while( 0 )
 
@@ -131,14 +131,10 @@ static int Open(vlc_object_t *object)
 if( !sys->setupCb(sys->opaque) )
 {
 msg_Err( gl, "user setup failed" );
-goto error;
+return VLC_EGENERIC;
 }
 
 return VLC_SUCCESS;
-
-error:
-Close(object);
-return VLC_EGENERIC;
 }
 
 #undef SET_CALLBACK_ADDR

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vgl: remove unused member

2018-08-23 Thread Zhao Zhili 
vlc | branch: master | Zhao Zhili  | Thu Aug 23 
16:42:58 2018 +0800| [fc5b67d942b97e2bbc622f064844671fce0263f6] | committer: 
Thomas Guillem

vgl: remove unused member

Signed-off-by: Thomas Guillem 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fc5b67d942b97e2bbc622f064844671fce0263f6
---

 modules/video_output/vgl.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/video_output/vgl.c b/modules/video_output/vgl.c
index 2d7a17eda0..6af8c674e4 100644
--- a/modules/video_output/vgl.c
+++ b/modules/video_output/vgl.c
@@ -31,8 +31,6 @@
 
 struct vout_display_sys_t
 {
-vlc_gl_t  *gl;
-
 void (*cleanupCb)(void* opaque);
 bool (*setupCb)(void* opaque);
 void (*resizeCb)(void* opaque, unsigned, unsigned);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] doc: sdl_opengl_player: check OpenGL compile and link status

2018-08-23 Thread Zhao Zhili 
vlc | branch: master | Zhao Zhili  | Thu Aug 23 
16:43:00 2018 +0800| [77fa1e6de3f56bcde473de2e33699a97d97c954f] | committer: 
Thomas Guillem

doc: sdl_opengl_player: check OpenGL compile and link status

Signed-off-by: Thomas Guillem 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=77fa1e6de3f56bcde473de2e33699a97d97c954f
---

 doc/libvlc/sdl_opengl_player.cpp | 50 +++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/doc/libvlc/sdl_opengl_player.cpp b/doc/libvlc/sdl_opengl_player.cpp
index a9c1a43c5a..b36c4685f0 100644
--- a/doc/libvlc/sdl_opengl_player.cpp
+++ b/doc/libvlc/sdl_opengl_player.cpp
@@ -3,9 +3,12 @@
 /* Licence WTFPL  */
 /* Written by Pierre Lamot */
 
+#include 
+#include 
+
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #define GL_GLEXT_PROTOTYPES 1
@@ -271,11 +274,56 @@ int main(int argc, char** argv)
 glShaderSource(fragmentShader, 1, , NULL);
 glCompileShader(fragmentShader);
 
+{
+GLuint shader[] = {vertexShader, fragmentShader};
+const char *shaderName[] = {"vertex", "fragment"};
+for (int i = 0; i < 2; i++) {
+int len;
+glGetShaderiv(shader[i], GL_INFO_LOG_LENGTH, );
+if (len <= 1)
+continue;
+std::vector infoLog(len);
+int charsWritten;
+glGetShaderInfoLog(shader[i], len, , infoLog.data());
+fprintf(stderr, "%s shader info log: %s\n", shaderName[i], 
infoLog.data());
+
+GLint status = GL_TRUE;
+glGetShaderiv(shader[i], GL_COMPILE_STATUS, );
+if (status == GL_FALSE) {
+fprintf(stderr, "compile %s shader failed\n", shaderName[i]);
+SDL_DestroyWindow(wnd);
+SDL_Quit();
+return 1;
+}
+}
+}
+
 // Link the vertex and fragment shader into a shader program
 GLuint shaderProgram = glCreateProgram();
 glAttachShader(shaderProgram, vertexShader);
 glAttachShader(shaderProgram, fragmentShader);
 glLinkProgram(shaderProgram);
+
+{
+int len;
+glGetProgramiv(shaderProgram, GL_INFO_LOG_LENGTH, );
+if (len > 1) {
+std::vector infoLog(len);
+int charsWritten;
+glGetProgramInfoLog(shaderProgram, len, , 
infoLog.data());
+fprintf(stderr, "shader program: %s\n", infoLog.data());
+}
+
+GLint status = GL_TRUE;
+glGetProgramiv(shaderProgram, GL_LINK_STATUS, );
+if (status == GL_FALSE) {
+fprintf(stderr, "unable to use program\n");
+SDL_DestroyWindow(wnd);
+SDL_Quit();
+return 1;
+}
+}
+
 glUseProgram(shaderProgram);
 
 // Specify the layout of the vertex data

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits