fixed MOV duration

0xPoly · 0xPoly · commit 34009b2fbf6f · 2015-04-04T17:12:51.000+04:00
diff --git a/app/src/main/java/poly/darkdepths/strongbox/CameraFragment.java b/app/src/main/java/poly/darkdepths/strongbox/CameraFragment.java
@@ -414,7 +414,7 @@ public void run ()
                     if (mFrameQ.peek() != null)
                     {
                         VideoFrame vf = mFrameQ.pop();
-                        muxer.addFrame(mLastWidth/2, mLastHeight/2, ByteBuffer.wrap(vf.image),vf.fps,vf.duration);
+                        muxer.addFrame(mLastWidth/2, mLastHeight/2, ByteBuffer.wrap(vf.image),benchmarkFPS,vf.duration);
                     }
                 }
 
diff --git a/app/src/main/java/poly/darkdepths/strongbox/encoders/ImageToMJPEGMOVMuxer.java b/app/src/main/java/poly/darkdepths/strongbox/encoders/ImageToMJPEGMOVMuxer.java
@@ -58,7 +58,7 @@ public void addFrame(int width, int height, ByteBuffer buff, long timeScaleFPS,
                 audioTrack.addSampleEntry(MP4Muxer.audioSampleEntry(af));
         }
 // Add packet to video track
-        videoTrack.addFrame(new MP4Packet(buff, frameNo, timeScaleFPS, duration, frameNo, true, null, frameNo, 0));
+        videoTrack.addFrame(new MP4Packet(buff, frameNo, timeScaleFPS, 1, frameNo, true, null, frameNo, 0));
         frameNo++;
     }
     public void addAudio (ByteBuffer buffer) throws IOException

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ public void run ()`
`414`	`414`	`if (mFrameQ.peek() != null)`
`415`	`415`	`{`
`416`	`416`	`VideoFrame vf = mFrameQ.pop();`
`417`		`- muxer.addFrame(mLastWidth/2, mLastHeight/2, ByteBuffer.wrap(vf.image),vf.fps,vf.duration);`
	`417`	`+ muxer.addFrame(mLastWidth/2, mLastHeight/2, ByteBuffer.wrap(vf.image),benchmarkFPS,vf.duration);`
`418`	`418`	`}`
`419`	`419`	`}`
`420`	`420`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void addFrame(int width, int height, ByteBuffer buff, long timeScaleFPS,`
`58`	`58`	`audioTrack.addSampleEntry(MP4Muxer.audioSampleEntry(af));`
`59`	`59`	`}`
`60`	`60`	`// Add packet to video track`
`61`		`- videoTrack.addFrame(new MP4Packet(buff, frameNo, timeScaleFPS, duration, frameNo, true, null, frameNo, 0));`
	`61`	`+ videoTrack.addFrame(new MP4Packet(buff, frameNo, timeScaleFPS, 1, frameNo, true, null, frameNo, 0));`
`62`	`62`	`frameNo++;`
`63`	`63`	`}`
`64`	`64`	`public void addAudio (ByteBuffer buffer) throws IOException`