Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772'
* commit 'd8039ef8d221ea273aa4f1e62e5df21bf618c772': D3D11va: add a Direct3D11 video decoder similar to DXVA2 Conflicts: Changelog configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dxva2_vc1.c libavcodec/version.h libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
- Loading branch information
Showing
19 changed files
with
683 additions
and
157 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Direct3D11 HW acceleration | ||
| * | ||
| * copyright (c) 2009 Laurent Aimar | ||
| * copyright (c) 2015 Steve Lhomme | ||
| * | ||
| * This file is part of FFmpeg. | ||
| * | ||
| * FFmpeg is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * FFmpeg is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with FFmpeg; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| */ | ||
|
|
||
| #ifndef AVCODEC_D3D11VA_H | ||
| #define AVCODEC_D3D11VA_H | ||
|
|
||
| /** | ||
| * @file | ||
| * @ingroup lavc_codec_hwaccel_d3d11va | ||
| * Public libavcodec D3D11VA header. | ||
| */ | ||
|
|
||
| #if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 | ||
| #undef _WIN32_WINNT | ||
| #define _WIN32_WINNT 0x0600 | ||
| #endif | ||
|
|
||
| #include <stdint.h> | ||
| #include <d3d11.h> | ||
|
|
||
| /** | ||
| * @defgroup lavc_codec_hwaccel_d3d11va Direct3D11 | ||
| * @ingroup lavc_codec_hwaccel | ||
| * | ||
| * @{ | ||
| */ | ||
|
|
||
| #define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for Direct3D11 and old UVD/UVD+ ATI video cards | ||
| #define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 ///< Work around for Direct3D11 and old Intel GPUs with ClearVideo interface | ||
|
|
||
| /** | ||
| * This structure is used to provides the necessary configurations and data | ||
| * to the Direct3D11 FFmpeg HWAccel implementation. | ||
| * | ||
| * The application must make it available as AVCodecContext.hwaccel_context. | ||
| */ | ||
| struct AVD3D11VAContext { | ||
| /** | ||
| * D3D11 decoder object | ||
| */ | ||
| ID3D11VideoDecoder *decoder; | ||
|
|
||
| /** | ||
| * D3D11 VideoContext | ||
| */ | ||
| ID3D11VideoContext *video_context; | ||
|
|
||
| /** | ||
| * D3D11 configuration used to create the decoder | ||
| */ | ||
| D3D11_VIDEO_DECODER_CONFIG *cfg; | ||
|
|
||
| /** | ||
| * The number of surface in the surface array | ||
| */ | ||
| unsigned surface_count; | ||
|
|
||
| /** | ||
| * The array of Direct3D surfaces used to create the decoder | ||
| */ | ||
| ID3D11VideoDecoderOutputView **surface; | ||
|
|
||
| /** | ||
| * A bit field configuring the workarounds needed for using the decoder | ||
| */ | ||
| uint64_t workaround; | ||
|
|
||
| /** | ||
| * Private to the FFmpeg AVHWAccel implementation | ||
| */ | ||
| unsigned report_id; | ||
| }; | ||
|
|
||
| /** | ||
| * @} | ||
| */ | ||
|
|
||
| #endif /* AVCODEC_D3D11VA_H */ |
Oops, something went wrong.