Skip to content

O
onlyoffice_core
Commit d6e351eb authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52392 954022d7-b5bf-4e40-9824-e11837661b57
parent 9f1f0312
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 112 deletions
ASCMediaCore3/ASCAudioBuffer.cpp
View file @ d6e351eb
// AVSAudioBuffer.cpp : Implementation of CAVSAudioBuffer
// ASCAudioBuffer.cpp : Implementation of CASCAudioBuffer
#include "stdafx.h"
#include "AVSAudioBuffer.h"
#include "ASCAudioBuffer.h"
// CAVSAudioBuffer
......
ASCMediaCore3/ASCAudioBuffer.h
View file @ d6e351eb
// AVSAudioBuffer.h : Declaration of the CAVSAudioBuffer
// ASCAudioBuffer.h : Declaration of the CASCAudioBuffer
#pragma once
#include "resource.h" // main symbols
#include "AVSMediaData.h"
#include "AVSAudioData.h"
#include "ASCMediaData.h"
#include "ASCAudioData.h"
#include "MediaDataDefine.h"
#include "AVSUtils.h"
#include "ASCUtils.h"
// IAVSAudioBuffer
[object, uuid("1CB6CE9F-0E75-4B17-8512-668FF3B10745"), dual, pointer_default(unique)]
......
ASCMediaCore3/ASCAudioData.h
View file @ d6e351eb
#pragma once
#include "AVSMediaData.h"
#include "ASCMediaData.h"
[object, uuid("31858644-1101-4825-A7FE-3AA261BA74AC"), dual, pointer_default(unique)]
__interface IAVSAudioData : IAVSMediaData
......
ASCMediaCore3/ASCAudioDataEx.h
View file @ d6e351eb
#pragma once
#include "AVSMediaData.h"
#include "ASCMediaData.h"
[object, uuid("35B7E717-3EF0-4473-884D-A42C41E80AE1"), dual, pointer_default(unique)]
__interface IAVSAudioDataEx : IAVSMediaData
......
ASCMediaCore3/ASCCompressedVideoFrame.h
View file @ d6e351eb
#pragma once
#include "AVSMediaData.h"
#include "ASCMediaData.h"
[object, uuid("D1AB8643-9E1E-4037-A4C1-D166CCF47467"), dual, pointer_default(unique)]
__interface IAVSCompressedVideoFrame : IAVSMediaData
......
ASCMediaCore3/ASCDVDSubpictureFrame.h
View file @ d6e351eb
// AVSDVDSubpictureFrame.h : Declaration of the CAVSDVDSubpictureFrame
// ASCDVDSubpictureFrame.h : Declaration of the CASCDVDSubpictureFrame
#pragma once
#include "resource.h" // main symbols
#include "AVSMediaData.h"
#include "ASCMediaData.h"
#include "MemoryUtils.h"
#include <atlcoll.h>
......
ASCMediaCore3/ASCExtraData.cpp
View file @ d6e351eb
// AVSExtraData.cpp : Implementation of CAVSExtraData
// ASCExtraData.cpp : Implementation of CASCExtraData
#include "stdafx.h"
#include "ATLDefine.h"
#include "AVSExtraData.h"
#include "ASCExtraData.h"
// CAVSExtraData
// CASCExtraData
STDMETHODIMP CAVSExtraData::get_Year(long *pVal)
{
......
ASCMediaCore3/ASCExtraData.h
View file @ d6e351eb
// AVSExtraData.h : Declaration of the CAVSExtraData
// ASCExtraData.h : Declaration of the CASCExtraData
#pragma once
#include "resource.h" // main symbols
#include "../Common/AudioDefines.h" // main symbols
// IAVSExtraData
// IASCExtraData
[
object,
uuid("F04698FD-7956-4BCF-B579-512CBC1ECB0F"),
dual, helpstring("IAVSExtraData Interface"),
dual, helpstring("IASCExtraData Interface"),
pointer_default(unique)
]
__interface IAVSExtraData : IDispatch
......
ASCMediaCore3/ASCMediaCore3.cpp
View file @ d6e351eb
// AVSMediaCore3.cpp : Implementation of DLL Exports.
// ASCMediaCore3.cpp : Implementation of DLL Exports.
#include "stdafx.h"
#include "resource.h"
// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
[ module(dll, uuid = "{F0A0AAE5-06FE-4ABC-A9F1-26BFFEE2A11F}",
name = "AVSMediaCore3",
helpstring = "AVSMediaCore3 1.0 Type Library",
resource_name = "IDR_AVSMEDIACORE3") ];
name = "ASCMediaCore3",
helpstring = "ASCMediaCore3 1.0 Type Library",
resource_name = "IDR_ASCMEDIACORE3") ];
#include "AVSMediaData.h"
#include "AVSAudioData.h"
#include "AVSAudioDataEx.h"
#include "AVSUncompressedVideoFrame.h"
#include "AVSCompressedVideoFrame.h"
#include "AVSVideoFrameColorTransform.h"
#include "AVSDVDSubpictureFrame.h"
#include "AVSVideoFramePainter.h"
#include "AVSVideoFramePainter2.h"
#include "AVSSubtitleData.h"
#include "AVSPacketsAudioData.h"
\ No newline at end of file
#include "ASCMediaData.h"
#include "ASCAudioData.h"
#include "ASCAudioDataEx.h"
#include "ASCUncompressedVideoFrame.h"
#include "ASCCompressedVideoFrame.h"
#include "ASCVideoFrameColorTransform.h"
#include "ASCDVDSubpictureFrame.h"
#include "ASCVideoFramePainter.h"
#include "ASCVideoFramePainter2.h"
#include "ASCSubtitleData.h"
#include "ASCPacketsAudioData.h"
\ No newline at end of file
ASCMediaCore3/ASCMediaCore3.rc
View file @ d6e351eb
......@@ -114,7 +114,7 @@ END
// REGISTRY
//
IDR_AVSMEDIACORE3 REGISTRY "AVSMediaCore3.rgs"
IDR_ASCMEDIACORE3 REGISTRY "ASCMediaCore3.rgs"
/////////////////////////////////////////////////////////////////////////////
//
......@@ -123,7 +123,7 @@ IDR_AVSMEDIACORE3 REGISTRY "AVSMediaCore3.rgs"
STRINGTABLE
BEGIN
IDS_PROJNAME "AVSMediaCore3"
IDS_PROJNAME "ASCMediaCore3"
END
#endif // English (U.S.) resources
......
ASCMediaCore3/ASCMediaCore3.rgs
View file @ d6e351eb
......@@ -2,8 +2,8 @@ HKCR
{
NoRemove AppID
{
'%APPID%' = s 'AVSMediaCore3'
'AVSMediaCore3.DLL'
'%APPID%' = s 'ASCMediaCore3'
'ASCMediaCore3.DLL'
{
val AppID = s '%APPID%'
}
......
ASCMediaCore3/ASCMediaCore3.sln
View file @ d6e351eb
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSMediaCore3", "AVSMediaCore3.vcproj", "{C39EA7A2-78A4-4C36-8CF6-F175EEB51780}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCMediaCore3", "ASCMediaCore3.vcproj", "{C39EA7A2-78A4-4C36-8CF6-F175EEB51780}"
ProjectSection(ProjectDependencies) = postProject
{DCD092A5-1FC9-4A77-BE0B-56B2407F4328} = {DCD092A5-1FC9-4A77-BE0B-56B2407F4328}
EndProjectSection
......
ASCMediaCore3/ASCMediaCore3.vcproj
View file @ d6e351eb
......@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="AVSMediaCore3"
Name="ASCMediaCore3"
ProjectGUID="{C39EA7A2-78A4-4C36-8CF6-F175EEB51780}"
RootNamespace="AVSMediaCore3"
RootNamespace="ASCMediaCore3"
Keyword="AtlProj"
>
<Platforms>
......@@ -47,11 +47,11 @@
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
HeaderFileName="AVSMediaCore3.h"
TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
HeaderFileName="ASCMediaCore3.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSMediaCore3_i.c"
ProxyFileName="AVSMediaCore3_p.c"
InterfaceIdentifierFileName="ASCMediaCore3_i.c"
ProxyFileName="ASCMediaCore3_p.c"
/>
<Tool
Name="VCCLCompilerTool"
......@@ -82,14 +82,14 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies=".\VideoFrameTransformLib\Debug\VideoFrameTransformLib.lib"
OutputFile="$(OutDir)/AVSMediaCore3.dll"
OutputFile="$(OutDir)/ASCMediaCore3.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=".\VideoFrameTransformLib\Debug"
IgnoreDefaultLibraryNames="LIBC;LIBCD"
MergedIDLBaseFileName="_AVSMediaCore3.idl"
MergedIDLBaseFileName="_ASCMediaCore3.idl"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
TargetMachine="1"
/>
<Tool
......@@ -148,11 +148,11 @@
MkTypLibCompatible="false"
TargetEnvironment="3"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
HeaderFileName="AVSMediaCore3.h"
TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
HeaderFileName="ASCMediaCore3.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSMediaCore3_i.c"
ProxyFileName="AVSMediaCore3_p.c"
InterfaceIdentifierFileName="ASCMediaCore3_i.c"
ProxyFileName="ASCMediaCore3_p.c"
/>
<Tool
Name="VCCLCompilerTool"
......@@ -183,14 +183,14 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies=".\VideoFrameTransformLib\Debug\VideoFrameTransformLib.lib"
OutputFile="$(OutDir)/AVSMediaCore3.dll"
OutputFile="$(OutDir)/ASCMediaCore3.dll"
LinkIncremental="2"
AdditionalLibraryDirectories=".\VideoFrameTransformLib\Debug"
IgnoreDefaultLibraryNames="LIBC;LIBCD"
MergedIDLBaseFileName="_AVSMediaCore3.idl"
MergedIDLBaseFileName="_ASCMediaCore3.idl"
GenerateDebugInformation="true"
SubSystem="2"
ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
TargetMachine="17"
/>
<Tool
......@@ -249,11 +249,11 @@
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
HeaderFileName="AVSMediaCore3.h"
TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
HeaderFileName="ASCMediaCore3.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSMediaCore3_i.c"
ProxyFileName="AVSMediaCore3_p.c"
InterfaceIdentifierFileName="ASCMediaCore3_i.c"
ProxyFileName="ASCMediaCore3_p.c"
/>
<Tool
Name="VCCLCompilerTool"
......@@ -284,15 +284,15 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies=".\VideoFrameTransformLib\Release\VideoFrameTransformLib.lib"
OutputFile="$(OutDir)/AVSMediaCore3.dll"
OutputFile="$(OutDir)/ASCMediaCore3.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="LIBC,LIBCMT"
MergedIDLBaseFileName="_AVSMediaCore3.idl"
MergedIDLBaseFileName="_ASCMediaCore3.idl"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
TargetMachine="1"
/>
<Tool
......@@ -351,11 +351,11 @@
MkTypLibCompatible="false"
TargetEnvironment="3"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
HeaderFileName="AVSMediaCore3.h"
TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
HeaderFileName="ASCMediaCore3.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSMediaCore3_i.c"
ProxyFileName="AVSMediaCore3_p.c"
InterfaceIdentifierFileName="ASCMediaCore3_i.c"
ProxyFileName="ASCMediaCore3_p.c"
/>
<Tool
Name="VCCLCompilerTool"
......@@ -386,15 +386,15 @@
Name="VCLinkerTool"
IgnoreImportLibrary="true"
AdditionalDependencies=".\VideoFrameTransformLib\Release\VideoFrameTransformLib.lib"
OutputFile="$(OutDir)/AVSMediaCore3.dll"
OutputFile="$(OutDir)/ASCMediaCore3.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="LIBC,LIBCMT"
MergedIDLBaseFileName="_AVSMediaCore3.idl"
MergedIDLBaseFileName="_ASCMediaCore3.idl"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
TargetMachine="17"
/>
<Tool
......@@ -454,11 +454,11 @@
MkTypLibCompatible="false"
TargetEnvironment="1"
GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSMediaCore3.tlb"
HeaderFileName="AVSMediaCore3.h"
TypeLibraryName="$(IntDir)/ASCMediaCore3.tlb"
HeaderFileName="ASCMediaCore3.h"
DLLDataFileName=""
InterfaceIdentifierFileName="AVSMediaCore3_i.c"
ProxyFileName="AVSMediaCore3_p.c"
InterfaceIdentifierFileName="ASCMediaCore3_i.c"
ProxyFileName="ASCMediaCore3_p.c"
/>
<Tool
Name="VCCLCompilerTool"
......@@ -492,12 +492,12 @@
OutputFile="$(OutDir)/ASCMediaCore3.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="LIBC,LIBCMT"
MergedIDLBaseFileName="_AVSMediaCore3.idl"
MergedIDLBaseFileName="_ASCMediaCore3.idl"
GenerateDebugInformation="true"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSMediaCore3.lib"
ImportLibrary="$(OutDir)/ASCMediaCore3.lib"
TargetMachine="1"
/>
<Tool
......@@ -595,19 +595,19 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="AVSAudioBuffer.cpp"
RelativePath="ASCAudioBuffer.cpp"
>
</File>
<File
RelativePath="AVSExtraData.cpp"
RelativePath="ASCExtraData.cpp"
>
</File>
<File
RelativePath="AVSMediaCore3.cpp"
RelativePath="ASCMediaCore3.cpp"
>
</File>
<File
RelativePath="AVSVideoFrameTransform.cpp"
RelativePath="ASCVideoFrameTransform.cpp"
>
</File>
<File
......@@ -660,63 +660,63 @@
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
RelativePath="AVSAudioBuffer.h"
RelativePath="ASCAudioBuffer.h"
>
</File>
<File
RelativePath="AVSAudioData.h"
RelativePath="ASCAudioData.h"
>
</File>
<File
RelativePath=".\AVSAudioDataEx.h"
RelativePath=".\ASCAudioDataEx.h"
>
</File>
<File
RelativePath="AVSCompressedVideoFrame.h"
RelativePath="ASCCompressedVideoFrame.h"
>
</File>
<File
RelativePath="AVSDVDSubpictureFrame.h"
RelativePath="ASCDVDSubpictureFrame.h"
>
</File>
<File
RelativePath="AVSExtraData.h"
RelativePath="ASCExtraData.h"
>
</File>
<File
RelativePath="AVSMediaBuffer.h"
RelativePath="ASCMediaBuffer.h"
>
</File>
<File
RelativePath="AVSMediaData.h"
RelativePath="ASCMediaData.h"
>
</File>
<File
RelativePath=".\AVSPacketsAudioData.h"
RelativePath=".\ASCPacketsAudioData.h"
>
</File>
<File
RelativePath=".\AVSSubtitleData.h"
RelativePath=".\ASCSubtitleData.h"
>
</File>
<File
RelativePath="AVSUncompressedVideoFrame.h"
RelativePath="ASCUncompressedVideoFrame.h"
>
</File>
<File
RelativePath="AVSVideoFrameColorTransform.h"
RelativePath="ASCVideoFrameColorTransform.h"
>
</File>
<File
RelativePath=".\AVSVideoFramePainter.h"
RelativePath=".\ASCVideoFramePainter.h"
>
</File>
<File
RelativePath=".\AVSVideoFramePainter2.h"
RelativePath=".\ASCVideoFramePainter2.h"
>
</File>
<File
RelativePath="AVSVideoFrameTransform.h"
RelativePath="ASCVideoFrameTransform.h"
>
</File>
<File
......@@ -737,11 +737,11 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
RelativePath="AVSMediaCore3.rc"
RelativePath="ASCMediaCore3.rc"
>
</File>
<File
RelativePath="AVSMediaCore3.rgs"
RelativePath="ASCMediaCore3.rgs"
>
</File>
</Filter>
......@@ -753,7 +753,7 @@
>
</File>
<File
RelativePath="..\Common\AVSVideoStudio3ID.h"
RelativePath="..\Common\ASCVideoStudio3ID.h"
>
</File>
<File
......
ASCMediaCore3/ASCMediaData.h
View file @ d6e351eb
......@@ -4,7 +4,7 @@
#include <MediaFormatDefine.h>
#include <MediaDataDefine.h>
#include <VideoFileErrorDescription.h>
#include "AVSMediaBuffer.h"
#include "ASCMediaBuffer.h"
[object, uuid("C04D2557-D06D-406c-BA7D-27657B1F788C"), dual, pointer_default(unique)]
__interface IAVSMediaData : IDispatch
......
ASCMediaCore3/ASCPacketsAudioData.h
View file @ d6e351eb
#pragma once
#include "AVSAudioData.h"
#include "ASCAudioData.h"
[object, uuid("1B92459A-0727-491b-9E7F-FB0D1AA81F7B"), dual, pointer_default(unique)]
__interface IAVSPacketsAudioData : IAVSAudioData
......
ASCMediaCore3/ASCSubtitleData.h
View file @ d6e351eb
......@@ -2,7 +2,7 @@
#pragma once
#include "resource.h" // main symbols
#include "AVSMediaData.h"
#include "ASCMediaData.h"
#include "MemoryUtils.h"
#include <atlcoll.h>
......
ASCMediaCore3/ASCUncompressedVideoFrame.h
View file @ d6e351eb
#pragma once
#include "AVSMediaData.h"
#include "ASCMediaData.h"
#include "MediaDataStruct.h"
#include "atlenc.h"
......
ASCMediaCore3/ASCVideoFrameColorTransform.h
View file @ d6e351eb
......@@ -2,7 +2,7 @@
#pragma once
#include "resource.h" // main symbols
#include "AVSUncompressedVideoFrame.h"
#include "ASCUncompressedVideoFrame.h"
#include <math.h>
......
ASCMediaCore3/ASCVideoFramePainter.h
View file @ d6e351eb
......@@ -2,8 +2,8 @@
#pragma once
#include "resource.h" // main symbols
#include "AVSUncompressedVideoFrame.h"
#include "AVSVideoFrameTransform.h"
#include "ASCUncompressedVideoFrame.h"
#include "ASCVideoFrameTransform.h"
#include <math.h>
......
ASCMediaCore3/ASCVideoFramePainter2.h
View file @ d6e351eb
// AVSVideoFramePainter.h
// ASCVideoFramePainter.h
#pragma once
#include "resource.h" // main symbols
......
ASCMediaCore3/ASCVideoFrameTransform.cpp
View file @ d6e351eb
// AVSVideoFrameTransform.cpp : Implementation of CAVSVideoFrameTransform
#include "stdafx.h"
#include "AVSVideoFrameTransform.h"
#include "ASCVideoFrameTransform.h"
#include <math.h>
......
ASCMediaCore3/ASCVideoFrameTransform.h
View file @ d6e351eb
......@@ -2,7 +2,7 @@
#pragma once
#include "resource.h" // main symbols
#include "AVSUncompressedVideoFrame.h"
#include "ASCUncompressedVideoFrame.h"
#include "./VideoFrameTransformLib/BaseTransform.h"
......
ASCMediaCore3/DrawLogo.h
View file @ d6e351eb
#pragma once
#include "resource.h" // main symbols
#include "AVSUncompressedVideoFrame.h"
#include "AVSVideoFrameTransform.h"
#include "ASCUncompressedVideoFrame.h"
#include "ASCVideoFrameTransform.h"
#include <math.h>
#import "../../../Redist/AVSMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
#import "../Redist/ASCMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
typedef IAVSUncompressedVideoFrame IMediaFrame;
class CDrawLogo
......
ASCMediaCore3/Resource.h
View file @ d6e351eb
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by AVSMediaCore3.rc
// Used by ASCMediaCore3.rc
//
#define IDS_PROJNAME 100
#define IDR_AVSMEDIACORE3 101
#define IDR_ASCMEDIACORE3 101
// Next default values for new objects
//
......
ASCMediaCore3/stdafx.cpp
View file @ d6e351eb
// stdafx.cpp : source file that includes just the standard includes
// AVSMediaCore3.pch will be the pre-compiled header
// ASCMediaCore3.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
#include "stdafx.h"
ASCMediaCore3/stdafx.h
View file @ d6e351eb
......@@ -44,4 +44,4 @@
using namespace ATL;
#import "..\..\..\Redist\AVSMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat")
\ No newline at end of file
#import "..\Redist\ASCMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat")
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7