Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sceMpeg and sceAtrac basiclly workable for PC #997

Closed
wants to merge 58 commits into from
Closed

Make sceMpeg and sceAtrac basiclly workable for PC #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
ef0e3e0
add basic support for at3+ audio
oioitff Mar 15, 2013
1ac12b4
add support for video and audio playing
oioitff Mar 15, 2013
b7710ec
add support for finding at3 and pmf file
oioitff Mar 15, 2013
96f59c9
basic implement sceMpeg and sceAtrac
oioitff Mar 15, 2013
1eed307
Try to find out the movie data more accurately
oioitff Mar 17, 2013
19245d9
fix the bugs for playing atrac3 audio (not plus),
oioitff Mar 17, 2013
8fd0e86
Update the files to the latest version
oioitff Mar 17, 2013
f21daec
make more CGs playable and BGMs more complete
oioitff Mar 19, 2013
9865837
Update sceio.cpp to the lastest git version
oioitff Mar 19, 2013
b21fa55
Use a stream buffer instead of loading temp files
oioitff Mar 20, 2013
84e123f
Make it better to support other platforms
oioitff Mar 20, 2013
a77b40e
fix crash issue caused by BGMs for some games
oioitff Mar 20, 2013
2a79879
Update sceAtrac to the lastest git version
oioitff Mar 23, 2013
f650f0d
Implement PsmfPlayer
oioitff Mar 23, 2013
95905b9
fix the bugs for stream buffer
oioitff Mar 25, 2013
073823e
Load path "umd0:" correctly. Now the CGs for FF7
oioitff Mar 25, 2013
1119b2d
fix some bugs for audio
oioitff Mar 28, 2013
56c35d3
Implement the video part in normal way.
oioitff Mar 28, 2013
8bb6462
fix random freeze for CG, especially for android
oioitff Mar 31, 2013
356e79e
Update to the lastest git version.
oioitff Mar 31, 2013
45494f3
Fix the video issue for Queen's Blade. And
oioitff Apr 1, 2013
895286f
Add PGD support for videos and audio, fix
oioitff Apr 1, 2013
d825754
Try to fix the video crash for android
oioitff Apr 1, 2013
ee1caa7
Fix some bugs for audio
oioitff Apr 2, 2013
bb93214
Update to the lastest git version
oioitff Apr 2, 2013
e2b2bb9
Add loop info for audio.
oioitff Apr 3, 2013
fd76b19
Get the correct end sample.
oioitff Apr 3, 2013
1f40d1a
Fix the bgm playing issue when it should stop.
oioitff Apr 6, 2013
53ecdbd
Rewrite and implement sceAtrac with ffmpeg.
oioitff Apr 8, 2013
a4a0470
Implement sceAtracSetHalfwayBuffer and
oioitff Apr 9, 2013
9f4ca07
Fix some HLE issues for sceAtrac.
oioitff Apr 10, 2013
5bb3859
A small check for atrac3 audio.
oioitff Apr 10, 2013
a8bc6eb
Force to reset the read position for atrac3.
oioitff Apr 13, 2013
6c3c4ca
Init some values for low level decoder.
oioitff Apr 13, 2013
c092311
Implement savestate for atrac3/atrac3plus.
oioitff Apr 16, 2013
64bfc69
Remove some useless code
oioitff Apr 16, 2013
1507a4d
make at3tool work correctly
oioitff Apr 18, 2013
1d7713d
Fix the endless loop for audios in some games.
oioitff Apr 19, 2013
41b0337
Return some error codes as a real PSP.
oioitff Apr 20, 2013
bbd181e
Implement sceAtracSetMOut functions
oioitff Apr 21, 2013
b21f05c
Fix some bugs for mediaPlayer.
oioitff Apr 22, 2013
a346198
Fix error decoding audio issue in some games.
oioitff Apr 27, 2013
7b683b1
Fix the crash for some games.
oioitff Apr 27, 2013
e462c9e
Fix broken video image issue.
oioitff Apr 28, 2013
4465b80
Clean up some codes for audio loop.
oioitff Apr 29, 2013
3193e66
Fix savestate for atrac3 audio.
oioitff Apr 29, 2013
e74d069
Fix horrible memory exceeded for atrac3plus audio.
oioitff May 4, 2013
580e968
Cache atrac3plus audio files.
oioitff May 4, 2013
7999bc6
Fix atrac3plus audio crash for some games.
oioitff May 5, 2013
4dd9272
Try to generate a better id.
oioitff May 5, 2013
bb99e72
Fix graphic issue for 3rd birthday after video
oioitff May 5, 2013
a056e27
Revert graphic fix for 3rd birthday.
oioitff May 7, 2013
4b3a739
Improve MpegDemux when audioChannel
oioitff May 7, 2013
fe361fd
Not to cache atrac3plus audios which are
oioitff May 7, 2013
5b6b3aa
Add mutex to avoid random crash for atrac3plus
oioitff May 7, 2013
327bf6f
A foolish bug fix
oioitff May 8, 2013
8c570e5
Improve remainFrame.
oioitff May 8, 2013
24b9306
Only add stream data when it need more atrac data.
oioitff May 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions Core/Core.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../ffmpeg;../ffmpeg/$(Platform)/$(Configuration);../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_FFMPEG_;_USE_DSHOW_;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
Expand All @@ -83,7 +83,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ffmpeg;../ffmpeg/$(Platform)/$(Configuration);../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
Expand All @@ -102,11 +102,11 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ffmpeg;../ffmpeg/$(Platform)/$(Configuration);../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<BufferSecurityCheck>false</BufferSecurityCheck>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<PreprocessorDefinitions>_USE_FFMPEG_;_USE_DSHOW_;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
Expand All @@ -125,7 +125,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../ffmpeg;../ffmpeg/$(Platform)/$(Configuration);../common;..;../native;../native/ext/glew;../ext/zlib</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
Expand Down Expand Up @@ -196,6 +196,7 @@
<ClCompile Include="HLE\sceMpeg.cpp" />
<ClCompile Include="HLE\sceNet.cpp" />
<ClCompile Include="HLE\sceOpenPSID.cpp" />
<ClCompile Include="HLE\sceP3da.cpp" />
<ClCompile Include="HLE\sceParseHttp.cpp" />
<ClCompile Include="HLE\sceParseUri.cpp" />
<ClCompile Include="HLE\scePower.cpp" />
Expand All @@ -212,8 +213,12 @@
<ClCompile Include="HLE\sceVaudio.cpp" />
<ClCompile Include="HLE\__sceAudio.cpp" />
<ClCompile Include="Host.cpp" />
<ClCompile Include="HW\audioPlayer.cpp" />
<ClCompile Include="HW\MediaEngine.cpp" />
<ClCompile Include="HW\mediaPlayer.cpp" />
<ClCompile Include="HW\MemoryStick.cpp" />
<ClCompile Include="HW\MpegDemux.cpp" />
<ClCompile Include="HW\OMAConvert.cpp" />
<ClCompile Include="HW\SasAudio.cpp" />
<ClCompile Include="Loaders.cpp" />
<ClCompile Include="MemMap.cpp" />
Expand Down Expand Up @@ -371,6 +376,7 @@
<ClInclude Include="HLE\sceMpeg.h" />
<ClInclude Include="HLE\sceNet.h" />
<ClInclude Include="HLE\sceOpenPSID.h" />
<ClInclude Include="HLE\sceP3da.h" />
<ClInclude Include="HLE\sceParseHttp.h" />
<ClInclude Include="HLE\sceParseUri.h" />
<ClInclude Include="HLE\scePower.h" />
Expand All @@ -388,7 +394,11 @@
<ClInclude Include="HLE\sceVaudio.h" />
<ClInclude Include="HLE\__sceAudio.h" />
<ClInclude Include="Host.h" />
<ClInclude Include="HW\audioPlayer.h" />
<ClInclude Include="HW\MediaEngine.h" />
<ClInclude Include="HW\mediaPlayer.h" />
<ClInclude Include="HW\MpegDemux.h" />
<ClInclude Include="HW\OMAConvert.h" />
<ClInclude Include="HW\SasAudio.h" />
<ClInclude Include="HW\MemoryStick.h" />
<ClInclude Include="Loaders.h" />
Expand Down
Loading