Initial revision

3 files changed, 257 insertions, 0 deletions

diff --git a/vlc/build/patches/faad2_71chan_detection.patch b/vlc/build/patches/faad2_71chan_detection.patch
new file mode 100644
index 00000000..7b9aaf5d
--- /dev/null
+++ b/vlc/build/patches/faad2_71chan_detection.patch
@@ -0,0 +1,40 @@
+--- faad2-2.7/libfaad/decoder.c	2009-02-05 01:51:03.000000000 +0100
++++ faad2/libfaad/decoder.c	2017-02-28 21:14:46.946234869 +0100
+@@ -589,24 +589,30 @@
+     if (hDecoder->pce_set)
+     {
+         uint8_t i, chpos = 0;
+-        uint8_t chdir, back_center = 0;
++        uint8_t chdir, back_center = 0, total = 0;
+ 
+         hInfo->num_front_channels = hDecoder->pce.num_front_channels;
++        total += hInfo->num_front_channels;
+         hInfo->num_side_channels = hDecoder->pce.num_side_channels;
++        total += hInfo->num_side_channels;
+         hInfo->num_back_channels = hDecoder->pce.num_back_channels;
++        total += hInfo->num_back_channels;
+         hInfo->num_lfe_channels = hDecoder->pce.num_lfe_channels;
++        total += hInfo->num_lfe_channels;
+ 
+         chdir = hInfo->num_front_channels;
+         if (chdir & 1)
+         {
+ #if (defined(PS_DEC) || defined(DRM_PS))
+-            /* When PS is enabled output is always stereo */
+-            hInfo->channel_position[chpos++] = FRONT_CHANNEL_LEFT;
+-            hInfo->channel_position[chpos++] = FRONT_CHANNEL_RIGHT;
+-#else
++            if( total == 1 )
++            {
++                /* When PS is enabled output is always stereo */
++                hInfo->channel_position[chpos++] = FRONT_CHANNEL_LEFT;
++                hInfo->channel_position[chpos++] = FRONT_CHANNEL_RIGHT;
++            } else
++#endif
+             hInfo->channel_position[chpos++] = FRONT_CHANNEL_CENTER;
+             chdir--;
+-#endif
+         }
+         for (i = 0; i < chdir; i += 2)
+         {
+
diff --git a/vlc/build/patches/faad2_disable_drc.patch b/vlc/build/patches/faad2_disable_drc.patch
new file mode 100644
index 00000000..e0428012
--- /dev/null
+++ b/vlc/build/patches/faad2_disable_drc.patch
@@ -0,0 +1,44 @@
+Implementation is broken due to use of
+arbitrary reference level instead of
+normalized level.
+Fallback to not better than libav.
+fixes #9629
+
+backport of 43918c106a3c1d303b3cd087c89b9db7eb0a4029
+
+diff -Naur faad2-2.7.orig/libfaad/specrec.c faad2-2.7/libfaad/specrec.c
+--- faad2-2.7.orig/libfaad/specrec.c	2009-01-27 00:51:15.000000000 +0100
++++ faad2-2.7/libfaad/specrec.c	2017-02-23 10:31:40.527397266 +0100
+@@ -1000,12 +1000,13 @@
+         spec_coef, hDecoder->frameLength);
+ 
+     /* drc decoding */
++#if 0
+     if (hDecoder->drc->present)
+     {
+         if (!hDecoder->drc->exclude_mask[sce->channel] || !hDecoder->drc->excluded_chns_present)
+             drc_decode(hDecoder->drc, spec_coef);
+     }
+-
++#endif
+     /* filter bank */
+ #ifdef SSR_DEC
+     if (hDecoder->object_type != SSR)
+@@ -1241,6 +1242,7 @@
+         spec_coef2, hDecoder->frameLength);
+ 
+     /* drc decoding */
++#if 0
+     if (hDecoder->drc->present)
+     {
+         if (!hDecoder->drc->exclude_mask[cpe->channel] || !hDecoder->drc->excluded_chns_present)
+@@ -1248,7 +1250,7 @@
+         if (!hDecoder->drc->exclude_mask[cpe->paired_channel] || !hDecoder->drc->excluded_chns_present)
+             drc_decode(hDecoder->drc, spec_coef2);
+     }
+-
++#endif
+     /* filter bank */
+ #ifdef SSR_DEC
+     if (hDecoder->object_type != SSR)
+
diff --git a/vlc/build/patches/vlc2_ffmpeg3.patch b/vlc/build/patches/vlc2_ffmpeg3.patch
new file mode 100644
index 00000000..c69b125d
--- /dev/null
+++ b/vlc/build/patches/vlc2_ffmpeg3.patch
@@ -0,0 +1,173 @@
+Fix build with ffmpeg 3.x.
+Taken from: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=214234
+
+Some changes are identical to upstream:
+https://git.videolan.org/?p=vlc.git;a=commitdiff;h=7db8b37716c0
+https://git.videolan.org/?p=vlc.git;a=commitdiff;h=d185cfaad535
+https://git.videolan.org/?p=vlc.git;a=commitdiff;h=5f91febe28de
+https://git.videolan.org/?p=vlc.git;a=commitdiff;h=3d2850fe7284
+https://git.videolan.org/?p=vlc.git;a=commitdiff;h=dbad0d2747e7
+
+--- configure.ac.orig	2017-11-21 19:35:05.000000000 +0100
++++ configure.ac	2017-11-29 23:33:43.954389126 +0100
+@@ -2317,9 +2317,6 @@
+ [  --enable-avcodec        libavcodec codec (default enabled)])
+ AS_IF([test "${enable_avcodec}" != "no"], [
+   PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
+-    PKG_CHECK_EXISTS([libavutil < 55],, [
+-      AC_MSG_ERROR([libavutil versions 55 and later are not supported.])
+-    ])
+     VLC_SAVE_FLAGS
+     CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
+     CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
+@@ -2376,9 +2373,6 @@
+ AS_IF([test "${have_vaapi}" = "yes" -a "${have_avcodec}" = "yes"], [
+   case "${avfork}" in
+     ffmpeg)
+-      PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+-        AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.])
+-      ])
+       ;;
+   esac
+   VLC_SAVE_FLAGS
+@@ -2410,9 +2404,6 @@
+   AS_IF([test "x${have_avcodec}" = "xyes"], [
+     case "${avfork}" in
+       ffmpeg)
+-        PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+-          AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.])
+-        ])
+         ;;
+     esac
+     AC_CHECK_HEADERS(dxva2api.h,
+@@ -3174,9 +3165,6 @@
+   case "${avfork}" in
+     libav) av_vdpau_ver="55.26.0" ;;
+     ffmpeg) av_vdpau_ver="55.42.100"
+-      PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [
+-        AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.])
+-      ])
+       ;;
+   esac
+   PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [
+--- modules/codec/avcodec/audio.c.orig	2016-01-18 20:49:57 UTC
++++ modules/codec/avcodec/audio.c
+@@ -39,7 +39,7 @@
+ #include <libavcodec/avcodec.h>
+ #include <libavutil/mem.h>
+ 
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ 
+ #include "avcodec.h"
+ 
+--- modules/codec/avcodec/avcommon_compat.h.orig	2015-02-02 19:42:29 UTC
++++ modules/codec/avcodec/avcommon_compat.h
+@@ -506,6 +506,11 @@ enum {
+ 
+ #endif /* HAVE_LIBAVUTIL_AVUTIL_H */
+ 
++/* libavutil/pixfmt.h */
++#ifndef PixelFormat
++# define PixelFormat AVPixelFormat
++#endif
++
+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+ # include <libavformat/avformat.h>
+ 
+--- modules/codec/avcodec/encoder.c.orig	2015-10-21 17:48:45 UTC
++++ modules/codec/avcodec/encoder.c
+@@ -41,7 +41,7 @@
+ #include <vlc_cpu.h>
+ 
+ #include <libavcodec/avcodec.h>
+-#include <libavutil/audioconvert.h>
++#include <libavutil/channel_layout.h>
+ 
+ #include "avcodec.h"
+ #include "avcommon.h"
+@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this )
+     else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
+                              &psz_namecodec ) )
+     {
+-        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
++        if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE )
+             return VLC_EGENERIC; /* handed chroma output */
+ 
+         i_cat      = VIDEO_ES;
+@@ -1017,7 +1017,7 @@ errmsg:
+         }
+     }
+ 
+-    p_sys->frame = avcodec_alloc_frame();
++    p_sys->frame = av_frame_alloc();
+     if( !p_sys->frame )
+     {
+         goto error;
+@@ -1088,7 +1088,7 @@ static block_t *EncodeVideo( encoder_t *
+     AVFrame *frame = NULL;
+     if( likely(p_pict) ) {
+         frame = p_sys->frame;
+-        avcodec_get_frame_defaults( frame );
++        av_frame_unref( frame );
+         for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
+         {
+             p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
+@@ -1329,7 +1329,7 @@ static block_t *handle_delay_buffer( enc
+     //How much we need to copy from new packet
+     const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes;
+ 
+-    avcodec_get_frame_defaults( p_sys->frame );
++    av_frame_unref( p_sys->frame );
+     p_sys->frame->format     = p_sys->p_context->sample_fmt;
+     p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
+ 
+@@ -1451,7 +1451,7 @@ static block_t *EncodeAudio( encoder_t *
+     while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
+            ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
+     {
+-        avcodec_get_frame_defaults( p_sys->frame );
++        av_frame_unref( p_sys->frame );
+         if( p_sys->b_variable )
+             p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
+         else
+--- modules/codec/avcodec/vaapi.c.orig	2015-02-02 19:42:29 UTC
++++ modules/codec/avcodec/vaapi.c
+@@ -595,7 +595,7 @@ static int Create( vlc_va_t *p_va, AVCod
+         return err;
+ 
+     /* Only VLD supported */
+-    p_va->pix_fmt = PIX_FMT_VAAPI_VLD;
++    p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD;
+     p_va->setup = Setup;
+     p_va->get = Get;
+     p_va->release = Release;
+--- modules/codec/avcodec/video.c.orig	2016-04-07 19:36:15 UTC
++++ modules/codec/avcodec/video.c
+@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+     p_sys->p_codec = p_codec;
+     p_sys->i_codec_id = i_codec_id;
+     p_sys->psz_namecodec = psz_namecodec;
+-    p_sys->p_ff_pic = avcodec_alloc_frame();
++    p_sys->p_ff_pic = av_frame_alloc();
+     p_sys->b_delayed_open = true;
+     p_sys->p_va = NULL;
+     vlc_sem_init( &p_sys->sem_mt, 0 );
+@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo
+     if( ffmpeg_OpenCodec( p_dec ) < 0 )
+     {
+         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+-        avcodec_free_frame( &p_sys->p_ff_pic );
++        av_frame_free( &p_sys->p_ff_pic );
+         vlc_sem_destroy( &p_sys->sem_mt );
+         free( p_sys );
+         return VLC_EGENERIC;
+@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec )
+     wait_mt( p_sys );
+ 
+     if( p_sys->p_ff_pic )
+-        avcodec_free_frame( &p_sys->p_ff_pic );
++        av_frame_free( &p_sys->p_ff_pic );
+ 
+     if( p_sys->p_va )
+         vlc_va_Delete( p_sys->p_va );