casa-mp-base

Description: Replace deprecated FFmpeg API

Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Last-Update: <2015-11-02>

​

--- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp.orig   2014-11-04 08:29:30.000000000 -0800

+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp    2016-04-26 14:11:34.000000000 -0700

@@ -71,7 +71,7 @@

     findAspectRatio();

     // Find out whether we support Alpha channel

-    m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);

+    m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);

     // Find out the framerate

     #if LIBAVCODEC_VERSION_MAJOR >= 56

@@ -95,20 +95,19 @@

         throw std::runtime_error("avcodec_open() failed");

     // Allocate video frame

-    m_frame.reset(avcodec_alloc_frame());

+    m_frame.reset(av_frame_alloc());

     // Allocate converted RGB frame

-    m_frame_rgba.reset(avcodec_alloc_frame());

-    m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height()));

+    m_frame_rgba.reset(av_frame_alloc());

+    m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height()));

     m_buffer_rgba[1].resize(m_buffer_rgba[0].size());

     // Assign appropriate parts of the buffer to image planes in m_frame_rgba

-    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());

+    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());

     // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame.

     m_context->opaque = this;

-    m_context->get_buffer = getBuffer;

-    m_context->release_buffer = releaseBuffer;

+    m_context->get_buffer2 = getBuffer;

 }

@@ -267,8 +266,8 @@

 #ifdef USE_SWSCALE

     if (m_swscale_ctx==0)

     {

-        m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt,

-                                      src_width, src_height, (PixelFormat) dst_pix_fmt,

+        m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt,

+                                      src_width, src_height, (AVPixelFormat) dst_pix_fmt,

                                       /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL);

     }

@@ -315,14 +314,14 @@

     AVPicture * const dst = (AVPicture *) m_frame_rgba.get();

     // Assign appropriate parts of the buffer to image planes in m_frame_rgba

-    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height());

+    avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height());

     // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine

-    if (m_context->pix_fmt == PIX_FMT_YUVA420P)

+    if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P)