updated motioneye

This commit is contained in:
Calin Crisan 2016-07-31 14:54:57 +03:00
parent 6ac039f8e5
commit 37518e99b2
2 changed files with 25 additions and 3 deletions

View File

@ -1,7 +1,7 @@
From e65ea2454d6dcc759e2f4fd38548f6844a2c820b Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 3 Jul 2016 19:49:06 +0300
Subject: [PATCH 1/2] h264 codec: set crf option based on configured vbr
Subject: [PATCH 1/3] h264 codec: set crf option based on configured vbr
---
ffmpeg.c | 6 +++++-
@ -28,7 +28,7 @@ index df2b47e..ed192ca 100644
From b4138ee0ddc8a7b76b82eb1c80e5d5216dfcb8ce Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Wed, 6 Jul 2016 16:58:09 +0300
Subject: [PATCH 2/2] h264 codec: fixed crf from vbr: the vbr range is actually
Subject: [PATCH 2/3] h264 codec: fixed crf from vbr: the vbr range is actually
1 to 32767
---
@ -51,3 +51,25 @@ index ed192ca..0f80a09 100644
av_dict_set(&opts, "tune", "zerolatency", 0);
}
From 675b4befb339e23a74615a1c64ecdd51470e824e Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 17 Jul 2016 16:51:27 +0300
Subject: [PATCH 3/3] ffmpeg/h264: actually pass the crf value to the options
---
ffmpeg.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/ffmpeg.c b/ffmpeg.c
index 0f80a09..b21572a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -300,6 +300,7 @@ struct ffmpeg *ffmpeg_open(char *ffmpeg_video_codec, char *filename,
char crf[4];
snprintf(crf, 4, "%d", (int) ((vbr - 1) * 51.0 / 32766));
+ av_dict_set(&opts, "crf", crf, 0);
av_dict_set(&opts, "tune", "zerolatency", 0);
}
if (strcmp(ffmpeg_video_codec, "ffv1") == 0) c->strict_std_compliance = -2;

View File

@ -4,7 +4,7 @@
#
#############################################################
MOTIONEYE_VERSION = 5def02069cc8c8818fc6e322561e542e592724a4
MOTIONEYE_VERSION = c09764c55e20519f38c64332703ddaf55e3e10f2
MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
MOTIONEYE_LICENSE = GPLv3