[ingex-commits] ingex/player/ingex_player avci_stream_connect.c, 1.2, 1.3 dnxhd_stream_connect.c, 1.8, 1.9 dv_stream_connect.c, 1.14, 1.15 ffmpeg_source.c, 1.15, 1.16 mjpeg_stream_connect.c, 1.7, 1.8 mpegi_stream_connect.c, 1.7, 1.8

[Philip de N. <ph...@us...>]

Update of /cvsroot/ingex/ingex/player/ingex_player
In directory vz-cvs-4.sog:/tmp/cvs-serv2025/ingex_player

Modified Files:
	avci_stream_connect.c dnxhd_stream_connect.c 
	dv_stream_connect.c ffmpeg_source.c mjpeg_stream_connect.c 
	mpegi_stream_connect.c 
Log Message:
handle latest ffmpeg deprecations and removals


Index: avci_stream_connect.c
===================================================================
RCS file: /cvsroot/ingex/ingex/player/ingex_player/avci_stream_connect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** avci_stream_connect.c	27 Oct 2011 13:45:37 -0000	1.2
--- avci_stream_connect.c	19 Apr 2012 09:23:20 -0000	1.3
***************
*** 86,90 ****
--- 86,92 ----
  
      AVCodecContext* dec;
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      int isThreaded;
+ #endif
      int openedDecoder; /* only close if decoder opened */
      AVFrame *decFrame;
***************
*** 171,174 ****
--- 173,177 ----
      /* free the decoder */
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if ((*decoder)->isThreaded)
      {
***************
*** 177,180 ****
--- 180,184 ----
          /* avcodec_thread_free((*decoder)->dec); */
      }
