[FFmpeg-devel] [PATCH] Made minor changes to get the decklink avdevice code to build using Visual C++

[Hendrik Leppkes]

On Thu, Apr 13, 2017 at 12:39 PM, Aaron Levinson <alevinsn at aracnet.com> wrote:
> On 4/13/2017 12:36 AM, Hendrik Leppkes wrote:
>> On Thu, Apr 13, 2017 at 5:34 AM, Aaron Levinson <alevinsn at aracnet.com> wrote:
>>> diff --git a/configure b/configure
>>> index adb0060..5b76a33 100755
>>> --- a/configure
>>> +++ b/configure
>>> @@ -3646,6 +3646,8 @@ case "$toolchain" in
>>>          ld_default="$source_path/compat/windows/mslink"
>>>          nm_default="dumpbin -symbols"
>>>          ar_default="lib"
>>> +        decklink_indev_extralibs=""
>>> +        decklink_outdev_extralibs=""
>>>          case "$arch" in
>>>          arm*)
>>>              as_default="armasm"
>>
>> As in the other patch before, the toolchain handling section has no
>> business setting these.
>>
>>> @@ -4902,6 +4904,8 @@ case $target_os in
>>>          fi
>>>          enabled x86_32 && check_ldflags -LARGEADDRESSAWARE
>>>          shlibdir_default="$bindir_default"
>>> +        decklink_outdev_extralibs="$decklink_outdev_extralibs -lole32 -loleaut32"
>>> +        decklink_indev_extralibs="$decklink_indev_extralibs -lole32 -loleaut32"
>>>          SLIBPREF=""
>>>          SLIBSUF=".dll"
>>>          SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
>>
>> I really don't like having these decklink specific things in the OS
>> sections. I know its already there in one section, but I would greatly
>> prefer if this would also be moved into a dedicated decklink section
>> somewhere, instead of littering the msvc/mingw sections.
>> In fact, its now set for both mingw and msvc, so setting it centrally
>> in one place would be even better to avoid duplicating it.
>
> I believe that I've addressed both of these issues with the following new version of the patch.
>
> Thanks,
> Aaron
>
> --------------------------------------------------------------------------------------
>
> From 2e87ce15e9fb27b81b11b88a0660581549cfcfaf Mon Sep 17 00:00:00 2001
> From: Aaron Levinson <alevinsn at aracnet.com>
> Date: Thu, 13 Apr 2017 03:28:40 -0700
> Subject: [PATCH] Made minor changes to get the decklink avdevice code to build using Visual C++.
>
> Purpose: Made minor changes to get the decklink avdevice code
> to build using Visual C++.
>
> Notes: Used Visual Studio 2015 (with update 3) for this.  Also made
> changes to configure per Hendrik Leppkes's review of first version of
> patch.
>
> Comments:
>
> -- configure: Added if enabled decklink section and setting
>    decklink_indev_extralibs and decklink_outdev_extralibs here for
>    both mingw and Windows.  In the case of Windows, the new value,
>    -lole32 and -loleaut32 overwrites the default value.  In the case
>    of mingw, -lole32 and -loleaut32 is added to the default value.
>    Also eliminated the setting of these variables in the mingw section
>    earlier in the file.
>
> -- libavdevice/decklink_common.cpp: Switched the order of the include
>    of libavformat/internal.h to workaround build issues with Visual
>    C++.  See comment in file for more details.
>
> -- libavdevice/decklink_dec.cpp:
> a) Rearranged the include of libavformat/internal.h (for reasons as
>    described above).
> b) Made slight alteration to an argument for call to av_rescale_q() to
>    workaround a compiler error with Visual C++.  This appears to only
>    be an issue when building C++ files with Visual C++.  See comments
>    in code for more details.
>
> -- libavdevice/decklink_enc.cpp: Rearranged the include of
>    libavformat/internal.h (for reasons as described above).
> ---
>  configure                       | 15 +++++++++++++--
>  libavdevice/decklink_common.cpp | 10 +++++++++-
>  libavdevice/decklink_dec.cpp    | 17 +++++++++++++++--
>  libavdevice/decklink_enc.cpp    |  5 ++++-
>  4 files changed, 41 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index a383bf2..9a06437 100755
> --- a/configure
> +++ b/configure
> @@ -4843,8 +4843,6 @@ case $target_os in
>          else
>              target_os=mingw32
>          fi
> -        decklink_outdev_extralibs="$decklink_outdev_extralibs -lole32 -loleaut32"
> -        decklink_indev_extralibs="$decklink_indev_extralibs -lole32 -loleaut32"
>          LIBTARGET=i386
>          if enabled x86_64; then
>              LIBTARGET="i386:x86-64"
> @@ -5946,6 +5944,19 @@ if ! disabled sdl2; then
>  fi
>  enabled sdl2 && enable sdl && add_cflags $sdl2_cflags && add_extralibs $sdl2_libs
>
> +if enabled decklink; then
> +    case $target_os in
> +        mingw32*|mingw64*)
> +            decklink_outdev_extralibs="$decklink_outdev_extralibs -lole32 -loleaut32"
> +            decklink_indev_extralibs="$decklink_indev_extralibs -lole32 -loleaut32"
> +            ;;
> +        win32|win64)
> +            decklink_outdev_extralibs="-lole32 -loleaut32"
> +            decklink_indev_extralibs="-lole32 -loleaut32"
> +            ;;
> +    esac
> +fi
> +

Whats in the extralibs before this block that you need to clear out in
the msvc case?
Maybe that part should just be set conditionally so we can unify this,
and don't set something we need to strip out again after.

- Hendrik