修复问题
This commit is contained in:
@@ -36,13 +36,22 @@
|
|||||||
<groupId>org.bytedeco</groupId>
|
<groupId>org.bytedeco</groupId>
|
||||||
<artifactId>javacv-platform</artifactId>
|
<artifactId>javacv-platform</artifactId>
|
||||||
<version>1.5.12</version>
|
<version>1.5.12</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.bytedeco</groupId>
|
||||||
|
<artifactId>opencv</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 明确指定OpenCV版本 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bytedeco</groupId>
|
<groupId>org.bytedeco</groupId>
|
||||||
<artifactId>opencv-platform</artifactId>
|
<artifactId>opencv-platform</artifactId>
|
||||||
<version>4.11.0-1.5.12</version>
|
<version>4.11.0-1.5.12</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- 解析 models.json-->
|
<!-- 解析 models.json-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
@@ -79,4 +88,28 @@
|
|||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<!-- 其他插件 -->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-enforcer-plugin</artifactId>
|
||||||
|
<version>3.4.1</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>enforce-versions</id>
|
||||||
|
<goals>
|
||||||
|
<goal>enforce</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<rules>
|
||||||
|
<dependencyConvergence />
|
||||||
|
</rules>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -480,8 +480,8 @@ public class MediaTransferFlvByJavacv extends MediaTransfer implements Runnable
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 记录帧
|
// 记录帧
|
||||||
if (frame != null) {
|
if (frame != null) { long now = System.currentTimeMillis();
|
||||||
long now = System.currentTimeMillis();
|
|
||||||
if (startTime == 0) startTime = now;
|
if (startTime == 0) startTime = now;
|
||||||
videoTS = 1000 * (now - startTime);
|
videoTS = 1000 * (now - startTime);
|
||||||
if (videoTS > recorder.getTimestamp()) recorder.setTimestamp(videoTS);
|
if (videoTS > recorder.getTimestamp()) recorder.setTimestamp(videoTS);
|
||||||
|
|||||||
Reference in New Issue
Block a user