FS-11394: [mod_av] Clean up defaults cos they are still wrong

diff --git a/conf/vanilla/autoload_configs/av.conf.xml b/conf/vanilla/autoload_configs/av.conf.xml
index 7d0390646a22dbd2e6aca2b41be5e29e267aba7a..cf28fab3d3ce85b244ae34cbc101b94d8f3ac638 100644 (file)
--- a/conf/vanilla/autoload_configs/av.conf.xml
+++ b/conf/vanilla/autoload_configs/av.conf.xml
@@ -9,7 +9,7 @@
     <!-- <param name="key-frame-min-freq" value="250"/> -->
 
     <!-- integer of cpus, or 'auto', or 'cpu/<divisor>/<max> -->
-    <param name="dec-threads" value="cpu/2/4"/>
+    <param name="dec-threads" value="1"/>
     <param name="enc-threads" value="cpu/2/4"/>
     <param name="h263-profile" value="H263"/>
     <param name="h263+-profile" value="H263+"/>

diff --git a/src/mod/applications/mod_av/autoload_configs/av.conf.xml b/src/mod/applications/mod_av/autoload_configs/av.conf.xml
index 7d0390646a22dbd2e6aca2b41be5e29e267aba7a..cf28fab3d3ce85b244ae34cbc101b94d8f3ac638 100644 (file)
--- a/src/mod/applications/mod_av/autoload_configs/av.conf.xml
+++ b/src/mod/applications/mod_av/autoload_configs/av.conf.xml
@@ -9,7 +9,7 @@
     <!-- <param name="key-frame-min-freq" value="250"/> -->
 
     <!-- integer of cpus, or 'auto', or 'cpu/<divisor>/<max> -->
-    <param name="dec-threads" value="cpu/2/4"/>
+    <param name="dec-threads" value="1"/>
     <param name="enc-threads" value="cpu/2/4"/>
     <param name="h263-profile" value="H263"/>
     <param name="h263+-profile" value="H263+"/>

diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c
index 39b426acd63c0aa4fb589a4eb1a35802adfbf5b8..a2eda7caf9b5a56a5e0a9301a96c3bbf6fa1fb84 100644 (file)
--- a/src/mod/applications/mod_av/avcodec.c
+++ b/src/mod/applications/mod_av/avcodec.c
@@ -1095,8 +1095,8 @@ static void set_h264_private_data(h264_codec_context_t *context, avcodec_profile
        av_opt_set(context->encoder_ctx->priv_data, "preset", "veryfast", 0);
        av_opt_set(context->encoder_ctx->priv_data, "intra-refresh", "1", 0);
        av_opt_set(context->encoder_ctx->priv_data, "tune", "animation+zerolatency", 0);
-       av_opt_set(context->encoder_ctx->priv_data, "sc_threshold", "40", 0);
-       av_opt_set(context->encoder_ctx->priv_data, "crf", "18", 0);
+       //av_opt_set(context->encoder_ctx->priv_data, "sc_threshold", "40", 0);
+       //av_opt_set(context->encoder_ctx->priv_data, "crf", "18", 0);
 
        if (profile->options) {
                switch_event_header_t *hp;
@@ -1993,6 +1993,9 @@ static void load_config()
 
                                        val = atoi(value);
 
+                                       ctx->profile = FF_PROFILE_H264_BASELINE;
+                                       ctx->level = 31;
+                                       
                                        if (!strcmp(name, "dec-threads")) {
                                                aprofile->decoder_thread_count = switch_parse_cpu_string(value);
                                        } else if (!strcmp(name, "enc-threads")) {