diff options
Diffstat (limited to 'Src/vp8x')
-rw-r--r-- | Src/vp8x/api.h | 10 | ||||
-rw-r--r-- | Src/vp8x/main.cpp | 82 | ||||
-rw-r--r-- | Src/vp8x/mkv_vp8x_decoder.cpp | 150 | ||||
-rw-r--r-- | Src/vp8x/mkv_vp8x_decoder.h | 48 | ||||
-rw-r--r-- | Src/vp8x/nsv_vp8_decoder.cpp | 74 | ||||
-rw-r--r-- | Src/vp8x/nsv_vp8_decoder.h | 39 | ||||
-rw-r--r-- | Src/vp8x/resource.h | 14 | ||||
-rw-r--r-- | Src/vp8x/version.rc2 | 39 | ||||
-rw-r--r-- | Src/vp8x/vp8.rc | 76 | ||||
-rw-r--r-- | Src/vp8x/vp8x.sln | 31 | ||||
-rw-r--r-- | Src/vp8x/vp8x.vcxproj | 268 | ||||
-rw-r--r-- | Src/vp8x/vp8x.vcxproj.filters | 44 |
12 files changed, 875 insertions, 0 deletions
diff --git a/Src/vp8x/api.h b/Src/vp8x/api.h new file mode 100644 index 00000000..748cd875 --- /dev/null +++ b/Src/vp8x/api.h @@ -0,0 +1,10 @@ +#pragma once + +#include <api/service/api_service.h> +extern api_service *serviceManager; +#define WASABI_API_SVC serviceManager + + +#include <api/memmgr/api_memmgr.h> +extern api_memmgr *memmgrApi; +#define WASABI_API_MEMMGR memmgrApi
\ No newline at end of file diff --git a/Src/vp8x/main.cpp b/Src/vp8x/main.cpp new file mode 100644 index 00000000..418593cc --- /dev/null +++ b/Src/vp8x/main.cpp @@ -0,0 +1,82 @@ +#define WIN32_LEAN_AND_MEAN +#include "api.h" +#include <bfc/platform/export.h> +#include "../Agave/Component/ifc_wa5component.h" +#include "../nu/Singleton.h" +#include "mkv_vp8x_decoder.h" +#include "nsv_vp8_decoder.h" + +api_service *WASABI_API_SVC=0; +api_memmgr *WASABI_API_MEMMGR=0; + +class VP8XComponent : public ifc_wa5component +{ +public: + void RegisterServices(api_service *service); + int RegisterServicesSafeModeOk(); + void DeregisterServices(api_service *service); +protected: + RECVS_DISPATCH; +}; + +template <class api_T> +void ServiceBuild(api_T *&api_t, GUID factoryGUID_t) +{ + if (WASABI_API_SVC) + { + waServiceFactory *factory = WASABI_API_SVC->service_getServiceByGuid(factoryGUID_t); + if (factory) + api_t = reinterpret_cast<api_T *>( factory->getInterface() ); + } +} + +template <class api_T> +void ServiceRelease(api_T *api_t, GUID factoryGUID_t) +{ + if (WASABI_API_SVC && api_t) + { + waServiceFactory *factory = WASABI_API_SVC->service_getServiceByGuid(factoryGUID_t); + if (factory) + factory->releaseInterface(api_t); + } + api_t = NULL; +} + +MKVDecoder mkv_decoder; +static SingletonServiceFactory<svc_mkvdecoder, MKVDecoder> mkv_factory; +static NSVFactory nsv_decoder; +static SingletonServiceFactory<svc_nsvFactory, NSVFactory> nsv_factory; + +void VP8XComponent::RegisterServices(api_service *service) +{ + WASABI_API_SVC = service; + ServiceBuild(WASABI_API_MEMMGR, memMgrApiServiceGuid); + mkv_factory.Register(WASABI_API_SVC, &mkv_decoder); + nsv_factory.Register(WASABI_API_SVC, &nsv_decoder); +} + +int VP8XComponent::RegisterServicesSafeModeOk() +{ + return 1; +} + +void VP8XComponent::DeregisterServices(api_service *service) +{ + mkv_factory.Deregister(WASABI_API_SVC); + nsv_factory.Deregister(WASABI_API_SVC); + ServiceRelease(WASABI_API_MEMMGR, memMgrApiServiceGuid); +} + +static VP8XComponent component; +extern "C" DLLEXPORT ifc_wa5component *GetWinamp5SystemComponent() +{ + return &component; +} + +#define CBCLASS VP8XComponent +START_DISPATCH; +VCB(API_WA5COMPONENT_REGISTERSERVICES, RegisterServices) +CB(15, RegisterServicesSafeModeOk) +VCB(API_WA5COMPONENT_DEREEGISTERSERVICES, DeregisterServices) +END_DISPATCH; +#undef CBCLASS
\ No newline at end of file diff --git a/Src/vp8x/mkv_vp8x_decoder.cpp b/Src/vp8x/mkv_vp8x_decoder.cpp new file mode 100644 index 00000000..e9471e38 --- /dev/null +++ b/Src/vp8x/mkv_vp8x_decoder.cpp @@ -0,0 +1,150 @@ +#include "mkv_vp8x_decoder.h" +#include "../nsmkv/Lacing.h" +#include "../nsmkv/Cluster.h" +#include <mmsystem.h> + +int MKVDecoder::CreateVideoDecoder(const char *codec_id, const nsmkv::TrackEntryData *track_entry_data, const nsmkv::VideoData *video_data, ifc_mkvvideodecoder **decoder) +{ + if (!strcmp(codec_id, "V_VP8")) + { + vpx_codec_ctx_t codec; + if (vpx_codec_dec_init(&codec, &vpx_codec_vp8_dx_algo, NULL, 0) == VPX_CODEC_OK) + { + MKVVP8 *vp8 = new MKVVP8(codec, video_data); + *decoder = vp8; + return CREATEDECODER_SUCCESS; + } +#if 0 + + nsmkv::LacingState lacing_state; + if (nsmkv::Lacing::GetState(nsmkv::BlockBinary::XIPH_LACING, (const uint8_t *)track_entry_data->codec_private, track_entry_data->codec_private_len, &lacing_state)) + { + const uint8_t *frame; + size_t frame_len; + uint16_t frame_number=0; + while (nsmkv::Lacing::GetFrame(frame_number, (const uint8_t *)track_entry_data->codec_private, track_entry_data->codec_private_len, &frame, &frame_len, &lacing_state)) + { + ogg_packet packet = {const_cast<uint8_t *>(frame), frame_len, (frame_number==0), 0, 0 /*-1?*/, theora->packet_number++}; + int ret = th_decode_headerin(&theora->info, &theora->comment, &theora->setup, &packet); + if (ret < 0) + goto bail; + frame_number++; + } + theora->decoder = th_decode_alloc(&theora->info, theora->setup); + if (!theora->decoder) + goto bail; + + *decoder = theora; + return CREATEDECODER_SUCCESS; + } + +bail: + delete theora; +#endif + return CREATEDECODER_FAILURE; + + } + else + { + return CREATEDECODER_NOT_MINE; + } +} + + +#define CBCLASS MKVDecoder +START_DISPATCH; +CB(CREATE_VIDEO_DECODER, CreateVideoDecoder) +END_DISPATCH; +#undef CBCLASS + +MKVVP8::MKVVP8(vpx_codec_ctx_t decoder, const nsmkv::VideoData *video_data) : decoder(decoder), video_data(video_data) +{ + flushing=false; +} + +int MKVVP8::GetOutputProperties(int *x, int *y, int *color_format, double *aspect_ratio) +{ + vpx_codec_stream_info_t stream_info; + stream_info.sz = sizeof(stream_info); + if (vpx_codec_get_stream_info(&decoder, &stream_info) == VPX_CODEC_OK) + { + *x = stream_info.w; + *y = stream_info.h; + *aspect_ratio=1.0; + *color_format = mmioFOURCC('Y','V','1','2'); + return MKV_SUCCESS; + } + + return MKV_FAILURE; +} + +int MKVVP8::DecodeBlock(const void *inputBuffer, size_t inputBufferBytes, uint64_t timestamp) +{ + frame_iterator = 0; + vpx_codec_decode(&decoder, (const uint8_t *)inputBuffer, (unsigned int)inputBufferBytes, 0, 0); + return MKV_SUCCESS; +} + +void MKVVP8::Flush() +{ + flushing=true; +} + +int MKVVP8::GetPicture(void **data, void **decoder_data, uint64_t *timestamp) +{ + if (flushing) + { + vpx_codec_stream_info_t stream_info; + stream_info.sz = sizeof(stream_info); + if (vpx_codec_get_stream_info(&decoder, &stream_info) == VPX_CODEC_OK) + { + if (!stream_info.is_kf) + return MKV_FAILURE; + flushing=false; + } + } + + vpx_image_t *image = vpx_codec_get_frame(&decoder, &frame_iterator); + if (image) + { + planes.y.baseAddr = image->planes[0]; + planes.y.rowBytes = image->stride[0]; + planes.u.baseAddr = image->planes[1]; + planes.u.rowBytes = image->stride[1]; + planes.v.baseAddr = image->planes[2]; + planes.v.rowBytes = image->stride[2]; + *data = &planes; + *decoder_data = 0; + + return MKV_SUCCESS; + } + + return MKV_FAILURE; +} + +void MKVVP8::FreePicture(void *data, void *decoder_data) +{ +} + +void MKVVP8::HurryUp(int state) +{ +} + +void MKVVP8::Close() +{ + vpx_codec_destroy(&decoder); + delete this; +} + +#define CBCLASS MKVVP8 +START_DISPATCH; +CB(GET_OUTPUT_PROPERTIES, GetOutputProperties) +CB(DECODE_BLOCK, DecodeBlock) +VCB(FLUSH, Flush) +CB(GET_PICTURE, GetPicture) +VCB(FREE_PICTURE, FreePicture) +VCB(HURRY_UP, HurryUp) +VCB(CLOSE, Close) +END_DISPATCH; +#undef CBCLASS + diff --git a/Src/vp8x/mkv_vp8x_decoder.h b/Src/vp8x/mkv_vp8x_decoder.h new file mode 100644 index 00000000..ecc474d2 --- /dev/null +++ b/Src/vp8x/mkv_vp8x_decoder.h @@ -0,0 +1,48 @@ +#pragma once +#define VPX_CODEC_DISABLE_COMPAT 1 + +#include <vpx/vpx_decoder.h> + +#include <vpx/vp8dx.h> + +#include "../Plugins/Input/in_mkv/svc_mkvdecoder.h" +#include "../Plugins/Input/in_mkv/ifc_mkvvideodecoder.h" +#include "../Winamp/wa_ipc.h" +// {23D36C12-E1DF-461b-9616-969C73BD2785} +static const GUID mkv_vp8_guid = +{ 0x23d36c12, 0xe1df, 0x461b, { 0x96, 0x16, 0x96, 0x9c, 0x73, 0xbd, 0x27, 0x85 } }; + +class MKVDecoder : public svc_mkvdecoder +{ +public: + static const char *getServiceName() { return "VP8 MKV Decoder"; } + static GUID getServiceGuid() { return mkv_vp8_guid; } + int CreateVideoDecoder(const char *codec_id, const nsmkv::TrackEntryData *track_entry_data, const nsmkv::VideoData *video_data, ifc_mkvvideodecoder **decoder); +protected: + RECVS_DISPATCH; +}; + + +class MKVVP8: public ifc_mkvvideodecoder +{ +public: + friend class MKVDecoder; + MKVVP8(vpx_codec_ctx_t decoder, const nsmkv::VideoData *video_data); + + int GetOutputProperties(int *x, int *y, int *color_format, double *aspect_ratio); + int DecodeBlock(const void *inputBuffer, size_t inputBufferBytes, uint64_t timestamp); + void Flush(); + int GetPicture(void **data, void **decoder_data, uint64_t *timestamp); + void FreePicture(void *data, void *decoder_data); + void HurryUp(int state); + void Close(); +private: + vpx_codec_ctx_t decoder; + const nsmkv::VideoData *video_data; + vpx_codec_iter_t frame_iterator; + YV12_PLANES planes; + bool flushing; +protected: + RECVS_DISPATCH; +}; + diff --git a/Src/vp8x/nsv_vp8_decoder.cpp b/Src/vp8x/nsv_vp8_decoder.cpp new file mode 100644 index 00000000..a7513bef --- /dev/null +++ b/Src/vp8x/nsv_vp8_decoder.cpp @@ -0,0 +1,74 @@ +#include "api.h" +#include "nsv_vp8_decoder.h" +#include "../nsv/nsvlib.h" +#include <new> + +IVideoDecoder *NSVFactory::CreateVideoDecoder(int w, int h, double framerate, unsigned int fmt, int *flip) +{ + if (fmt == NSV_MAKETYPE('V','P','8','0')) + { + *flip=1; + void *mem = WASABI_API_MEMMGR->sysMalloc(sizeof(VP8_Decoder)); + VP8_Decoder *dec = new (mem) VP8_Decoder(w,h); + return dec; + } + return NULL; +} + +#define CBCLASS NSVFactory +START_DISPATCH; +CB(SVC_NSVFACTORY_CREATEVIDEODECODER, CreateVideoDecoder) +END_DISPATCH; +#undef CBCLASS + + +VP8_Decoder::VP8_Decoder(int w, int h) +{ + vpx_codec_dec_init(&decoder, &vpx_codec_vp8_dx_algo, NULL, 0); +} + + +VP8_Decoder::~VP8_Decoder() +{ + vpx_codec_destroy(&decoder); +} + +int VP8_Decoder::decode(int need_kf, + void *in, int in_len, + void **out, // out is set to a pointer to data + unsigned int *out_type, // 'Y','V','1','2' is currently defined + int *is_kf) +{ + unsigned char *data=(unsigned char *)in; + + if (in_len) + { + vpx_codec_decode(&decoder, (const uint8_t *)in, in_len, 0, 0); + + vpx_codec_stream_info_t stream_info; + stream_info.sz = sizeof(stream_info); + if (vpx_codec_get_stream_info(&decoder, &stream_info) == VPX_CODEC_OK) + { + *is_kf = stream_info.is_kf; + if (need_kf && !stream_info.is_kf) + return 0; + } + } + + *out_type=NSV_MAKETYPE('Y','V','1','2'); + + vpx_codec_iter_t frame_iterator = 0; + vpx_image_t *image = vpx_codec_get_frame(&decoder, &frame_iterator); + if (image) + { + planes.y.baseAddr = image->planes[0]; + planes.y.rowBytes = image->stride[0]; + planes.u.baseAddr = image->planes[1]; + planes.u.rowBytes = image->stride[1]; + planes.v.baseAddr = image->planes[2]; + planes.v.rowBytes = image->stride[2]; + *out = &planes; + return 0; + } + return 0; +} diff --git a/Src/vp8x/nsv_vp8_decoder.h b/Src/vp8x/nsv_vp8_decoder.h new file mode 100644 index 00000000..e45795ec --- /dev/null +++ b/Src/vp8x/nsv_vp8_decoder.h @@ -0,0 +1,39 @@ +#pragma once +#include "../nsv/svc_nsvFactory.h" +#include "../nsv/dec_if.h" +#define VPX_CODEC_DISABLE_COMPAT 1 +#include <vpx/vpx_decoder.h> +#include <vpx/vp8dx.h> + +// {9CF1837B-4A88-433d-B54B-9C783D39974F} +static const GUID vp8_nsv_guid = +{ 0x9cf1837b, 0x4a88, 0x433d, { 0xb5, 0x4b, 0x9c, 0x78, 0x3d, 0x39, 0x97, 0x4f } }; + + +class NSVFactory : public svc_nsvFactory +{ +public: + static const char *getServiceName() { return "VP8 NSV Decoder"; } + static GUID getServiceGuid() { return vp8_nsv_guid; } + IVideoDecoder *CreateVideoDecoder(int w, int h, double framerate, unsigned int fmt, int *flip); + +protected: + RECVS_DISPATCH; +}; + + +class VP8_Decoder : public IVideoDecoder +{ + public: + VP8_Decoder(int w, int h); + ~VP8_Decoder(); + int decode(int need_kf, + void *in, int in_len, + void **out, // out is set to a pointer to data + unsigned int *out_type, // 'Y','V','1','2' is currently defined + int *is_kf); + void flush() { } + private: + vpx_codec_ctx_t decoder; + YV12_PLANES planes; +}; diff --git a/Src/vp8x/resource.h b/Src/vp8x/resource.h new file mode 100644 index 00000000..c0cb3913 --- /dev/null +++ b/Src/vp8x/resource.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by vp8.rc + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/Src/vp8x/version.rc2 b/Src/vp8x/version.rc2 new file mode 100644 index 00000000..fcf5ff63 --- /dev/null +++ b/Src/vp8x/version.rc2 @@ -0,0 +1,39 @@ + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// +#include "../Winamp/buildType.h" +VS_VERSION_INFO VERSIONINFO + FILEVERSION WINAMP_PRODUCTVER + PRODUCTVERSION WINAMP_PRODUCTVER + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Winamp SA" + VALUE "FileDescription", "Winamp 5.x System Component" + VALUE "FileVersion", STR_WINAMP_PRODUCTVER + VALUE "InternalName", "vp8.w5s" + VALUE "LegalCopyright", "Copyright © 2010-2023 Winamp SA" + VALUE "LegalTrademarks", "Nullsoft and Winamp are trademarks of Winamp SA" + VALUE "OriginalFilename", "vp8.w5s" + VALUE "ProductName", "Winamp VP8 Decoder Service" + VALUE "ProductVersion", STR_WINAMP_PRODUCTVER + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END diff --git a/Src/vp8x/vp8.rc b/Src/vp8x/vp8.rc new file mode 100644 index 00000000..fcff7711 --- /dev/null +++ b/Src/vp8x/vp8.rc @@ -0,0 +1,76 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (U.K.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "#include ""version.rc2""\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.K.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#include "version.rc2" + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/Src/vp8x/vp8x.sln b/Src/vp8x/vp8x.sln new file mode 100644 index 00000000..609b57a4 --- /dev/null +++ b/Src/vp8x/vp8x.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29806.167 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vp8", "vp8x.vcxproj", "{D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Debug|Win32.ActiveCfg = Debug|Win32 + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Debug|Win32.Build.0 = Debug|Win32 + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Debug|x64.ActiveCfg = Debug|x64 + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Debug|x64.Build.0 = Debug|x64 + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Release|Win32.ActiveCfg = Release|Win32 + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Release|Win32.Build.0 = Release|Win32 + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Release|x64.ActiveCfg = Release|x64 + {D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {480BB411-068F-478D-9919-20299A6338EC} + EndGlobalSection +EndGlobal diff --git a/Src/vp8x/vp8x.vcxproj b/Src/vp8x/vp8x.vcxproj new file mode 100644 index 00000000..c19687ac --- /dev/null +++ b/Src/vp8x/vp8x.vcxproj @@ -0,0 +1,268 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{D5282FF2-0DA0-411E-B9D3-8BE9BFAFECAD}</ProjectGuid> + <RootNamespace>vp8</RootNamespace> + <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>DynamicLibrary</ConfigurationType> + <PlatformToolset>v142</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>$(PlatformShortName)_$(Configuration)\</OutDir> + <IntDir>$(PlatformShortName)_$(Configuration)\</IntDir> + <TargetName>vp8</TargetName> + <TargetExt>.w5s</TargetExt> + <IncludePath>$(IncludePath)</IncludePath> + <LibraryPath>$(LibraryPath)</LibraryPath> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>$(PlatformShortName)_$(Configuration)\</OutDir> + <IntDir>$(PlatformShortName)_$(Configuration)\</IntDir> + <TargetName>vp8</TargetName> + <TargetExt>.w5s</TargetExt> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>$(PlatformShortName)_$(Configuration)\</OutDir> + <IntDir>$(PlatformShortName)_$(Configuration)\</IntDir> + <TargetName>vp8</TargetName> + <TargetExt>.w5s</TargetExt> + <IncludePath>$(IncludePath)</IncludePath> + <LibraryPath>$(LibraryPath)</LibraryPath> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <LinkIncremental>false</LinkIncremental> + <OutDir>$(PlatformShortName)_$(Configuration)\</OutDir> + <IntDir>$(PlatformShortName)_$(Configuration)\</IntDir> + <TargetName>vp8</TargetName> + <TargetExt>.w5s</TargetExt> + </PropertyGroup> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>false</VcpkgEnableManifest> + </PropertyGroup> + <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <VcpkgUseStatic>false</VcpkgUseStatic> + <VcpkgInstalledDir> + </VcpkgInstalledDir> + <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet> + </PropertyGroup> + <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <VcpkgUseStatic>false</VcpkgUseStatic> + <VcpkgInstalledDir> + </VcpkgInstalledDir> + <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet> + </PropertyGroup> + <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <VcpkgInstalledDir> + </VcpkgInstalledDir> + <VcpkgUseStatic>false</VcpkgUseStatic> + <VcpkgConfiguration>Debug</VcpkgConfiguration> + <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet> + </PropertyGroup> + <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <VcpkgInstalledDir> + </VcpkgInstalledDir> + <VcpkgUseStatic>false</VcpkgUseStatic> + <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet> + <VcpkgConfiguration>Debug</VcpkgConfiguration> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..;../Wasabi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + </Link> + <PostBuildEvent> + <Command>xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\ +xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\ </Command> + <Message>Post build event: 'xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\'</Message> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>..;../Wasabi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;VP8X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>false</MinimalRebuild> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + </Link> + <PostBuildEvent> + <Command>xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\ +xcopy /Y /D $(IntDir)$(TargetName).pdb ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\ </Command> + <Message>Post build event: 'xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\'</Message> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <Optimization>MinSpace</Optimization> + <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>..;../Wasabi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;VP8X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>None</DebugInformationFormat> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>false</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <ImportLibrary>$(ProjectDir)x86_Release\$(TargetName).lib</ImportLibrary> + <TargetMachine>MachineX86</TargetMachine> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + <PostBuildEvent> + <Command>xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\ </Command> + <Message>Post build event: 'xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\'</Message> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <Optimization>MinSpace</Optimization> + <FavorSizeOrSpeed>Size</FavorSizeOrSpeed> + <IntrinsicFunctions>true</IntrinsicFunctions> + <AdditionalIncludeDirectories>..;../Wasabi;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;VP8X_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <MultiProcessorCompilation>true</MultiProcessorCompilation> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>None</DebugInformationFormat> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <GenerateDebugInformation>false</GenerateDebugInformation> + <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <ImportLibrary>$(ProjectDir)x64_Release\$(TargetName).lib</ImportLibrary> + <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers> + </Link> + <PostBuildEvent> + <Command>xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\ </Command> + <Message>Post build event: 'xcopy /Y /D $(OutDir)$(TargetName)$(TargetExt) ..\..\Build\Winamp_$(PlatformShortName)_$(Configuration)\System\'</Message> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="main.cpp" /> + <ClCompile Include="mkv_vp8x_decoder.cpp" /> + <ClCompile Include="nsv_vp8_decoder.cpp" /> + </ItemGroup> + <ItemGroup> + <ClInclude Include="api.h" /> + <ClInclude Include="mkv_vp8x_decoder.h" /> + <ClInclude Include="nsv_vp8_decoder.h" /> + <ClInclude Include="resource.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="vp8.rc" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Wasabi\Wasabi.vcxproj"> + <Project>{3e0bfa8a-b86a-42e9-a33f-ec294f823f7f}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/Src/vp8x/vp8x.vcxproj.filters b/Src/vp8x/vp8x.vcxproj.filters new file mode 100644 index 00000000..c2b9c070 --- /dev/null +++ b/Src/vp8x/vp8x.vcxproj.filters @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="main.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="mkv_vp8x_decoder.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="nsv_vp8_decoder.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="resource.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="nsv_vp8_decoder.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="mkv_vp8x_decoder.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="api.h"> + <Filter>Header Files</Filter> + </ClInclude> + </ItemGroup> + <ItemGroup> + <Filter Include="Header Files"> + <UniqueIdentifier>{ad28a11f-881a-4c88-a66b-525caa03e3aa}</UniqueIdentifier> + </Filter> + <Filter Include="Ressource Files"> + <UniqueIdentifier>{06782e89-d824-4bb0-b484-51a3d2313b3b}</UniqueIdentifier> + </Filter> + <Filter Include="Source Files"> + <UniqueIdentifier>{f8522db9-5af0-4a51-8a8f-eb69b0db9def}</UniqueIdentifier> + </Filter> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="vp8.rc"> + <Filter>Ressource Files</Filter> + </ResourceCompile> + </ItemGroup> +</Project>
\ No newline at end of file |