From patchwork Thu Apr 28 16:41:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 616335 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3qwjJy5wgqz9t3Z for ; Fri, 29 Apr 2016 02:41:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5B17F88A82; Thu, 28 Apr 2016 16:41:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6-dVGKpgeN45; Thu, 28 Apr 2016 16:41:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E8B718ABCE; Thu, 28 Apr 2016 16:41:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0EC081C0D28 for ; Thu, 28 Apr 2016 16:41:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0B9F791220 for ; Thu, 28 Apr 2016 16:41:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NAbylgT9xIi6 for ; Thu, 28 Apr 2016 16:41:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by whitealder.osuosl.org (Postfix) with ESMTPS id B29478C26B for ; Thu, 28 Apr 2016 16:41:24 +0000 (UTC) Received: from fwd34.aul.t-online.de (fwd34.aul.t-online.de [172.20.26.145]) by mailout03.t-online.de (Postfix) with SMTP id 628F9130BBB for ; Thu, 28 Apr 2016 18:41:22 +0200 (CEST) Received: from fli4l.lan.fli4l (bVxLnoZfQhtCTKrdD1JpxXXVKo0BBMiLxOqCNvqdUhLM22xhN0DH+iq1+veWpyHQVa@[84.191.223.56]) by fwd34.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1avp0C-4gQfbM0; Thu, 28 Apr 2016 18:41:20 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:55286 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.87) (envelope-from ) id 1avp0B-0002Ms-O3; Thu, 28 Apr 2016 18:41:20 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 28 Apr 2016 18:41:15 +0200 Message-Id: <1461861677-22146-6-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1461861677-22146-1-git-send-email-bernd.kuhls@t-online.de> References: <1461861677-22146-1-git-send-email-bernd.kuhls@t-online.de> X-ID: bVxLnoZfQhtCTKrdD1JpxXXVKo0BBMiLxOqCNvqdUhLM22xhN0DH+iq1+veWpyHQVa X-TOI-MSGID: dbce4fdc-e086-45af-ba13-a506efd94f59 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v3 5/7] package/ffmpeg: Add patch required by Kodi 16.0-Jarvis X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Bernd Kuhls --- .../ffmpeg/0013-hevc-support-main10-decoding.patch | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 package/ffmpeg/0013-hevc-support-main10-decoding.patch diff --git a/package/ffmpeg/0013-hevc-support-main10-decoding.patch b/package/ffmpeg/0013-hevc-support-main10-decoding.patch new file mode 100644 index 0000000..ef42394 --- /dev/null +++ b/package/ffmpeg/0013-hevc-support-main10-decoding.patch @@ -0,0 +1,77 @@ +From bbab50b66f61f38415ea1fbc93314712b90901e2 Mon Sep 17 00:00:00 2001 +From: Hendrik Leppkes +Date: Sat, 30 Jan 2016 17:10:56 +0100 +Subject: [PATCH] hevc: support Main10 decoding through dxva2 + +Patch is part of the Kodi patch set for ffmpeg, downloaded from +https://github.com/xbmc/FFmpeg/. + +Patch was backported from upstream commit: +http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=ccb94789e2968329947f1c2e00d019f387f9c409 + +Signed-off-by: Bernd Kuhls +--- + Changelog | 4 ++++ + libavcodec/hevc.c | 13 ++++++++++++- + libavcodec/version.h | 2 +- + 3 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/Changelog b/Changelog +index 2e1cd36..1c60cde 100644 +--- a/Changelog ++++ b/Changelog +@@ -1,6 +1,10 @@ + Entries are sorted chronologically from oldest to youngest within each release, + releases are sorted from youngest to oldest. + ++version : ++- DXVA2-accelerated HEVC Main10 decoding ++ ++ + version 3.0: + - Common Encryption (CENC) MP4 encoding and decoding support + - DXV decoding +diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c +index 203f90a..0d53a33 100644 +--- a/libavcodec/hevc.c ++++ b/libavcodec/hevc.c +@@ -347,7 +347,9 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm + + export_stream_params(s->avctx, &s->ps, sps); + +- if (sps->pix_fmt == AV_PIX_FMT_YUV420P || sps->pix_fmt == AV_PIX_FMT_YUVJ420P) { ++ switch (sps->pix_fmt) { ++ case AV_PIX_FMT_YUV420P: ++ case AV_PIX_FMT_YUVJ420P: + #if CONFIG_HEVC_DXVA2_HWACCEL + *fmt++ = AV_PIX_FMT_DXVA2_VLD; + #endif +@@ -360,6 +362,15 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm + #if CONFIG_HEVC_VDPAU_HWACCEL + *fmt++ = AV_PIX_FMT_VDPAU; + #endif ++ break; ++ case AV_PIX_FMT_YUV420P10: ++#if CONFIG_HEVC_DXVA2_HWACCEL ++ *fmt++ = AV_PIX_FMT_DXVA2_VLD; ++#endif ++#if CONFIG_HEVC_D3D11VA_HWACCEL ++ *fmt++ = AV_PIX_FMT_D3D11VA_VLD; ++#endif ++ break; + } + + if (pix_fmt == AV_PIX_FMT_NONE) { +diff --git a/libavcodec/version.h b/libavcodec/version.h +index 37a35e0..08140b0 100644 +--- a/libavcodec/version.h ++++ b/libavcodec/version.h +@@ -30,7 +30,7 @@ + + #define LIBAVCODEC_VERSION_MAJOR 57 + #define LIBAVCODEC_VERSION_MINOR 24 +-#define LIBAVCODEC_VERSION_MICRO 102 ++#define LIBAVCODEC_VERSION_MICRO 103 + + #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ + LIBAVCODEC_VERSION_MINOR, \