When seeking to atrac positions, force alignment and start from zero #6976

unknownbrackets · 2014-10-04T17:24:56Z

Starting from zero allows us to actually get the correct data. Otherwise, whether forwards or backwards, we get junk for a frame or two.

This fixes some sound artifacts when looping.

-[Unknown]

daniel229 · 2014-10-05T03:59:54Z

Break BGM in GTA .
57:19:273 mix sound th I[ME]: HW\MediaEngine.cpp:85 FF: Invalid gain location: ch=0, sb=4, pos=1, val=33
57:19:273 mix sound th E[ME]: HLE\sceAtrac.cpp:408 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7
57:19:273 mix sound th I[ME]: HW\MediaEngine.cpp:85 FF: Invalid gain location: ch=0, sb=4, pos=1, val=33
57:19:273 mix sound th E[ME]: HLE\sceAtrac.cpp:408 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7
57:19:273 mix sound th I[ME]: HW\MediaEngine.cpp:85 FF: Invalid gain location: ch=0, sb=4, pos=1, val=33
57:19:273 mix sound th E[ME]: HLE\sceAtrac.cpp:408 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7

unknownbrackets · 2014-10-05T05:41:11Z

When, is that after a seek? Does the same audio also have GHA phase shifting?

Maybe it needs that "forcing" because it's seeking by overwriting frames in the buffer (even though it seems to try to reconstruct the entire file.) But that means we'll never get the right data out of ffmpeg's demuxer.

-[Unknown]

daniel229 · 2014-10-05T06:07:42Z

What is after a seek? But the BGM seems no GHA phase shifting.

unknownbrackets · 2014-10-28T06:15:14Z

Well, should I close this pull?

As long as I'm going to have to create one pull request that simultaneously fixes every bug in sceAtrac, I'm not going to waste my free time on it. This game already logs and reports this error with or without these changes merged, so it's clearly already broken.

And there's no test case or data showing anything except that my change is correct.

So, I'm not going to waste my time further on sceAtrac.

-[Unknown]

hrydgard · 2014-10-28T07:25:41Z

Sorry about that. I was hoping to find time to fix it or make a test case before merging, but I just haven't and then forgot. I'll give it another shot really soon and then probably merge either way...

I agree that it looks like the game is already broken but superficially it actually does appear to work correctly with the current code, which is why I've been dreading the resulting complains flood on a merge...

sum2012 · 2014-11-13T12:23:49Z

I think that we can merge after v1.0.
Then open a issue of it.

daniel229 · 2015-01-11T03:55:49Z

Last changes help #7278 and #6820 break GTA,and break bgm looping in Radiant Mythology 2

daniel229 · 2015-01-11T04:48:23Z

Break bgm in Kurohyou 2

unknownbrackets · 2015-01-11T05:27:15Z

Hmm, is that reproducible in the demo? It seems to be working, but I have some debugging code in.

In other news, I finally understood enough to beat the first fight in that demo.

-[Unknown]

daniel229 · 2015-01-11T05:43:26Z

Seems not happen in demo,the bug happen in the savedata screen.

daniel229 · 2015-01-11T06:45:18Z

Radiant Mythology 2 and Kurohyou 2 broken in unknownbrackets@ad3ab88
#7278 and #6820 fixed in unknownbrackets@70a3d0f

unknownbrackets@70a3d0f also break Radiant Mythology 2? or the previous?

unknownbrackets · 2015-01-11T07:01:54Z

What if you add before int got_frame = 0; (in the change that broke those two games):

if (packet->size < (int)atracBytesPerFrame) {
    return ATDECODE_FEEDME;
}

And add after:

memcpy(tempPacket.data + initialSize, packet->data, to_copy);

This:

NOTICE_LOG(HLE, "Pulling %d bytes into packet, need %d", to_copy, needed);

I assume some values of to_copy are less than needed, just wondering how they look.

-[Unknown]

