diff --git a/configure.ac b/configure.ac index 25a574d99..fd2cdec39 100644 --- a/configure.ac +++ b/configure.ac @@ -935,8 +935,8 @@ then AJA_CXXFLAGS="-DAJAMac -DAJA_MAC" AJA_LIB="-lajantv2" fi - AJA_CAP_OBJ="src/aja_common.o src/video_capture/aja.o" - AJA_DISP_OBJ="src/aja_common.o src/video_display/aja.o" + AJA_CAP_OBJ="src/video_capture/aja.o" + AJA_DISP_OBJ="src/video_display/aja.o" AC_DEFINE([HAVE_AJA], [1], [Build with AJA support]) ADD_MODULE("display_aja", "$AJA_DISP_OBJ", "$AJA_LIB") diff --git a/src/aja_common.cpp b/src/aja_common.cpp deleted file mode 100644 index e2df63f0d..000000000 --- a/src/aja_common.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file aja_common.cpp - * @author Martin Pulec - */ -/* - * Copyright (c) 2018 CESNET, z. s. p. o. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, is permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of CESNET nor the names of its contributors may be - * used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO - * EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "config_unix.h" -#include "config_win32.h" -#endif - -#include "aja_common.h" - -const std::map ultragrid::aja::codec_map = { - { NTV2_FBF_10BIT_YCBCR, v210 }, - { NTV2_FBF_8BIT_YCBCR, UYVY }, - { NTV2_FBF_RGBA, RGBA }, - { NTV2_FBF_10BIT_RGB, R10k }, - { NTV2_FBF_8BIT_YCBCR_YUY2, YUYV }, - { NTV2_FBF_24BIT_RGB, RGB }, - { NTV2_FBF_24BIT_BGR, BGR }, -}; - diff --git a/src/aja_common.h b/src/aja_common.h index 81a003339..eabc478c1 100644 --- a/src/aja_common.h +++ b/src/aja_common.h @@ -42,7 +42,15 @@ namespace ultragrid { namespace aja { -extern const std::map codec_map; +static const std::map codec_map = { + { NTV2_FBF_10BIT_YCBCR, v210 }, + { NTV2_FBF_8BIT_YCBCR, UYVY }, + { NTV2_FBF_RGBA, RGBA }, + { NTV2_FBF_10BIT_RGB, R10k }, + { NTV2_FBF_8BIT_YCBCR_YUY2, YUYV }, + { NTV2_FBF_24BIT_RGB, RGB }, + { NTV2_FBF_24BIT_BGR, BGR }, +}; } // end of namespace aja } // end of namespace ultragrid