[vlc-commits] [Git][videolan/vlc][master] 5 commits: sout: sdi: remove unused variables

[Steve Lhomme]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
4023ef0a by Steve Lhomme at 2021-06-23T12:56:26+00:00
sout: sdi: remove unused variables

- - - - -
83ceab2f by Steve Lhomme at 2021-06-23T12:56:26+00:00
sout: sdi: only include arpa/inet.h if HAVE_ARPA_INET_H is set

- - - - -
8a6ea97c by Steve Lhomme at 2021-06-23T12:56:26+00:00
access: sdi: include config.h before include VLC headers

- - - - -
10ffa4e3 by Steve Lhomme at 2021-06-23T12:56:26+00:00
access: decklink: remove useless init

The value is either set or we return an error.

- - - - -
c4f8ded2 by Steve Lhomme at 2021-06-23T12:56:26+00:00
decklink: include netinet/in.h or winsock2.h for htonl()

- - - - -


6 changed files:

- modules/access/decklink.cpp
- modules/access/sdi.c
- modules/stream_out/sdi/DBMHelper.cpp
- modules/stream_out/sdi/DBMSDIOutput.cpp
- modules/stream_out/sdi/DBMSDIOutput.hpp
- modules/stream_out/sdi/sdiout.cpp


Changes:

=====================================
modules/access/decklink.cpp
=====================================
@@ -33,6 +33,11 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+#ifdef _WIN32
+# include <winsock2.h>
+#else
+# include <netinet/in.h>
+#endif
 
 #include "vlc_decklink.h"
 #include <DeckLinkAPIDispatch.cpp>
@@ -281,7 +286,7 @@ public:
             return S_OK;
         }
 
-        BMDPixelFormat fmt = 0;
+        BMDPixelFormat fmt;
         switch (flags) {
             case bmdDetectedVideoInputYCbCr422:
                 fmt = sys->tenbits ? bmdFormat10BitYUV : bmdFormat8BitYUV;


=====================================
modules/access/sdi.c
=====================================
@@ -20,6 +20,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "sdi.h"
 
 static inline uint32_t av_le2ne32(uint32_t val)


=====================================
modules/stream_out/sdi/DBMHelper.cpp
=====================================
@@ -28,7 +28,14 @@
 
 #include "DBMHelper.hpp"
 
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
+#ifdef _WIN32
+# include <winsock2.h>
+#else
+# include <netinet/in.h>
+#endif
 
 using namespace Decklink;
 


=====================================
modules/stream_out/sdi/DBMSDIOutput.cpp
=====================================
@@ -45,7 +45,9 @@
 
 #include "sdiout.hpp"
 
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
 
 #define DECKLINK_CARD_BUFFER (CLOCK_FREQ)
 #define DECKLINK_PREROLL (CLOCK_FREQ*3/4)


=====================================
modules/stream_out/sdi/DBMSDIOutput.hpp
=====================================
@@ -65,7 +65,6 @@ namespace sdi_sout
                 BMDTimeValue hardware_reference;
             } clock;
             bool b_running;
-            bool b_prerolled;
             vlc_tick_t streamStartTime;
             int StartPlayback();
             struct


=====================================
modules/stream_out/sdi/sdiout.cpp
=====================================
@@ -101,18 +101,6 @@ static const char *const ppsz_videoconns_text[] = {
     "Composite",
     "S-video",
 };
-static const BMDVideoConnection rgbmd_videoconns[] =
-{
-    bmdVideoConnectionSDI,
-    bmdVideoConnectionHDMI,
-    bmdVideoConnectionOpticalSDI,
-    bmdVideoConnectionComponent,
-    bmdVideoConnectionComposite,
-    bmdVideoConnectionSVideo,
-};
-static_assert(ARRAY_SIZE(rgbmd_videoconns) == ARRAY_SIZE(ppsz_videoconns), "videoconn arrays messed up");
-static_assert(ARRAY_SIZE(rgbmd_videoconns) == ARRAY_SIZE(ppsz_videoconns_text), "videoconn arrays messed up");
-
 static const int rgi_afd_values[] = {
     0, 2, 3, 4, 8, 9, 10, 11, 13, 14, 15,
 };



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/984117e415f74d00aaa874257aec1b664d80afb9...c4f8ded2fb5c6ba4d07ec08dde241e3560dfe14d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/984117e415f74d00aaa874257aec1b664d80afb9...c4f8ded2fb5c6ba4d07ec08dde241e3560dfe14d
You're receiving this email because of your account on code.videolan.org.