+ #endif
      if ((*decoder)->openedDecoder)
      {
***************
*** 231,235 ****
--- 235,243 ----
      }
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      newDecoder->dec = avcodec_alloc_context();
+ #else
+     newDecoder->dec = avcodec_alloc_context3(avDecoder);
+ #endif
      if (!newDecoder->dec)
      {
***************
*** 240,245 ****
--- 248,257 ----
      if (numFFMPEGThreads > 1)
      {
+ #if LIBAVCODEC_VERSION_MAJOR < 54
          avcodec_thread_init(newDecoder->dec, numFFMPEGThreads);
          newDecoder->isThreaded = 1;
+ #else
+         newDecoder->dec->thread_count = numFFMPEGThreads;
+ #endif
      }
  
***************
*** 249,253 ****
--- 261,269 ----
      newDecoder->dec->flags |= CODEC_FLAG_LOW_DELAY; /* no decode delay for intra-frame encoding */
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (avcodec_open(newDecoder->dec, avDecoder) < 0)
+ #else
+     if (avcodec_open2(newDecoder->dec, avDecoder, NULL) < 0)
+ #endif
      {
          ml_log_error("Could not open decoder\n");

Index: dnxhd_stream_connect.c
===================================================================
RCS file: /cvsroot/ingex/ingex/player/ingex_player/dnxhd_stream_connect.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dnxhd_stream_connect.c	10 Nov 2011 10:53:35 -0000	1.8
--- dnxhd_stream_connect.c	19 Apr 2012 09:23:20 -0000	1.9
***************
*** 76,80 ****
--- 76,82 ----
  
      AVCodecContext* dec;
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      int isThreaded;
+ #endif
      int openedDecoder; /* only close if decoder opened */
      AVFrame *decFrame;
***************
*** 122,126 ****
  static void free_dnxhd_decoder(DNxHDDecoder** decoder)
  {
! #if LIBAVCODEC_VERSION_MAJOR < 53
      if ((*decoder)->isThreaded)
      {
--- 124,128 ----
  static void free_dnxhd_decoder(DNxHDDecoder** decoder)
  {
! #if LIBAVCODEC_VERSION_MAJOR < 54
      if ((*decoder)->isThreaded)
      {
***************
*** 158,162 ****
--- 160,168 ----
      }
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      newDecoder->dec = avcodec_alloc_context();
+ #else
+     newDecoder->dec = avcodec_alloc_context3(avDecoder);
+ #endif
      if (!newDecoder->dec)
      {
***************
*** 167,171 ****
      if (numFFMPEGThreads > 1)
      {
! #if LIBAVCODEC_VERSION_MAJOR < 53
          avcodec_thread_init(newDecoder->dec, numFFMPEGThreads);
          newDecoder->isThreaded = 1;
--- 173,177 ----
      if (numFFMPEGThreads > 1)
      {
! #if LIBAVCODEC_VERSION_MAJOR < 54
          avcodec_thread_init(newDecoder->dec, numFFMPEGThreads);
          newDecoder->isThreaded = 1;
***************
*** 179,183 ****
--- 185,193 ----
      newDecoder->dec->pix_fmt = PIX_FMT_YUV422P;
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (avcodec_open(newDecoder->dec, avDecoder) < 0)
+ #else
+     if (avcodec_open2(newDecoder->dec, avDecoder, NULL) < 0)
+ #endif
      {
          ml_log_error("Could not open decoder\n");

Index: mjpeg_stream_connect.c
===================================================================
RCS file: /cvsroot/ingex/ingex/player/ingex_player/mjpeg_stream_connect.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mjpeg_stream_connect.c	27 Sep 2011 10:14:29 -0000	1.7
--- mjpeg_stream_connect.c	19 Apr 2012 09:23:20 -0000	1.8
***************
*** 91,95 ****
--- 91,97 ----
  
      AVCodecContext* dec;
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      int isThreaded;
+ #endif
      int openedDecoder; /* only close if decoder opened */
      AVFrame *decFrame;
***************
*** 176,179 ****
--- 178,182 ----
      /* free the decoder */
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if ((*decoder)->isThreaded)
      {
***************
*** 182,185 ****
--- 185,189 ----
          /* avcodec_thread_free((*decoder)->dec); */
      }
+ #endif
      if ((*decoder)->openedDecoder)
      {
***************
*** 236,240 ****
--- 240,248 ----
      }
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      newDecoder->dec = avcodec_alloc_context();
+ #else
+     newDecoder->dec = avcodec_alloc_context3(avDecoder);
+ #endif
      if (!newDecoder->dec)
      {
***************
*** 245,250 ****
--- 253,262 ----
      if (numFFMPEGThreads > 1)
      {
+ #if LIBAVCODEC_VERSION_MAJOR < 54
          avcodec_thread_init(newDecoder->dec, numFFMPEGThreads);
          newDecoder->isThreaded = 1;
+ #else
+         newDecoder->dec->thread_count = numFFMPEGThreads;
+ #endif
      }
  
***************
*** 253,257 ****
--- 265,273 ----
      newDecoder->dec->pix_fmt = PIX_FMT_YUV422P;
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (avcodec_open(newDecoder->dec, avDecoder) < 0)
+ #else
+     if (avcodec_open2(newDecoder->dec, avDecoder, NULL) < 0)
+ #endif
      {
          ml_log_error("Could not open decoder\n");

Index: mpegi_stream_connect.c
===================================================================
RCS file: /cvsroot/ingex/ingex/player/ingex_player/mpegi_stream_connect.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mpegi_stream_connect.c	27 Sep 2011 10:14:29 -0000	1.7
--- mpegi_stream_connect.c	19 Apr 2012 09:23:20 -0000	1.8
***************
*** 91,95 ****
--- 91,97 ----
  
      AVCodecContext* dec;
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      int isThreaded;
+ #endif
      int openedDecoder; /* only close if decoder opened */
      AVFrame *decFrame;
***************
*** 176,179 ****
--- 178,182 ----
      /* free the decoder */
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if ((*decoder)->isThreaded)
      {
***************
*** 182,185 ****
--- 185,189 ----
          /* avcodec_thread_free((*decoder)->dec); */
      }
+ #endif
      if ((*decoder)->openedDecoder)
      {
***************
*** 236,240 ****
--- 240,248 ----
      }
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      newDecoder->dec = avcodec_alloc_context();
+ #else
+     newDecoder->dec = avcodec_alloc_context3(avDecoder);
+ #endif
      if (!newDecoder->dec)
      {
***************
*** 245,250 ****
--- 253,262 ----
      if (numFFMPEGThreads > 1)
      {
+ #if LIBAVCODEC_VERSION_MAJOR < 54
          avcodec_thread_init(newDecoder->dec, numFFMPEGThreads);
          newDecoder->isThreaded = 1;
+ #else
+         newDecoder->dec->thread_count = numFFMPEGThreads;
+ #endif
      }
  
***************
*** 253,257 ****
--- 265,273 ----
      newDecoder->dec->pix_fmt = PIX_FMT_YUV422P;
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (avcodec_open(newDecoder->dec, avDecoder) < 0)
+ #else
+     if (avcodec_open2(newDecoder->dec, avDecoder, NULL) < 0)
+ #endif
      {
          ml_log_error("Could not open decoder\n");

Index: dv_stream_connect.c
===================================================================
RCS file: /cvsroot/ingex/ingex/player/ingex_player/dv_stream_connect.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dv_stream_connect.c	10 Nov 2011 10:53:35 -0000	1.14
--- dv_stream_connect.c	19 Apr 2012 09:23:20 -0000	1.15
***************
*** 91,95 ****
--- 91,97 ----
  
      AVCodecContext* dec;
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      int isThreaded;
+ #endif
      int openedDecoder; /* only close if decoder opened */
      AVFrame *decFrame;
***************
*** 176,179 ****
--- 178,182 ----
      /* free the decoder */
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if ((*decoder)->isThreaded)
      {
***************
*** 182,185 ****
--- 185,189 ----
          /* avcodec_thread_free((*decoder)->dec); */
      }
+ #endif
      if ((*decoder)->openedDecoder)
      {
***************
*** 236,240 ****
--- 240,248 ----
      }
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      newDecoder->dec = avcodec_alloc_context();
+ #else
+     newDecoder->dec = avcodec_alloc_context3(avDecoder);
+ #endif
      if (!newDecoder->dec)
      {
***************
*** 245,250 ****
--- 253,262 ----
      if (numFFMPEGThreads > 1)
      {
+ #if LIBAVCODEC_VERSION_MAJOR < 54
          avcodec_thread_init(newDecoder->dec, numFFMPEGThreads);
          newDecoder->isThreaded = 1;
+ #else
+         newDecoder->dec->thread_count = numFFMPEGThreads;
+ #endif
      }
  
***************
*** 264,268 ****
--- 276,284 ----
      }
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (avcodec_open(newDecoder->dec, avDecoder) < 0)
+ #else
+     if (avcodec_open2(newDecoder->dec, avDecoder, NULL) < 0)
+ #endif
      {
          ml_log_error("Could not open decoder\n");

Index: ffmpeg_source.c
===================================================================
RCS file: /cvsroot/ingex/ingex/player/ingex_player/ffmpeg_source.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ffmpeg_source.c	27 Oct 2011 13:45:37 -0000	1.15
--- ffmpeg_source.c	19 Apr 2012 09:23:20 -0000	1.16
***************
*** 488,492 ****
--- 488,496 ----
      codecContext->error_concealment = 3;
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (avcodec_open(codecContext, codec) < 0)
+ #else
+     if (avcodec_open2(codecContext, codec, NULL) < 0)
+ #endif
      {
          ml_log_error("Failed to open ffmpeg video codec\n");
***************
*** 496,499 ****
--- 500,504 ----
      if (source->threadCount > 1)
      {
+ #if LIBAVCODEC_VERSION_MAJOR < 54
          if (avcodec_thread_init(codecContext, source->threadCount) < 0)
          {
***************
*** 503,506 ****
--- 508,514 ----
          }
          codecContext->thread_count = source->threadCount;
+ #else
+         codecContext->thread_count = source->threadCount;
+ #endif
      }
  
***************
*** 834,838 ****
--- 842,850 ----
      codecContext->sample_rate = 48000;
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (avcodec_open(codecContext, codec) < 0)
+ #else
+     if (avcodec_open2(codecContext, codec, NULL) < 0)
+ #endif
      {
          ml_log_error("Failed to open ffmpeg video codec\n");
***************
*** 842,845 ****
--- 854,858 ----
      if (source->threadCount > 1)
      {
+ #if LIBAVCODEC_VERSION_MAJOR < 54
          if (avcodec_thread_init(codecContext, source->threadCount) < 0)
          {
***************
*** 849,852 ****
--- 862,868 ----
          }
          codecContext->thread_count = source->threadCount;
+ #else
+         codecContext->thread_count = source->threadCount;
+ #endif
      }
  
***************
*** 1846,1853 ****
              if (result < 0)
              {
! #if (LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0))
                  error = url_ferror(source->formatContext->pb);
  #else
!                 error = url_ferror(&source->formatContext->pb);
  #endif
                  if (error != 0)
--- 1862,1871 ----
              if (result < 0)
              {
! #if LIBAVFORMAT_VERSION_INT < ((52<<16)+(0<<8)+0)
!                 error = url_ferror(&source->formatContext->pb);
! #elif LIBAVCODEC_VERSION_MAJOR < 54
                  error = url_ferror(source->formatContext->pb);
  #else
!                 error = source->formatContext->pb->error;
  #endif
                  if (error != 0)
***************
*** 2104,2107 ****
--- 2122,2126 ----
      close_timecode_stream(source);
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      if (source->formatContext != NULL)
      {
***************
*** 2109,2112 ****
--- 2128,2134 ----
          source->formatContext = NULL;
      }
+ #else
+     avformat_close_input(&source->formatContext);
+ #endif
  
  
***************
*** 2119,2123 ****
--- 2141,2150 ----
  {
      FFMPEGSource* newSource = NULL;
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      AVFormatParameters formatParams;
+ #else
+     AVDictionary *opts = NULL;
+     char opts_buf[1024];
+ #endif
      AVInputFormat* inputFormat = NULL;
      AVCodecContext* codecContext = NULL;
***************
*** 2130,2134 ****
--- 2157,2163 ----
      uint32_t mov_start_timecode = 0;
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      memset(&formatParams, 0, sizeof(formatParams));
+ #endif
  
      av_register_all();
***************
*** 2157,2166 ****
      /* open the file */
  
      formatParams.width = 0;
      formatParams.height= 0;
      formatParams.time_base = (AVRational){1, 25}; /* default */
      formatParams.pix_fmt = PIX_FMT_NONE;
- 
      result = av_open_input_file(&newSource->formatContext, filename, inputFormat, 0, &formatParams);
      if (result < 0)
      {
--- 2186,2202 ----
      /* open the file */
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      formatParams.width = 0;
      formatParams.height= 0;
      formatParams.time_base = (AVRational){1, 25}; /* default */
      formatParams.pix_fmt = PIX_FMT_NONE;
      result = av_open_input_file(&newSource->formatContext, filename, inputFormat, 0, &formatParams);
+ #else
+     snprintf(opts_buf, sizeof(opts_buf), "%d/%d", 25, 1);
+     av_dict_set(&opts, "framerate", opts_buf, 0);
+     result = avformat_open_input(&newSource->formatContext, filename, inputFormat, &opts);
+     av_dict_free(&opts);
+ #endif
+ 
      if (result < 0)
      {
***************
*** 2201,2205 ****
--- 2237,2245 ----
      }
  
+ #if LIBAVCODEC_VERSION_MAJOR < 54
      result = av_find_stream_info(newSource->formatContext);
+ #else
+     result = avformat_find_stream_info(newSource->formatContext, NULL);
+ #endif
      if (result < 0)
      {