Commit graph

106 commits

Author SHA1 Message Date
Henrik Rydgård
f328cfe655 Merge pull request #5816 from raven02/patch-8
No need to init packet as 0
2014-04-09 15:01:00 +02:00
kaienfr
a576420547 Remove decode function of SimpleAudioDec and use its class method. 2014-04-08 01:09:28 +02:00
raven02
619039aed6 No need to init packet as {0} 2014-04-07 19:29:57 +08:00
raven02
3fb85dde8f ME : Init packet as {0} 2014-04-06 20:40:04 +08:00
Henrik Rydgård
c724a6c06a Merge pull request #5764 from kaienfr/cleanup
Cleanup SimpleAudioDec
2014-04-06 12:01:05 +02:00
Unknown W. Brackets
91323ebe92 Clear m_sws_ctx when freeing it.
Oops.  May help #5781.
2014-04-01 21:25:03 -07:00
Unknown W. Brackets
0ba0dba63d Correctly free a few FFmpeg resources. 2014-03-30 13:44:32 -07:00
kaienfr
a7e74c74a7 Cleanup SimpleAudioDec
and remove unused AudioCreate fonction, it can be down in the class constructor.
2014-03-29 19:38:14 +01:00
kaienfr
4de5e1b72f Update MediaEngine.cpp
auto s = p.Section("MediaEngine", 1, 3);

if (s >= 3){
		p.Do(m_audioType);
	}
	else{
		m_audioType = PSP_CODEC_AT3PLUS;
	}
2014-03-23 20:28:39 +01:00
kaienfr
0238258129 Update MediaEngine.cpp
Support both old and new savestate for mediaengin.cpp
2014-03-23 20:18:27 +01:00
kaienfr
88f6f0e4af Update MediaEngine.cpp
fix new feature in MediaEngine.cpp
2014-03-23 20:07:21 +01:00
kaienfr
b18252b2b5 Support audio playing (AT3, AT3+, Mp3, AAC) 2014-03-23 19:45:08 +01:00
raven02
84bbbc3e51 Use GE_CMODE instead of TPSM_PIXEL_STORAGE_MODE 2014-02-16 23:15:17 +08:00
raven02
4f744436bb Return -1 when no atrac inited 2014-02-12 21:55:36 +08:00
raven02
7dcf355cd6 MediaEngine : getAudioTimeStamp() returns m_audiopts 2014-02-11 19:24:51 +08:00
Henrik Rydgård
169844cc8c MediaEngine/atrac: Initialize some variables, remove use of some deprecated functions 2014-01-27 14:08:05 +01:00
Henrik Rydgård
cc4882267a Merge pull request #5231 from unknownbrackets/swap
Merge just some endian / swap related fixes
2014-01-26 14:44:52 -08:00
Ced2911
451e80c5c8 [core/MediaEndigne] endian fix for video 2014-01-26 14:27:05 -08:00
Henrik Rydgård
8fa6105472 Initialize m_audiopts 2014-01-26 23:21:39 +01:00
Unknown W. Brackets
af411e6b1e Check for AV_NOPTS_VALUE from ffmpeg pts values.
Apparently it's returning this now.  If we don't have it, just increment.

Fixes #5217.
2014-01-25 14:59:28 -08:00
Unknown W. Brackets
f19d8d2eae Handle alternating video streams a lot better. 2014-01-21 01:16:16 -08:00
Unknown W. Brackets
2a9e674045 Reset "no audio data" flag when adding more data.
It might have audio data.  Although, probably, we should detect this when
sceMpegGetAtracAu() is called.
2014-01-10 16:15:03 -08:00
Unknown W. Brackets
936f34a6b7 Check the audio buffer size just in case.
This way we definitely won't overfill it.
2014-01-04 01:25:42 -08:00
Unknown W. Brackets
4e929764c8 Set the audio/video streams per sceMpegGet*Au().
This fixes #2226, thanks to @raven02 for finding the issue.  Could also
help e.g. Xyanide: Resurrection and a few other games.

