Packman Build Service PMBS

Changes of Revision 5

transcode.spec Changed

ffmpeg4.patch Changed

@@ -1,7 +1,7 @@
-Index: transcode-1.1.7/encode/encode_lavc.c
+Index: encode/encode_lavc.c
 ===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
+--- encode/encode_lavc.c.orig	2019-02-14 10:57:29.919834172 +0200
++++ encode/encode_lavc.c	2019-02-14 10:57:43.092327852 +0200
 @@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
      int luma_elim_threshold;
      int chroma_elim_threshold;
@@ -260,11 +260,11 @@
      
          //  { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet  supported
          /* End of the config file */
-Index: transcode-1.1.7/export/export_ffmpeg.c
+Index: export/export_ffmpeg.c
 ===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
-@@ -831,14 +831,11 @@ MOD_init
+--- export/export_ffmpeg.c.orig	2019-02-14 10:57:29.923834322 +0200
++++ export/export_ffmpeg.c	2019-02-14 11:04:12.406958254 +0200
+@@ -830,14 +830,11 @@ MOD_init
  
      lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
      lavc_venc_context->bit_rate_tolerance = lavc_param_vrate_tolerance * 1000;
@@ -279,7 +279,7 @@
      lavc_venc_context->b_frame_strategy   = lavc_param_vb_strategy;
      lavc_venc_context->b_quant_offset     = lavc_param_vb_qoffset;
  
-@@ -846,8 +843,23 @@ MOD_init
+@@ -845,8 +842,23 @@ MOD_init
  #define set_dict_opt(val, opt) \
  	snprintf(buf, sizeof(buf), "%i", val); \
  	av_dict_set(&lavc_venc_opts, opt, buf, 0)
@@ -303,14 +303,14 @@
      lavc_venc_context->rtp_payload_size   = lavc_param_packet_size;
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
      if (lavc_param_packet_size)
-@@ -856,15 +868,9 @@ MOD_init
+@@ -855,15 +867,9 @@ MOD_init
      lavc_venc_context->strict_std_compliance= lavc_param_strict;
      lavc_venc_context->i_quant_factor     = lavc_param_vi_qfactor;
      lavc_venc_context->i_quant_offset     = lavc_param_vi_qoffset;
 -    lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
 -    lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
 -    lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
--    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
+-    lavc_venc_context->rc_eq              = av_strdup(lavc_param_rc_eq);
      lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
      lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
      lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 1024;
@@ -319,7 +319,7 @@
      lavc_venc_context->debug              = lavc_param_debug;
      lavc_venc_context->last_predictor_count= lavc_param_last_pred;
      lavc_venc_context->pre_me             = lavc_param_pre_me;
-@@ -872,8 +878,6 @@ MOD_init
+@@ -871,8 +877,6 @@ MOD_init
      lavc_venc_context->pre_dia_size       = lavc_param_pre_dia_size;
      lavc_venc_context->me_subpel_quality  = lavc_param_me_subpel_quality;
      lavc_venc_context->me_range           = lavc_param_me_range;
@@ -328,7 +328,7 @@
      lavc_venc_context->coder_type         = lavc_param_coder;
      lavc_venc_context->context_model      = lavc_param_context;
      lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold;
-@@ -1079,6 +1083,8 @@ MOD_init
+@@ -1078,6 +1082,8 @@ MOD_init
      lavc_venc_context->flags |= lavc_param_mv0;
      if(lavc_param_qp_rd)
      	av_dict_set(&lavc_venc_opts, "mpv_flags", "+qp_rd", 0);
@@ -337,7 +337,7 @@
      lavc_venc_context->flags |= lavc_param_ilme;
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)   
      lavc_venc_context->flags |= lavc_param_trell;
-@@ -1087,9 +1093,7 @@ MOD_init
+@@ -1086,9 +1092,7 @@ MOD_init
  #endif
  
      if (lavc_param_gray)
@@ -348,7 +348,7 @@
  
      switch(vob->encode_fields) {
      case TC_ENCODE_FIELDS_TOP_FIRST:
-@@ -1107,9 +1111,9 @@ MOD_init
+@@ -1106,9 +1110,9 @@ MOD_init
      }
  
      lavc_venc_context->flags |= interlacing_active ?
@@ -360,7 +360,7 @@
  
      lavc_venc_context->flags |= lavc_param_psnr;
      do_psnr = lavc_param_psnr;
-@@ -1156,7 +1160,7 @@ MOD_init
+@@ -1155,7 +1159,7 @@ MOD_init
                    "encoding.");
            return TC_EXPORT_ERROR;
          }
@@ -369,7 +369,7 @@
          stats_file = fopen(vob->divxlogfile, "w");
          if (stats_file == NULL){
            tc_log_warn(MOD_NAME, "Could not create 2pass log file \"%s\".",
-@@ -1170,7 +1174,7 @@ MOD_init
+@@ -1169,7 +1173,7 @@ MOD_init
                    "encoding.");
            return TC_EXPORT_ERROR;
          }
@@ -378,7 +378,7 @@
          stats_file= fopen(vob->divxlogfile, "r");
          if (stats_file==NULL){
            tc_log_warn(MOD_NAME, "Could not open 2pass log file \"%s\" for "
-@@ -1201,12 +1205,11 @@ MOD_init
+@@ -1200,12 +1204,11 @@ MOD_init
          break;
        case 3:
          /* fixed qscale :p */
@@ -392,10 +392,10 @@
  
  	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
  	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
+Index: export/ffmpeg_cfg.c
 ===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
+--- export/ffmpeg_cfg.c.orig	2019-02-14 10:57:29.923834322 +0200
++++ export/ffmpeg_cfg.c	2019-02-14 10:57:43.092327852 +0200
 @@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
  int lavc_param_pre_me= 1;
  int lavc_param_me_subpel_quality= 8;
@@ -493,11 +493,11 @@
      {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
      {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
      {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
-Index: transcode-1.1.7/import/import_ffmpeg.c
+Index: import/import_ffmpeg.c
 ===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
-@@ -361,7 +361,7 @@ do_avi:
+--- import/import_ffmpeg.c.orig	2019-02-14 10:57:29.923834322 +0200
++++ import/import_ffmpeg.c	2019-02-14 10:57:43.092327852 +0200
+@@ -310,7 +310,7 @@ do_avi:
      lavc_dec_context->width  = x_dim;
      lavc_dec_context->height = y_dim;