mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

vpx: bump libvpx requirement to 1.5.0

Browse source 
Was released in Nov 2015.
This commit is contained in:
Tim-Philipp Müller 2019-08-19 11:07:56 +01:00
parent e40ba71824
commit 61bd613de3
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/vpx/gstvpxdec.c
View file

@ -375,7 +375,6 @@ gst_vpx_dec_default_send_tags (GstVPXDec * dec)
gst_event_new_tag (list)); gst_event_new_tag (list));
} }
#ifdef HAVE_VPX_1_4
struct Frame struct Frame
{ {
GstMapInfo info; GstMapInfo info;
@ -509,7 +508,6 @@ gst_vpx_dec_release_buffer_cb (gpointer priv, vpx_codec_frame_buffer_t * fb)
return 0; return 0;
} }
#endif
static void static void
gst_vpx_dec_image_to_buffer (GstVPXDec * dec, const vpx_image_t * img, 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)); gst_vpx_error_name (status));
} }
} }
#ifdef HAVE_VPX_1_4
vpx_codec_set_frame_buffer_functions (&dec->decoder, vpx_codec_set_frame_buffer_functions (&dec->decoder,
gst_vpx_dec_get_buffer_cb, gst_vpx_dec_release_buffer_cb, dec); gst_vpx_dec_get_buffer_cb, gst_vpx_dec_release_buffer_cb, dec);
#endif
dec->decoder_inited = TRUE; dec->decoder_inited = TRUE;
@ -717,13 +713,10 @@ gst_vpx_dec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
gst_video_decoder_drop_frame (decoder, frame); gst_video_decoder_drop_frame (decoder, frame);
} else { } else {
gst_vpx_dec_handle_resolution_change (dec, img, fmt); gst_vpx_dec_handle_resolution_change (dec, img, fmt);
#ifdef HAVE_VPX_1_4
if (img->fb_priv && dec->have_video_meta) { if (img->fb_priv && dec->have_video_meta) {
frame->output_buffer = gst_vpx_dec_prepare_image (dec, img); frame->output_buffer = gst_vpx_dec_prepare_image (dec, img);
ret = gst_video_decoder_finish_frame (decoder, frame); ret = gst_video_decoder_finish_frame (decoder, frame);
} else } else {
#endif
{
ret = gst_video_decoder_allocate_output_frame (decoder, frame); ret = gst_video_decoder_allocate_output_frame (decoder, frame);
if (ret == GST_FLOW_OK) { if (ret == GST_FLOW_OK) {

7
ext/vpx/meson.build
View file

@ -16,7 +16,7 @@ vpx_features = [
[ 'vpx/vp8dx.h', 'vpx_codec_vp9_dx_algo', '-DHAVE_VP9_DECODER', 'VP9 decoder' ], [ '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() if vpx_dep.found()
vpx_args = [] vpx_args = []
@ -44,11 +44,6 @@ if vpx_dep.found()
message('WARNING: libvpx was built without any encoder or decoder features!') message('WARNING: libvpx was built without any encoder or decoder features!')
endif 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') if vpx_dep.version().version_compare('>= 1.8.0')
message('Found vpx >= 1.8.0') message('Found vpx >= 1.8.0')
vpx_args += '-DHAVE_VPX_1_8' vpx_args += '-DHAVE_VPX_1_8'