Ticket #41241: patch-fix-ffmpeg-support.2.diff

core/vidl/vidl_ffmpeg_istream_v3.txx

@@ -143 +143 @@
   }
 
   // Get the stream information by reading a bit of the file
-  if ( av_find_stream_info( is_->fmt_cxt_ ) < 0 ) {
+  if ( avformat_find_stream_info( is_->fmt_cxt_, NULL ) < 0 ) {
     return false;
   }
 
@@ -165 +165 @@
 
   // Open the stream
   AVCodec* codec = avcodec_find_decoder(enc->codec_id);
-  if ( !codec || avcodec_open( enc, codec ) < 0 ) {
+  if ( !codec || avcodec_open2( enc, codec, 0 ) < 0 ) {
     return false;
   }
 
@@ -216 +216 @@
     is_->vid_str_ = 0;
   }
   if ( is_->fmt_cxt_ ) {
-    av_close_input_file( is_->fmt_cxt_ );
+    avformat_close_input( &is_->fmt_cxt_ );
     is_->fmt_cxt_ = 0;
   }
 }

core/vidl/vidl_ffmpeg_ostream_v4.txx

@@ -117 +117 @@
   os_->fmt_cxt_->nb_streams = 0;
 
   // Create stream
-  AVStream* st = av_new_stream( os_->fmt_cxt_, 0 );
+  AVStream* st = avformat_new_stream( os_->fmt_cxt_, NULL );
   if ( !st ) {
     vcl_cerr << "ffmpeg: could not alloc stream\n";
     close();
@@ -229 +229 @@
   if (params_.video_qscale_ || params_.same_quality_)
   {
     video_enc->flags |= CODEC_FLAG_QSCALE;
-    st->quality = FF_QP2LAMBDA * params_.video_qscale_;
+    //st->quality = FF_QP2LAMBDA * params_.video_qscale_;
   }
   // if (bitexact)
   //   video_enc->flags |= CODEC_FLAG_BITEXACT;
@@ -246 +246 @@
   video_enc->spatial_cplx_masking = params_.scplx_mask_;
   video_enc->temporal_cplx_masking = params_.tcplx_mask_;
   video_enc->p_masking = params_.p_mask_;
-  video_enc->quantizer_noise_shaping= params_.qns_;
+  //video_enc->quantizer_noise_shaping= params_.qns_;
 
-  if (params_.use_umv_)
+  // Commented below are deprecated flags https://www.ffmpeg.org/doxygen/0.10/group__deprecated__flags.html
+  /*if (params_.use_umv_)
   {
     video_enc->flags |= CODEC_FLAG_H263P_UMV;
   }
@@ -259 +260 @@
   if (params_.use_aiv_)
   {
     video_enc->flags |= CODEC_FLAG_H263P_AIV;
-  }
+  }*/
   if (params_.use_4mv_)
   {
     video_enc->flags |= CODEC_FLAG_4MV;
   }
-  if (params_.use_obmc_)
+  /*if (params_.use_obmc_)
   {
     video_enc->flags |= CODEC_FLAG_OBMC;
-  }
+  }*/
   if (params_.use_loop_)
   {
     video_enc->flags |= CODEC_FLAG_LOOP_FILTER;
   }
 
-  if (params_.use_part_)
+  /*if (params_.use_part_)
   {
     video_enc->flags |= CODEC_FLAG_PART;
   }
@@ -284 +285 @@
   if (params_.use_scan_offset_)
   {
     video_enc->flags |= CODEC_FLAG_SVCD_SCAN_OFFSET;
-  }
+  }*/
   if (params_.closed_gop_)
   {
     video_enc->flags |= CODEC_FLAG_CLOSED_GOP;
@@ -293 +294 @@
   {
     video_enc->flags |= CODEC_FLAG_QPEL;
   }
-  if (params_.use_qprd_)
+  /*if (params_.use_qprd_)
   {
     video_enc->flags |= CODEC_FLAG_QP_RD;
   }
   if (params_.use_cbprd_)
   {
     video_enc->flags |= CODEC_FLAG_CBP_RD;
-  }
+  }*/
   if (params_.b_frames_)
   {
     video_enc->max_b_frames = params_.b_frames_;
@@ -377 +378 @@
 
   vcl_strncpy( os_->fmt_cxt_->filename, filename_.c_str(), 1023 );
 
-  if ( avio_open( &os_->fmt_cxt_->pb, filename_.c_str(), URL_WRONLY) < 0 )
+  if ( avio_open( &os_->fmt_cxt_->pb, filename_.c_str(), AVIO_FLAG_WRITE) < 0 )
   {
     vcl_cerr << "ffmpeg: couldn't open " << filename_ << " for writing\n";
     close();
@@ -387 +388 @@
 
   //dump_format( os_->fmt_cxt_, 1, filename_, 1 );
 
-  if ( avcodec_open( video_enc, codec ) < 0 )
+  if ( avcodec_open2( video_enc, codec, 0 ) < 0 )
   {
     vcl_cerr << "ffmpeg: couldn't open codec\n";
     close();