daniel229 · 2015-01-11T07:14:18Z

That may fixes the Radiant Mythology 2,but not Kurohyou 2,I don't see any NOTICE_LOG when running these games

daniel229 · 2015-01-11T07:42:16Z

In Kurohyou 2 demo,hit a GHA phase shift,the bgm would stop,the master buid won't.
Go to the second option in the main menu,the bgm in battle would hit GHA phase shift.

unknownbrackets · 2015-01-11T07:53:51Z

I did some special move and the screen turned black while it asked me to press buttons like triangle and square. Pretty sure that's a bug but not directly related... probably more depal problems in this game.

Hmm, I let the fight last a pretty long time, still can't get a GHA phase shift. It's the first fight after selecting the second item, right? I don't have to go find anyone?

-[Unknown]

daniel229 · 2015-01-11T08:08:12Z

Just the first battle,possiable different BGM?it happen when going to the battle.could make a savestate in the "VS" screen,after pressing circle, the BGM of the battle play a sound and then stop,it get that error.

daniel229 · 2015-01-11T08:21:52Z

Surely cound have different bgm in that battle,try serveral times savestate could get it.

daniel229 · 2015-01-12T02:26:14Z

A savestate for the GHA phase shift in Kurohyou 2 demo.
http://1drv.ms/1w9f5fl

vnctdj · 2015-01-12T23:45:23Z

This pull request makes no change to Monster Hunter Freedom Unite, there is still the same message in the log console as I stated in this comment : #7323 (comment)

daniel229 · 2015-01-28T02:10:12Z

Fixes the crash after title BGM looping in Aliens Vs Predator Requiem.

daniel229 · 2015-01-30T05:37:46Z

The Kurohyou 2 demo is good now with the GHA phase shift fix.The retail verson is still not good.

35:11:441 sgx-psp-at3- I[ME]: HW\MediaEngine.cpp:85 FF: Invalid gain location: ch=0, sb=0, pos=2, val=31
35:11:441 sgx-psp-at3- E[ME]: HLE\sceAtrac.cpp:415 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7
35:11:441 sgx-psp-at3- I[ME]: HW\MediaEngine.cpp:85 FF: Invalid gain location: ch=0, sb=0, pos=2, val=31
35:11:441 sgx-psp-at3- E[ME]: HLE\sceAtrac.cpp:415 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7
35:11:441 sgx-psp-at3- I[ME]: HW\MediaEngine.cpp:85 FF: Invalid gain location: ch=0, sb=0, pos=2, val=31
35:11:441 sgx-psp-at3- E[ME]: HLE\sceAtrac.cpp:415 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7

daniel229 · 2015-01-30T05:58:29Z

I found some errors happen in the Kurohyou 2 demo.It happen when you entrying or exiting the shop

49:31:413 sgx-psp-at3- I[ME]: HW\MediaEngine.cpp:85 FF: Frame data doesn't match channel configuration!
49:31:413 sgx-psp-at3- E[ME]: HLE\sceAtrac.cpp:415 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7

Load the savestate and press circle button.
http://1drv.ms/1CiACut

It seems like we can only (safely) seek to sample boundaries, which makes sense. Also, we get wrong data unless we "warm" it by seeking from 0, it seems like. This makes looping produce correct data. Fixes hrydgard#6970.

Otherwise we also get incorrect data.

Otherwise we may ask for more than is possible at the end.

sum2012 · 2015-02-28T12:06:31Z

I use v1.0.1-31-g5ebfa57 + this pull request,
GTA voice still not solved

