Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-28 08:20:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

simplify slightly discarding

Browse Source
This commit is contained in:
bnnm 2016-11-20 18:55:00 +01:00
parent ec068700ae
commit cda61c3eeb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/coding/ffmpeg_decoder.c
View File

@ -183,18 +183,17 @@ void decode_ffmpeg(VGMSTREAM *vgmstream,
/* discard packet if needed (fully or partially) */
if (data->samplesToDiscard) {
int toDiscard;
int samplesToConsume;
int bytesPerFrame = ((data->bitsPerSample / 8) * channels);
/* discard all if there are more samples to do than the packet's samples */
if ( data->samplesToDiscard - (dataSize / bytesPerFrame) >=0 ) {
toDiscard = dataSize;
if (data->samplesToDiscard >= dataSize / bytesPerFrame) {
samplesToConsume = dataSize / bytesPerFrame;
}
else{
toDiscard = toConsume;
else {
samplesToConsume = toConsume / bytesPerFrame;
}
int samplesToConsume = toDiscard / bytesPerFrame;
if (data->samplesToDiscard >= samplesToConsume) { /* full discard: skip to next */
data->samplesToDiscard -= samplesToConsume;
bytesConsumedFromDecodedFrame = dataSize;