Skip to content

Allow SpeedTimeInterpolator reuse #199

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

Merged
merged 2 commits into from
Aug 11, 2024
Merged

Allow SpeedTimeInterpolator reuse #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
533fdae
Allow SpeedTimeInterpolator reuse
natario1 Aug 11, 2024
4520ae6
Minor fixes
natario1 Aug 11, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions .idea/deploymentTargetDropDown.xml
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions lib/src/androidTest/java/com/otaliastudios/transcoder/integration/IssuesTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,21 @@ class IssuesTests {
transcode {
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(input("0.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 2000_000L, 3000_000L))
addDataSource(input("1.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 4000_000L, 5000_000L))
addDataSource(input("2.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 6000_000L, 7000_000L))
addDataSource(input("3.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 8000_000L, 9000_000L))
addDataSource(input("4.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 10000_000L, 11000_000L))
addDataSource(input("5.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 12000_000L, 13000_000L))
addDataSource(input("6.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 14000_000L, 15000_000L))
addDataSource(input("7.amr"))
addDataSource(ClipDataSource(input("main.mp3"), 0L, 1000_000L))
addDataSource(ClipDataSource(input("main.mp3"), 16000_000L, 17000_000L))
addDataSource(input("8.amr"))
}
Unit
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/otaliastudios/transcoder/internal/audio/remix/AudioRemixer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal interface AudioRemixer {
companion object {
internal operator fun get(inputChannels: Int, outputChannels: Int): AudioRemixer = when {
inputChannels !in setOf(1, 2) -> error("Input channel count not supported: $inputChannels")
outputChannels !in setOf(1, 2) -> error("Input channel count not supported: $inputChannels")
outputChannels !in setOf(1, 2) -> error("Output channel count not supported: $inputChannels")
inputChannels < outputChannels -> UpMixAudioRemixer()
inputChannels > outputChannels -> DownMixAudioRemixer()
else -> PassThroughAudioRemixer()
Expand Down
8 changes: 4 additions & 4 deletions lib/src/main/java/com/otaliastudios/transcoder/internal/transcode/DefaultTranscodeEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ internal class DefaultTranscodeEngine(
}

private fun createPipeline(
type: TrackType,
index: Int,
status: TrackStatus,
outputFormat: MediaFormat
type: TrackType,
index: Int,
status: TrackStatus,
outputFormat: MediaFormat
): Pipeline {
log.w("createPipeline($type, $index, $status), format=$outputFormat")
val interpolator = timer.interpolator(type, index)
Expand Down
4 changes: 1 addition & 3 deletions lib/src/main/java/com/otaliastudios/transcoder/sink/DefaultDataSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ public void setOrientation(int rotation) {

@Override
public void setLocation(double latitude, double longitude) {
if (Build.VERSION.SDK_INT >= 19) {
mMuxer.setLocation((float) latitude, (float) longitude);
}
mMuxer.setLocation((float) latitude, (float) longitude);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions lib/src/main/java/com/otaliastudios/transcoder/time/SpeedTimeInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public SpeedTimeInterpolator(float factor) {
* @return the factor
*/
@SuppressWarnings("unused")
public float getFactor() {
public float getFactor(@NonNull TrackType type, long time) {
return (float) mFactor;
}

Expand All @@ -50,7 +50,7 @@ public long interpolate(@NonNull TrackType type, long time) {
data.lastCorrectedTime = time;
} else {
long realDelta = time - data.lastRealTime;
long correctedDelta = (long) ((double) realDelta / mFactor);
long correctedDelta = (long) ((double) realDelta / getFactor(type, time));
data.lastRealTime = time;
data.lastCorrectedTime += correctedDelta;
}
Expand Down