On Fri, Dec 16, 2016 at 09:27:35AM +0100, Steve Lhomme wrote: > On Thu, Dec 15, 2016 at 6:52 PM, Diego Biurrun <[email protected]> wrote: > > On Thu, Dec 15, 2016 at 06:01:42PM +0100, Steve Lhomme wrote: > >> From: Steve Lhomme <[email protected]> > >> > >> avconv_dxva.h has to be included and misc. typedefs have to be set to use > >> the > >> proper DXVA2 structures. > >> > >> initguid.h is included in avconv_dxva.h so any includes after that will > >> also > >> define GUIDs locally. > >> --- > >> avconv_dxva.h | 294 > >> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > >> avconv_dxva2.c | 277 +++++++++-------------------------------------------- > >> 2 files changed, 340 insertions(+), 231 deletions(-) > >> create mode 100644 avconv_dxva.h > > > > Does this pass "make check"? > > I'll "check". > > >> --- /dev/null > >> +++ b/avconv_dxva.h > >> @@ -0,0 +1,294 @@ > >> + > >> +#ifndef AVCONV_DXVA_H > >> +#define AVCONV_DXVA_H > > > > Probably dxva2.h would be a better file name. > > As replied already, it's a header that will be shared between dxva2 and > d3d11va.
I meant avconv_dxva2.h. Is that stuff specific to dxva 2.0 or 1.0? If the former, I'd add the '2' to the file name like everywhere else. > >> +static int dxva_get_decoder_configuration(AVCodecContext *s, > >> + const DXVA_DECODER_CONFIG > >> *cfg_list, > >> + unsigned cfg_count, > >> + DXVA_DECODER_CONFIG *config) > > > > You are putting static functions in a header file. They will be duplicated > > in the object code if you #include this from the d3d11va code as well. > > That's the goal. The code is the same but applies on different > structures. It must be duplicated for each variant. We don't want code duplication. Maybe you are trying to say that this file is meant to be a template that should be instantiated twice? Then it should have _template.c in the name like we do for other template files. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