The video codec change path is not super well tested, because I couldn't
find a game that triggered it, but it should work.
2014-01-03 09:29:37 -08:00
Unknown W. Brackets
82a7680bab Remove the 5 packet min for openContext.
Should be safer, and with retrying, it's no longer necessary.
2014-01-01 21:00:29 -08:00
Unknown W. Brackets
2c38805791 Retry opening the context if it fails at first.
This fixes #4550, the hang on the crash video in FF4.
2014-01-01 20:47:10 -08:00
Unknown W. Brackets
c1dcebce07 Fix savestates when videos are playing. 2014-01-01 20:44:51 -08:00
Unknown W. Brackets
ce7c5e0cf9 Initialize m_decodingsize to 0.
Fixes #4609, intermittent video issues in Lunar.
_PsmfPlayerFillRingbuffer() expects getRemainSize() to return something
useful even before the context is opened.
2014-01-01 15:14:22 -08:00
Unknown W. Brackets
8e797796e5 Wait for only 5 frames before seeking mpegs.
Workaround for Mana Khemia, ugh... must be more complex logic.  Valkyrie
Profile still works.
2013-12-17 02:00:57 -08:00
Unknown W. Brackets
3204ec94fb Forget video end when more packets are added.
Good for looping videos, for example Burnout.
2013-12-14 11:33:32 -08:00
Unknown W. Brackets
20b81ef552 Don't try to seek the video with too few packets.
Conservatively we seem to need approximately 6, which any video ought to
be longer than.
2013-12-14 11:18:08 -08:00
Unknown W. Brackets
ae0560a1db Ignore bad video decode addresses.
Instead of crashing, even if that's more fun.
2013-12-11 08:21:01 -08:00
Sacha
3e762f2864 Make !USE_FFMPEG savestates compatible. 2013-11-12 18:06:43 +10:00
Sacha
efad755ccc Buildfix !USE_FFMPEG 2013-11-12 17:52:43 +10:00
Henrik Rydgård
0e54e24b24 Revert "Use swap code from native instead. Remove all other versions of it."
Broke movie playback.

This reverts commit 9fcb08a326.

Conflicts:
	native
2013-10-28 17:24:03 +01:00
Sacha
9fcb08a326 Use swap code from native instead. Remove all other versions of it. 2013-10-28 03:07:32 +10:00
Unknown W. Brackets
ad8c4af936 Respect the bgm vol setting for at3, mp3, video. 2013-10-26 19:33:25 -07:00
Henrik Rydgard
f5a63d7d41 Better fix for the UINT_64 define issue on android 2013-10-20 13:52:31 +02:00
Henrik Rydgård
be40289d6c Use ffmpeg for Atrac3+ decoding during video playback as well. 2013-10-19 23:09:26 +02:00
Henrik Rydgård
ac2334386a Move BufferQueue out of the at3 plugin header 2013-10-17 12:31:22 +02:00
Unknown W. Brackets
8fb2cb5bf6 Check log level from ffmpeg, use levels. 2013-09-21 17:19:57 -07:00
shenweip
a62e9f15e9 Implemented sceMpegAvcConvertToYuv420. 2013-09-18 14:05:09 +08:00
The Dax
d102baacd0 Prep PPSSPP for Visual Studio 2013. 2013-09-17 10:27:06 -04:00
Unknown W. Brackets
0c6fbb461d Tweak ffmpeg logging in mp3/atrac as well. 2013-09-16 08:40:38 -07:00
Unknown W. Brackets
d13d8ad946 Avoid writing to stdout/stderr from ffmpeg.
This will log some errors in the log even in release.
2013-09-16 08:35:32 -07:00
Unknown W. Brackets
50e9e45d65 Check version in each DoState() func.
They bail on PointerWrap error or bad version.
2013-09-14 20:23:03 -07:00
Henrik Rydgard
8c88dff5a4 More log categories, use them (and existing ones). Improve log config. 2013-09-07 22:02:55 +02:00
Unknown W. Brackets
bbe13f1d74 Avoid a crash when a bad video stream is specified. 2013-08-29 00:41:22 -07:00
Unknown W. Brackets
8d00ab61e3 Remove the gpu->Resized() on video play.
Doesn't seem necessary anymore, can cause blinking.
2013-08-22 23:55:02 -07:00
Henrik Rydgård
171e202019 Warning fixes 2013-08-20 19:20:03 +02:00