* qatar/master: (22 commits)
  rv40dsp x86: use only one register, for both increment and loop counter
  rv40dsp: implement prescaled versions for biweight.
  avconv: use default channel layouts when they are unknown
  avconv: parse channel layout string
  nutdec: K&R formatting cosmetics
  vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata
  mem: Consistently return NULL for av_malloc(0)
  vf_overlay: implement poll_frame()
  vf_scale: support named constants for sws flags.
  lavc doxy: add all installed headers to doxy groups.
  lavc doxy: add avfft to the main lavc group.
  lavc doxy: add remaining avcodec.h functions to a misc doxygen group.
  lavc doxy: add AVPicture functions to a doxy group.
  lavc doxy: add resampling functions to a doxy group.
  lavc doxy: replace \ with /
  lavc doxy: add encoding functions to a doxy group.
  lavc doxy: add decoding functions to a doxy group.
  lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO}
  lavc doxy: add AVPacket-related stuff to a separate doxy group.
  lavc doxy: add core functions/definitions to a doxy group.
  ...
Conflicts:
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/vda.c
	libavcodec/x86/rv40dsp.asm
	libavfilter/vf_scale.c
	libavformat/nutdec.c
	libavutil/mem.c
	tests/ref/acodec/pcm_s24daud
Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
	
			
		
			
				
	
	
		
			89 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
		
			2.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * DXVA2 HW acceleration
 | 
						|
 *
 | 
						|
 * copyright (c) 2009 Laurent Aimar
 | 
						|
 *
 | 
						|
 * 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_DXVA_H
 | 
						|
#define AVCODEC_DXVA_H
 | 
						|
 | 
						|
/**
 | 
						|
 * @file
 | 
						|
 * @ingroup lavc_codec_hwaccel_dxva2
 | 
						|
 * Public libavcodec DXVA2 header.
 | 
						|
 */
 | 
						|
 | 
						|
#include <stdint.h>
 | 
						|
 | 
						|
#include <d3d9.h>
 | 
						|
#include <dxva2api.h>
 | 
						|
 | 
						|
/**
 | 
						|
 * @defgroup lavc_codec_hwaccel_dxva2 DXVA2
 | 
						|
 * @ingroup lavc_codec_hwaccel
 | 
						|
 *
 | 
						|
 * @{
 | 
						|
 */
 | 
						|
 | 
						|
#define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards
 | 
						|
 | 
						|
/**
 | 
						|
 * This structure is used to provides the necessary configurations and data
 | 
						|
 * to the DXVA2 FFmpeg HWAccel implementation.
 | 
						|
 *
 | 
						|
 * The application must make it available as AVCodecContext.hwaccel_context.
 | 
						|
 */
 | 
						|
struct dxva_context {
 | 
						|
    /**
 | 
						|
     * DXVA2 decoder object
 | 
						|
     */
 | 
						|
    IDirectXVideoDecoder *decoder;
 | 
						|
 | 
						|
    /**
 | 
						|
     * DXVA2 configuration used to create the decoder
 | 
						|
     */
 | 
						|
    const DXVA2_ConfigPictureDecode *cfg;
 | 
						|
 | 
						|
    /**
 | 
						|
     * The number of surface in the surface array
 | 
						|
     */
 | 
						|
    unsigned surface_count;
 | 
						|
 | 
						|
    /**
 | 
						|
     * The array of Direct3D surfaces used to create the decoder
 | 
						|
     */
 | 
						|
    LPDIRECT3DSURFACE9 *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_DXVA_H */
 |