Skip to content

Commit 308ba1c

Browse files
authored
Merge pull request #208 from Botts-Innovative-Research/optimize-video-transcoder
Optimize video transcoder
2 parents 6e10c57 + 21b7f1d commit 308ba1c

21 files changed

Lines changed: 1751 additions & 608 deletions

File tree

processing/sensorhub-process-ffmpeg/src/main/java/org/sensorhub/impl/process/video/FFmpegProcess.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ public void doStart() throws SensorException, SensorHubException {
246246
// Reinit executable. Not always necessary, but doesn't hurt.
247247
executable.init();
248248
process.start(this::onError);
249+
//process.start(this::onError);
249250
} catch (ProcessException e) {
250251
logger.error("Could not initialize process.", e);
251252
return;
@@ -459,7 +460,7 @@ public void publishData() {
459460
}
460461

461462

462-
// Listens for event from dara
463+
// Listens for event from data
463464
protected class DataQueuePusher implements IEventListener {
464465
DataQueue dataQueue;
465466

processing/sensorhub-process-ffmpeg/src/main/java/org/sensorhub/impl/process/video/transcoder/CodecEnum.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
public enum CodecEnum {
1212
//AUTO("auto"),
1313
H264(AV_CODEC_ID_H264),
14-
H265(AV_CODEC_ID_H265),
15-
HEVC(AV_CODEC_ID_HEVC), // HEVC and H265 are the same. Having both in this enum helps with auto codec detection.
14+
HEVC(AV_CODEC_ID_HEVC),
1615
MJPEG(AV_CODEC_ID_MJPEG),
1716
VP8(AV_CODEC_ID_VP8),
1817
VP9(AV_CODEC_ID_VP9),
1918
MPEG2(AV_CODEC_ID_MPEG2TS),
2019
MPEG4(AV_CODEC_ID_MPEG4),
21-
RGB(AV_PIX_FMT_RGB24),
22-
YUV(AV_PIX_FMT_YUV420P);
20+
RGB24(AV_PIX_FMT_RGB24),
21+
YUV420P(AV_PIX_FMT_YUV420P);
2322

2423
int ffmpegId;
2524

0 commit comments

Comments
 (0)