From: Tim-Philipp Müller <tim@centricular.com>
Date: Mon, 19 Aug 2019 10:07:56 +0000 (+0100)
Subject: vpx: bump libvpx requirement to 1.5.0
X-Git-Tag: 1.19.3~509^2~888
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61bd613de3ba73b28969b0a21454f08b55e3d9bc;p=platform%2Fupstream%2Fgstreamer.git

vpx: bump libvpx requirement to 1.5.0

Was released in Nov 2015.
---

diff --git a/ext/vpx/gstvpxdec.c b/ext/vpx/gstvpxdec.c
index da43225..3eafb7f 100644
--- a/ext/vpx/gstvpxdec.c
+++ b/ext/vpx/gstvpxdec.c
@@ -375,7 +375,6 @@ gst_vpx_dec_default_send_tags (GstVPXDec * dec)
       gst_event_new_tag (list));
 }
 
-#ifdef HAVE_VPX_1_4
 struct Frame
 {
   GstMapInfo info;
@@ -509,7 +508,6 @@ gst_vpx_dec_release_buffer_cb (gpointer priv, vpx_codec_frame_buffer_t * fb)
 
   return 0;
 }
-#endif
 
 static void
 gst_vpx_dec_image_to_buffer (GstVPXDec * dec, const vpx_image_t * img,
@@ -633,10 +631,8 @@ gst_vpx_dec_open_codec (GstVPXDec * dec, GstVideoCodecFrame * frame)
           gst_vpx_error_name (status));
     }
   }
-#ifdef HAVE_VPX_1_4
   vpx_codec_set_frame_buffer_functions (&dec->decoder,
       gst_vpx_dec_get_buffer_cb, gst_vpx_dec_release_buffer_cb, dec);
-#endif
 
   dec->decoder_inited = TRUE;
 
@@ -717,13 +713,10 @@ gst_vpx_dec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
       gst_video_decoder_drop_frame (decoder, frame);
     } else {
       gst_vpx_dec_handle_resolution_change (dec, img, fmt);
-#ifdef HAVE_VPX_1_4
       if (img->fb_priv && dec->have_video_meta) {
         frame->output_buffer = gst_vpx_dec_prepare_image (dec, img);
         ret = gst_video_decoder_finish_frame (decoder, frame);
-      } else
-#endif
-      {
+      } else {
         ret = gst_video_decoder_allocate_output_frame (decoder, frame);
 
         if (ret == GST_FLOW_OK) {
diff --git a/ext/vpx/meson.build b/ext/vpx/meson.build
index 67a713b..4f778f1 100644
--- a/ext/vpx/meson.build
+++ b/ext/vpx/meson.build
@@ -16,7 +16,7 @@ vpx_features = [
   [ 'vpx/vp8dx.h', 'vpx_codec_vp9_dx_algo', '-DHAVE_VP9_DECODER', 'VP9 decoder' ],
 ]
 
-vpx_dep = dependency('vpx', version : '>=1.3.0', required : get_option('vpx'))
+vpx_dep = dependency('vpx', version : '>=1.5.0', required : get_option('vpx'))
 
 if vpx_dep.found()
   vpx_args = []
@@ -44,11 +44,6 @@ if vpx_dep.found()
     message('WARNING: libvpx was built without any encoder or decoder features!')
   endif
 
-  if vpx_dep.version().version_compare('>= 1.4.0')
-    message('Found vpx >= 1.4.0')
-    vpx_args += '-DHAVE_VPX_1_4'
-  endif
-
   if vpx_dep.version().version_compare('>= 1.8.0')
     message('Found vpx >= 1.8.0')
     vpx_args += '-DHAVE_VPX_1_8'