[libav-devel] [PATCH 1/2] libx264: introduce -x264-params private option

[Luca Barbato]

From: Gavriloaie Eugen-Andrei <crtmpser...@gmail.com>

It is a shortcut to set all the params using x264_param_parse,
makes simpler importing settings from other software using x264.
---

Doc update follows. The patch looks quite useful to me.

 libavcodec/libx264.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index e9cbbad..34fe34b 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -70,6 +70,7 @@ typedef struct X264Context {
     int slice_max_size;
     char *stats;
     int nal_hrd;
+    char *x264_params;
 } X264Context;
 
 static void X264_log(void *p, int level, const char *fmt, va_list args)
@@ -407,6 +408,32 @@ static av_cold int X264_init(AVCodecContext *avctx)
     if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER)
         x4->params.b_repeat_headers = 0;
 
+    if (x4->x264_params) {
+        char *params    = NULL;
+        char *keyvalues = NULL;
+        char *param     = NULL;
+        char *key       = NULL;
+        char *value     = NULL;
+
+        param = strtok_r(x4->x264_params, ":", &params);
+        while (param) {
+            param = strtok_r(NULL, ":", &params);
+            if (!param)
+                break;
+
+            key   = strtok_r(param, "=", &keyvalues);
+            value = strtok_r(NULL, "=", &keyvalues);
+
+            if (!key || !value)
+                continue;
+
+            if (x264_param_parse(&x4->params, key, value) < 0)
+                av_log(avctx, AV_LOG_WARNING,
+                       "Error parsing option '%s=%s'.\n",
+                       key, value);
+        }
+    }
+
     // update AVCodecContext with x264 parameters
     avctx->has_b_frames = x4->params.i_bframe ?
         x4->params.i_bframe_pyramid ? 2 : 1 : 0;
@@ -527,6 +554,7 @@ static const AVOption options[] = {
     { "none",          NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_NONE}, 
INT_MIN, INT_MAX, VE, "nal-hrd" },
     { "vbr",           NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_VBR},  
INT_MIN, INT_MAX, VE, "nal-hrd" },
     { "cbr",           NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_CBR},  
INT_MIN, INT_MAX, VE, "nal-hrd" },
+    { "x264-params",  "Override the x264 configuration using a :-separated 
list of key=value list of parameters", OFFSET(x264_params), AV_OPT_TYPE_STRING, 
{ 0 }, 0, 0, VE },
     { NULL },
 };
 
-- 
1.8.0.2

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel