[vlc-commits] commit: Update Blackmagic DeckLink driver to the 7.9 SDK. (Steinar H. Gunderson )

[git at videolan.org]

vlc | branch: master | Steinar H. Gunderson <steinar+vlc at gunderson.no> | Sun Dec 26 21:07:33 2010 +0000| [fbd6f7c38efeecb2c215dbaaf07b3e076bfb9c2f] | committer: Jean-Baptiste Kempf 

Update Blackmagic DeckLink driver to the 7.9 SDK.

>From 7.6 to 7.9, the method for setting video modes et al was changed,
in a way that is neither backwards nor forwards compatible. Even though
the 7.9 SDK includes some backwards-compatible headers for emulating
older APIs, they are unfortunately not a drop-in replacement, since they
add version numbers to struct names et al. Thus, there is no simple method
of maintaining source-level compatibility with both APIs (even though a
VLC compiled against the 7.6 SDK most likely would work if moved to a
machine with 7.9 driver), and given the choice, we should support the
newest API, as the older SDK isn't even downloadable anymore.

Thus, update unconditionally to the new API, and hope Blackmagic won't
change things too often in the future.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/access/decklink.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index bacbb76..1af30f8 100644
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -371,7 +371,7 @@ static int Open( vlc_object_t *p_this )
         }
 
         msg_Dbg( p_demux, "Setting video input format to 0x%x", conn);
-        result = p_config->SetVideoInputFormat( conn );
+        result = p_config->SetInt( bmdDeckLinkConfigVideoInputConnection, conn );
         if( result != S_OK )
         {
             msg_Err( p_demux, "Failed to set video input connection" );
@@ -397,7 +397,7 @@ static int Open( vlc_object_t *p_this )
         }
 
         msg_Dbg( p_demux, "Setting audio input format to 0x%x", conn);
-        result = p_config->SetAudioInputFormat( conn );
+        result = p_config->SetInt( bmdDeckLinkConfigAudioInputConnection, conn );
         if( result != S_OK )
         {
             msg_Err( p_demux, "Failed to set audio input connection" );