01:29:820 ATRAC3 play D[ME]: HLE\sceAtrac.cpp:998 00000000=sceAtracDecodeData(0, 08e29500, 0bfd4e40[00000800], 0bfd4e54[00000000], 0bfd4e44[694])
01:29:859 ATRAC3 play D[ME]: HLE\sceAtrac.cpp:1229 sceAtracGetRemainFrame(0, 0bfd4e44)
01:29:860 ATRAC3 play I[ME]: HW\MediaEngine.cpp:85 FF: Invalid gain location: ch=0, sb=4, pos=1, val=13
01:29:860 ATRAC3 play E[ME]: HLE\sceAtrac.cpp:415 avcodec_decode_audio4: Error decoding audio -1094995529 / bebbb1b7
01:29:860 ATRAC3 play D[ME]: HLE\sceAtrac.cpp:998 80630024=sceAtracDecodeData(0, 08e2b500, 0bfd4e40[00000000], 0bfd4e54[00000001], 0bfd4e44[0])
01:29:860 ATRAC3 play E[ME]: HLE\sceAtrac.cpp:1133 UNIMPL sceAtracGetInternalErrorInfo(0, 0bfd4e60)

full log:https://gist.github.com/sum2012/b9bf90aa6355dff03b31

sum2012 · 2015-03-09T20:16:54Z

@unknownbrackets
Not directly rated to this pull request.
Just for note.
For the JPCSP emulator for return less samples at the first
call,it also do a memory move the sample buffer to skip the needed samples
http://code.google.com/p/jpcsp/source/detail?r=3714
Maybe PPSSPP also need to do the same thing ?

unknownbrackets · 2015-03-09T20:25:35Z

I'm not going to worry specifically about how JPCSP has chosen to implement things. Instead, my concern is making the decoded atrac data match (with some fuzz, since the decode is not precisely the same) what the PSP firmware generates with the same syscalls.

We currently generate the correct first and second chunk of samples. So any addition of memory moving would probably make it incorrect.

It looks like JPCSP is decoding the entire chunk, and then moving that decoded data to skip the initial bytes. This is actually incorrect (fyi, @gid15), since that sounds like it would overwrite memory after the chunk that would not be overwritten on a real PSP. It may cause problems in games like Resistance: Retribution, iirc. Memory should not be modified beyond the returned sample count.

-[Unknown]

hrydgard · 2015-03-20T15:36:59Z

Right, I almost forgot ...... it's time to merge this and break stuff.

Will play with it a bit and merge soon.

sum2012 · 2015-03-20T15:39:16Z

Hope we can fix GTA before major release

sum2012 · 2015-03-22T21:00:52Z

@hrydgard
At least #7625 solved before merge

hrydgard · 2015-03-25T23:29:40Z

Let's take the plunge and hope we can make progress towards a proper solution. If we fail, might go back, but as this matches the tests better it is a step in the right direction, even if some stuff breaks for a little while.

When seeking to atrac positions, force alignment and start from zero

sum2012 · 2015-03-25T23:58:23Z

Yes,we do not afraid merge this,if before major version do not solved Gta ,I pull request the commit again(hack?)

…dio work in GTA again. Hopefully we will find a better fix in the future. Also see issue #7863.

Add a compatibility flag to revert sceAtrac to before #6976. Makes audio work in GTA again.

daniel229 mentioned this pull request Oct 5, 2014

Silent Hill Origins - ingame cutscenes don't work #6636

Closed

unknownbrackets mentioned this pull request Jan 6, 2015

Prince of Persia The Forgotten Sands JPN lockup problem #7282

Closed

unknownbrackets force-pushed the atrac-minor branch from f5731f3 to 70a3d0f Compare January 10, 2015 22:11

This was referenced Jan 10, 2015

The Simpsons Game crash after title #7278

Closed

Flatout Head On, skips BGMs after music popup window disappears #7309

Closed

unknownbrackets force-pushed the atrac-minor branch 2 times, most recently from a7764b3 to 8d40561 Compare February 1, 2015 20:51

Seek backwards by force decoding, align seeks.

97fd19f

It seems like we can only (safely) seek to sample boundaries, which makes sense. Also, we get wrong data unless we "warm" it by seeking from 0, it seems like. This makes looping produce correct data. Fixes hrydgard#6970.

