LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 07:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2175 FLA Export - exporting 320kbps MP3s as 160kbps

Browse Source
This commit is contained in:
Jindra Petřík
2024-08-05 11:17:25 +02:00
parent 8951ff5155
commit 7a8760def9
6 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineSoundTag.java
+23 -3
View File
@@ -25,14 +25,14 @@ import com.jpexs.decompiler.flash.types.BasicType;
import com.jpexs.decompiler.flash.types.annotations.EnumValue;
import com.jpexs.decompiler.flash.types.annotations.SWFType;
import com.jpexs.decompiler.flash.types.annotations.SWFVersion;
import com.jpexs.decompiler.flash.types.sound.MP3FRAME;
import com.jpexs.decompiler.flash.types.sound.MP3SOUNDDATA;
import com.jpexs.decompiler.flash.types.sound.SoundExportFormat;
import com.jpexs.decompiler.flash.types.sound.SoundFormat;
import com.jpexs.helpers.ByteArrayRange;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
/**
*
@@ -139,7 +139,7 @@ public class DefineSoundTag extends CharacterTag implements SoundTag {
@Override
public SoundExportFormat getExportFormat() {
if (soundFormat == SoundFormat.FORMAT_MP3) {
if (getInitialLatency() > 0) {
if (getInitialLatency() > 0 || isMp3HigherThan160Kbps()) {
return SoundExportFormat.WAV;
}
return SoundExportFormat.MP3;
@@ -261,4 +261,24 @@ public class DefineSoundTag extends CharacterTag implements SoundTag {
}
return 0;
}
private boolean isMp3HigherThan160Kbps() {
if (soundFormat != SoundFormat.FORMAT_MP3) {
return false;
}
try {
SWFInputStream sis = new SWFInputStream(swf, soundData.getRangeData());
MP3SOUNDDATA s = new MP3SOUNDDATA(sis, false);
if (!s.frames.isEmpty()) {
MP3FRAME frame = s.frames.get(0);
int bitRate = frame.getBitRate() / 1000;
if (bitRate > 160) {
return true;
}
}
} catch (IOException ex) {
//ignore
}
return false;
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHead2Tag.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class SoundStreamHead2Tag extends SoundStreamHeadTypeTag {
@Override
public SoundExportFormat getExportFormat() {
if (streamSoundCompression == SoundFormat.FORMAT_MP3) {
if (getInitialLatency() > 0) {
if (getInitialLatency() > 0 || isMp3HigherThan160Kbps()) {
return SoundExportFormat.WAV;
}
return SoundExportFormat.MP3;
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/SoundStreamHeadTag.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class SoundStreamHeadTag extends SoundStreamHeadTypeTag {
@Override
public SoundExportFormat getExportFormat() {
if (streamSoundCompression == SoundFormat.FORMAT_MP3) {
if (getInitialLatency() > 0) {
if (getInitialLatency() > 0 || isMp3HigherThan160Kbps()) {
return SoundExportFormat.WAV;
}
return SoundExportFormat.MP3;
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/SoundStreamHeadTypeTag.java
+26
View File
@@ -17,10 +17,15 @@
package com.jpexs.decompiler.flash.tags.base;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.tags.SoundStreamBlockTag;
import com.jpexs.decompiler.flash.tags.Tag;
import com.jpexs.decompiler.flash.timeline.SoundStreamFrameRange;
import com.jpexs.decompiler.flash.types.sound.MP3FRAME;
import com.jpexs.decompiler.flash.types.sound.MP3SOUNDDATA;
import com.jpexs.decompiler.flash.types.sound.SoundFormat;
import com.jpexs.helpers.ByteArrayRange;
import java.io.IOException;
import java.util.List;
/**
@@ -40,4 +45,25 @@ public abstract class SoundStreamHeadTypeTag extends Tag implements CharacterIdT
public abstract List<SoundStreamFrameRange> getRanges();
protected boolean isMp3HigherThan160Kbps() {
List<SoundStreamFrameRange> ranges = getRanges();
if (ranges.isEmpty()) {
return false;
}
try {
SWFInputStream sis = new SWFInputStream(swf, ranges.get(0).blocks.get(0).streamSoundData.getRangeData());
MP3SOUNDDATA s = new MP3SOUNDDATA(sis, false);
if (!s.frames.isEmpty()) {
MP3FRAME frame = s.frames.get(0);
int bitRate = frame.getBitRate() / 1000;
if (bitRate > 160) {
return true;
}
}
} catch (IOException ex) {
//ignore
}
return false;
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+12 -2
View File
@@ -2068,6 +2068,7 @@ public class XFLConverter {
}
}
int seekSamples = 0;
boolean convertMp3ToWav = false;
if (soundFormat == SoundFormat.FORMAT_MP3) {
exportFormat = "mp3";
if (!soundType) { //mono
@@ -2080,6 +2081,7 @@ public class XFLConverter {
if (s.seekSamples > 0) {
seekSamples = s.seekSamples;
exportFormat = "wav";
convertMp3ToWav = true;
}
if (!s.frames.isEmpty()) {
MP3FRAME frame = s.frames.get(0);
@@ -2122,6 +2124,11 @@ public class XFLConverter {
case 160:
bits = 17;
break;
default:
bits = 17;
exportFormat = "wav";
convertMp3ToWav = true;
break;
}
}
} catch (IOException | IndexOutOfBoundsException ex) {
@@ -2132,7 +2139,7 @@ public class XFLConverter {
SoundFormat fmt = st.getSoundFormat();
byte[] data = SWFInputStream.BYTE_ARRAY_EMPTY;
try {
data = new SoundExporter().exportSound(st, seekSamples > 0 ? SoundExportMode.WAV : SoundExportMode.MP3_WAV);
data = new SoundExporter().exportSound(st, convertMp3ToWav ? SoundExportMode.WAV : SoundExportMode.MP3_WAV);
} catch (IOException ex) {
logger.log(Level.SEVERE, null, ex);
}
@@ -2149,7 +2156,7 @@ public class XFLConverter {
String datFileName = null;
if (seekSamples > 0 && decodedData != null) {
if (convertMp3ToWav && decodedData != null) {
long ts = getTimestamp(swf);
datFileName = "M " + (datfiles.size() + 1) + " " + ts + ".dat";
datfiles.put(datFileName, decodedData);
@@ -5107,6 +5114,9 @@ public class XFLConverter {
case 160:
streamCompress = 17;
break;
default:
streamCompress = 17;
break;
}
}
} catch (IOException | IndexOutOfBoundsException ex) {