Skip to content

Commit

Permalink
initial commit (sneak preview)
Browse files Browse the repository at this point in the history
  • Loading branch information
cadet committed Apr 15, 2012
0 parents commit ba69f37
Show file tree
Hide file tree
Showing 138 changed files with 52,916 additions and 0 deletions.
Binary file added bin/avcodec-54.dll
Binary file not shown.
Binary file added bin/avdevice-53.dll
Binary file not shown.
Binary file added bin/avfilter-2.dll
Binary file not shown.
Binary file added bin/avformat-54.dll
Binary file not shown.
Binary file added bin/avutil-51.dll
Binary file not shown.
Binary file added bin/data/morph.avi
Binary file not shown.
Binary file added bin/postproc-52.dll
Binary file not shown.
Binary file added bin/swresample-0.dll
Binary file not shown.
Binary file added bin/swscale-2.dll
Binary file not shown.
29 changes: 29 additions & 0 deletions build/vc10/_2RealFFmepgWrapper.sln
@@ -0,0 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_2RealFFmepgWrapper", "_2RealFFmepgWrapper.vcxproj", "{F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CinderFFmpegApp", "..\..\samples\cinderFFmpeg\build\LibFFmpegTest.vcxproj", "{B2EE0762-5BCB-4880-9BE4-1A5B0FD467E8}"
ProjectSection(ProjectDependencies) = postProject
{F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0} = {F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0}.Debug|Win32.ActiveCfg = Debug|Win32
{F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0}.Debug|Win32.Build.0 = Debug|Win32
{F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0}.Release|Win32.ActiveCfg = Release|Win32
{F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0}.Release|Win32.Build.0 = Release|Win32
{B2EE0762-5BCB-4880-9BE4-1A5B0FD467E8}.Debug|Win32.ActiveCfg = Debug|Win32
{B2EE0762-5BCB-4880-9BE4-1A5B0FD467E8}.Debug|Win32.Build.0 = Debug|Win32
{B2EE0762-5BCB-4880-9BE4-1A5B0FD467E8}.Release|Win32.ActiveCfg = Release|Win32
{B2EE0762-5BCB-4880-9BE4-1A5B0FD467E8}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
110 changes: 110 additions & 0 deletions build/vc10/_2RealFFmepgWrapper.vcxproj
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.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="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{F26DFEA1-26E6-4EDB-9390-F83D0B15E9F0}</ProjectGuid>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>_2RealFFmepgWrapper</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CLRSupport>false</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<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>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>..\..\external\ffmpeg\include;..\..\include;..\..\src</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<CompileAsManaged>false</CompileAsManaged>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
</Link>
<Lib>
<AdditionalLibraryDirectories>..\..\external\ffmpeg\lib</AdditionalLibraryDirectories>
<OutputFile>..\..\lib\$(TargetName)_static32_d$(TargetExt)</OutputFile>
<AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>
</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>..\..\external\ffmpeg\include;..\..\include;..\..\src</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
<AdditionalLibraryDirectories>$(FFMPEG_DIR)\lib</AdditionalLibraryDirectories>
</Link>
<Lib>
<AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\external\ffmpeg\lib</AdditionalLibraryDirectories>
<OutputFile>..\..\lib\$(TargetName)_static32$(TargetExt)</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\_2RealFFmpegWrapper.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\_2RealFFmpegWrapper.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
3 changes: 3 additions & 0 deletions build/vc10/_2RealFFmepgWrapper.vcxproj.user
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>
63 changes: 63 additions & 0 deletions docs/readme.txt
@@ -0,0 +1,63 @@
/*
CADET - Center for Advances in Digital Entertainment Technologies
Copyright 2012 University of Applied Science Salzburg / MultiMediaTechnology

http://www.cadet.at
http://multimediatechnology.at/

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.

CADET - Center for Advances in Digital Entertainment Technologies

Authors: Robert Praxmarer
Web: http://www.1n0ut.com
Email: support@cadet.at
Created: 16-04-2011

This wrapper uses FFmpeg, and is licensed and credited as follows:

* copyright (c) 2001 Fabrice Bellard
*
* This FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/

1) build
* just set the environment variables CINDER_DIR and BOOST_DIR to the according directories

2) Todos
* Probe for unknown files, right now crash
* Improve seeking for some files formats (find alternatives to forward encoding)
* Audio integration and syncing
* Playing from Url
* Encoder
* set primary audio/video stream
* more video/audio info
* dealing with dvds chapters...
* setting ffmpeg options (disable and enable)
* better encapsulation ,shared_ptrs, ...
* cross platform

81 changes: 81 additions & 0 deletions external/ffmpeg/README.txt
@@ -0,0 +1,81 @@
This is a FFmpeg win32 shared build by Kyle Schwarz.

Zeranoe's FFmpeg Builds Home Page: <http://ffmpeg.zeranoe.com/builds/>

This build was compiled on: Apr 9 2012 20:31:02

FFmpeg version: 2012-04-09 git-6bfb304
libavutil 51. 46.100 / 51. 46.100
libavcodec 54. 14.101 / 54. 14.101
libavformat 54. 3.100 / 54. 3.100
libavdevice 53. 4.100 / 53. 4.100
libavfilter 2. 67.101 / 2. 67.101
libswscale 2. 1.100 / 2. 1.100
libswresample 0. 10.100 / 0. 10.100
libpostproc 52. 0.100 / 52. 0.100

This FFmpeg was configured with:
--disable-static
--enable-shared
--enable-gpl
--enable-version3
--disable-w32threads
--enable-runtime-cpudetect
--enable-avisynth
--enable-bzlib
--enable-frei0r
--enable-libass
--enable-libcelt
--enable-libopencore-amrnb
--enable-libopencore-amrwb
--enable-libfreetype
--enable-libgsm
--enable-libmp3lame
--enable-libnut
--enable-libopenjpeg
--enable-librtmp
--enable-libschroedinger
--enable-libspeex
--enable-libtheora
--enable-libutvideo
--enable-libvo-aacenc
--enable-libvo-amrwbenc
--enable-libvorbis
--enable-libvpx
--enable-libx264
--enable-libxavs
--enable-libxvid
--enable-zlib

This build was compiled with these external libraries:
bzip2 1.0.6: <http://www.bzip.org/>
CELT 0.11.1: <http://www.celt-codec.org/>
FreeType 2.4.8: <http://www.freetype.org/>
Frei0r 20111008-git-16cfe66: <http://www.piksel.org/frei0r/>
LAME 3.99.5: <http://lame.sourceforge.net/>
libass 0.10.0: <http://code.google.com/p/libass/>
libgsm 1.0.13-3: <http://libgsm.sourcearchive.com/>
Theora 1.1.1: <http://www.theora.org/>
Vorbis 1.3.2: <http://www.vorbis.com/>
libvpx 1.0.0: <http://www.webmproject.org/>
NUT 20110326-git-5e471c2: <git://git.ffmpeg.org/nut>
OpenCORE AMR 0.1.2: <http://sourceforge.net/projects/opencore-amr/>
OpenJPEG 1.5.0: <http://www.openjpeg.org/>
RTMPDump 20120308-git-7340f6d: <http://rtmpdump.mplayerhq.hu/>
Schroedinger 1.0.11: <http://diracvideo.org/>
Speex 1.2rc1: <http://www.speex.org/>
Ut Video 10.2.4: <http://umezawa.dyndns.info/archive/utvideo/>
VisualOn AAC 0.1.2: <http://sourceforge.net/projects/opencore-amr/>
VisualOn AMR-WB 0.1.2: <http://sourceforge.net/projects/opencore-amr/>
x264 20120119-git-da19765: <http://www.videolan.org/developers/x264.html>
XAVS svn-55: <http://xavs.sourceforge.net/>
Xvid 1.3.2: <http://www.xvid.org/>
zlib 1.2.6: <http://zlib.net/>

The source code for this FFmpeg build can be found at: <http://ffmpeg.zeranoe.com/builds/source/ffmpeg/>

This build was compiled on Debian (64-bit): <http://www.debian.org/>

This build was compiled with the MinGW-w64 toolchain: <http://mingw-w64.sourceforge.net/>

License files for each library can be found in the 'licenses' folder.

0 comments on commit ba69f37

Please sign in to comment.