unknownbrackets added 3 commits February 1, 2015 15:13

Seek forward from 0 as well.

9a8f61e

Otherwise we also get incorrect data.

Even if we don't get enough data, fill what we can.

b36a25f

Cap writable bytes to filesize when streaming.

7a974b3

Otherwise we may ask for more than is possible at the end.

unknownbrackets force-pushed the atrac-minor branch from 8d40561 to 7a974b3 Compare February 1, 2015 23:16

sum2012 mentioned this pull request Mar 16, 2015

Gripshift audio problems / errors #7601

Closed

hrydgard added a commit that referenced this pull request Mar 25, 2015

Merge pull request #6976 from unknownbrackets/atrac-minor

62e621f

When seeking to atrac positions, force alignment and start from zero

hrydgard merged commit 62e621f into hrydgard:master Mar 25, 2015

daniel229 mentioned this pull request Mar 27, 2015

Monster Kingdom Jewel Summoner loose voice acting at certain point #6820

Closed

hrydgard added a commit that referenced this pull request Sep 27, 2015

Add a compatibility flag to revert sceAtrac to before #6976. Makes au…

eb4ca0c

…dio work in GTA again. Hopefully we will find a better fix in the future. Also see issue #7863.

unknownbrackets mentioned this pull request Sep 27, 2015

Update the README for 1.1 #8008

Merged

hrydgard added a commit that referenced this pull request Sep 27, 2015

Merge pull request #8007 from hrydgard/gta-music-compat

89513a3

Add a compatibility flag to revert sceAtrac to before #6976. Makes audio work in GTA again.

daniel229 mentioned this pull request Nov 9, 2015

BGM stopped in Kurohyo 2 #8195

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

When seeking to atrac positions, force alignment and start from zero #6976

When seeking to atrac positions, force alignment and start from zero #6976

unknownbrackets commented Oct 4, 2014

daniel229 commented Oct 5, 2014

unknownbrackets commented Oct 5, 2014

daniel229 commented Oct 5, 2014

unknownbrackets commented Oct 28, 2014

hrydgard commented Oct 28, 2014

sum2012 commented Nov 13, 2014

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

unknownbrackets commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

unknownbrackets commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

unknownbrackets commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 12, 2015

vnctdj commented Jan 12, 2015

daniel229 commented Jan 28, 2015

daniel229 commented Jan 30, 2015

daniel229 commented Jan 30, 2015

sum2012 commented Feb 28, 2015

sum2012 commented Mar 9, 2015

unknownbrackets commented Mar 9, 2015

hrydgard commented Mar 20, 2015

sum2012 commented Mar 20, 2015

sum2012 commented Mar 22, 2015

hrydgard commented Mar 25, 2015

sum2012 commented Mar 25, 2015

When seeking to atrac positions, force alignment and start from zero #6976

When seeking to atrac positions, force alignment and start from zero #6976

Conversation

unknownbrackets commented Oct 4, 2014

daniel229 commented Oct 5, 2014

unknownbrackets commented Oct 5, 2014

daniel229 commented Oct 5, 2014

unknownbrackets commented Oct 28, 2014

hrydgard commented Oct 28, 2014

sum2012 commented Nov 13, 2014

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

unknownbrackets commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

unknownbrackets commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

unknownbrackets commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 11, 2015

daniel229 commented Jan 12, 2015

vnctdj commented Jan 12, 2015

daniel229 commented Jan 28, 2015

daniel229 commented Jan 30, 2015

daniel229 commented Jan 30, 2015

sum2012 commented Feb 28, 2015

sum2012 commented Mar 9, 2015

unknownbrackets commented Mar 9, 2015

hrydgard commented Mar 20, 2015

sum2012 commented Mar 20, 2015

sum2012 commented Mar 22, 2015

hrydgard commented Mar 25, 2015

sum2012 commented Mar 25, 2015