Removed stub for x264, not implemented

This commit is contained in:
akallabeth 2021-06-10 09:17:50 +02:00 committed by akallabeth
parent 5fb59a23a9
commit 112400ca66
4 changed files with 0 additions and 163 deletions

View File

@ -1,33 +0,0 @@
if (X264_INCLUDE_DIR AND X264_LIBRARY)
set(X264_FIND_QUIETLY TRUE)
endif (X264_INCLUDE_DIR AND X264_LIBRARY)
find_path(X264_INCLUDE_DIR NAMES x264.h
PATH_SUFFIXES include
HINTS ${X264_ROOT})
find_library(X264_LIBRARY
NAMES x264
PATH_SUFFIXES lib
HINTS ${X264_ROOT})
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(x264 DEFAULT_MSG X264_LIBRARY X264_INCLUDE_DIR)
if (X264_INCLUDE_DIR AND X264_LIBRARY)
set(X264_FOUND TRUE)
set(X264_LIBRARIES ${X264_LIBRARY})
endif (X264_INCLUDE_DIR AND X264_LIBRARY)
if (X264_FOUND)
if (NOT X264_FIND_QUIETLY)
message(STATUS "Found x264: ${X264_LIBRARIES}")
endif (NOT X264_FIND_QUIETLY)
else (X264_FOUND)
if (X264_FIND_REQUIRED)
message(FATAL_ERROR "x264 was not found")
endif(X264_FIND_REQUIRED)
endif (X264_FOUND)
mark_as_advanced(X264_INCLUDE_DIR X264_LIBRARY)

View File

@ -224,12 +224,6 @@ if(WITH_JPEG)
freerdp_library_add(${JPEG_LIBRARIES})
endif()
if(WITH_X264)
set(CODEC_SRCS ${CODEC_SRCS} codec/h264_x264.c)
freerdp_include_directory_add(${X264_INCLUDE_DIR})
freerdp_library_add(${X264_LIBRARIES})
endif()
if(WITH_OPENH264)
set(CODEC_SRCS ${CODEC_SRCS} codec/h264_openh264.c)
freerdp_include_directory_add(${OPENH264_INCLUDE_DIR})

View File

@ -585,13 +585,6 @@ static BOOL CALLBACK h264_register_subsystems(PINIT_ONCE once, PVOID param, PVOI
subSystems[i] = &g_Subsystem_libavcodec;
i++;
}
#endif
#ifdef WITH_X264
{
extern H264_CONTEXT_SUBSYSTEM g_Subsystem_x264;
subSystems[i] = &g_Subsystem_x264;
i++;
}
#endif
return i > 0;
}

View File

@ -1,117 +0,0 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* H.264 Bitmap Compression
*
* Copyright 2015 Marc-André Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define NAL_UNKNOWN X264_NAL_UNKNOWN
#define NAL_SLICE X264_NAL_SLICE
#define NAL_SLICE_DPA X264_NAL_SLICE_DPA
#define NAL_SLICE_DPB X264_NAL_SLICE_DPB
#define NAL_SLICE_DPC X264_NAL_SLICE_DPC
#define NAL_SLICE_IDR X264_NAL_SLICE_IDR
#define NAL_SEI X264_NAL_SEI
#define NAL_SPS X264_NAL_SPS
#define NAL_PPS X264_NAL_PPS
#define NAL_AUD X264_NAL_AUD
#define NAL_FILLER X264_NAL_FILLER
#define NAL_PRIORITY_DISPOSABLE X264_NAL_PRIORITY_DISPOSABLE
#define NAL_PRIORITY_LOW X264_NAL_PRIORITY_LOW
#define NAL_PRIORITY_HIGH X264_NAL_PRIORITY_HIGH
#define NAL_PRIORITY_HIGHEST X264_NAL_PRIORITY_HIGHEST
#include <stdint.h>
#include <x264.h>
#include <freerdp/codec/h264.h>
#error "X264 backend not implemented, please review your configuration!"
struct _H264_CONTEXT_X264
{
void* dummy;
};
typedef struct _H264_CONTEXT_X264 H264_CONTEXT_X264;
static int x264_decompress(H264_CONTEXT* h264, BYTE* pSrcData, UINT32 SrcSize)
{
// H264_CONTEXT_X264* sys = (H264_CONTEXT_X264*) h264->pSystemData;
return -1;
}
static int x264_compress(H264_CONTEXT* h264, const BYTE** ppSrcYuv, const UINT32* pStride,
BYTE** ppDstData, UINT32* pDstSize)
{
// H264_CONTEXT_X264* sys = (H264_CONTEXT_X264*) h264->pSystemData;
return -1;
}
static void x264_uninit(H264_CONTEXT* h264)
{
H264_CONTEXT_X264* sys = (H264_CONTEXT_X264*)h264->pSystemData;
if (sys)
{
free(sys);
h264->pSystemData = NULL;
}
}
static BOOL x264_init(H264_CONTEXT* h264)
{
H264_CONTEXT_X264* sys;
h264->numSystemData = 1;
sys = (H264_CONTEXT_X264*)calloc(h264->numSystemData, sizeof(H264_CONTEXT_X264));
if (!sys)
{
goto EXCEPTION;
}
h264->pSystemData = (void*)sys;
if (h264->Compressor)
{
}
else
{
}
return TRUE;
EXCEPTION:
x264_uninit(h264);
return FALSE;
}
H264_CONTEXT_SUBSYSTEM g_Subsystem_x264 = { "x264", x264_init, x264_uninit, x264_decompress,
x264_compress };
#undef NAL_UNKNOWN
#undef NAL_SLICE
#undef NAL_SLICE_DPA
#undef NAL_SLICE_DPB
#undef NAL_SLICE_DPC
#undef NAL_SLICE_IDR
#undef NAL_SEI
#undef NAL_SPS
#undef NAL_PPS
#undef NAL_AUD
#undef NAL_FILLER
#undef NAL_PRIORITY_DISPOSABLE
#undef NAL_PRIORITY_LOW
#undef NAL_PRIORITY_HIGH
#undef NAL_PRIORITY_HIGHEST