[FFmpeg-devel] [PATCH 1/4] configure: require libvpx-1.4.0 for vp[89] support

[James Zern]

On Mon, Nov 20, 2017 at 11:51 AM, James Almer <jamrial at gmail.com> wrote:
> On 11/20/2017 4:38 PM, James Zern wrote:
>> On Mon, Nov 20, 2017 at 11:17 AM, James Zern <jzern at google.com> wrote:
>>> On Sun, Nov 19, 2017 at 6:03 AM, James Almer <jamrial at gmail.com> wrote:
>>>> On 11/17/2017 10:50 PM, James Zern wrote:
>>>>> this will simplify libvpxenc/dec.c and ensure more stable versions of
>>>>> the codecs are present.
>>>>>
>>>>> Signed-off-by: James Zern <jzern at google.com>
>>>>> ---
>>>>>  configure | 20 ++++++++++----------
>>>>>  1 file changed, 10 insertions(+), 10 deletions(-)
>>>>>
>>>>> diff --git a/configure b/configure
>>>>> index c8e2e35192..bfb1d9ab3a 100755
>>>>> --- a/configure
>>>>> +++ b/configure
>>>>> @@ -5895,22 +5895,22 @@ enabled libvorbis         && require_pkg_config libvorbis vorbis vorbis/codec.h
>>>>>
>>>>>  enabled libvpx            && {
>>>>>      enabled libvpx_vp8_decoder && {
>>>>> -        check_pkg_config libvpx_vp8_decoder "vpx >= 0.9.1" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
>>>>> -            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
>>>>> -                die "ERROR: libvpx decoder version must be >=0.9.1";
>>>>> +        check_pkg_config libvpx_vp8_decoder "vpx >= 1.4.0" "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_vp8_dx ||
>>>>> +            check_lib libvpx_vp8_decoder "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver VPX_IMG_FMT_HIGHBITDEPTH" -lvpx ||
>>>>
>>>> VPX_CODEC_CAP_HIGHBITDEPTH seems to be defined in vpx_encoder.h
>>>> Is that included in vp8dx.h?
>>>>
>>>
>>> Good catch, I forgot this has since moved. I'll make this one
>>> VP9D_GET_FRAME_SIZE like I had when I made a pass at this previously.
>>
>> Actually I misread here. This is checking VPX_IMG_FMT_HIGHBITDEPTH
>> which was post-1.3.0 and comes from vpx_codec.h -> vpx_image.h which
>> both vpx_encoder/decoder include. It came in with the same change as
>> VPX_CODEC_CAP_HIGHBITDEPTH.
>
> Ah, my mistake then. I mixed the two defines.
>
> Should be good then.

Tested some configs locally and then applied. Thanks for having a look.