* 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>
		
	
			
		
			
				
	
	
		
			186 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			186 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * VDA HW acceleration
 | |
|  *
 | |
|  * copyright (c) 2011 Sebastien Zwickert
 | |
|  *
 | |
|  * 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_VDA_H
 | |
| #define AVCODEC_VDA_H
 | |
| 
 | |
| /**
 | |
|  * @file
 | |
|  * @ingroup lavc_codec_hwaccel_vda
 | |
|  * Public libavcodec VDA header.
 | |
|  */
 | |
| 
 | |
| #include <pthread.h>
 | |
| #include <stdint.h>
 | |
| 
 | |
| // emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
 | |
| // http://openradar.appspot.com/8026390
 | |
| #undef __GNUC_STDC_INLINE__
 | |
| 
 | |
| #define Picture QuickdrawPicture
 | |
| #include <VideoDecodeAcceleration/VDADecoder.h>
 | |
| #undef Picture
 | |
| 
 | |
| /**
 | |
|  * @defgroup lavc_codec_hwaccel_vda VDA
 | |
|  * @ingroup lavc_codec_hwaccel
 | |
|  *
 | |
|  * @{
 | |
|  */
 | |
| 
 | |
| /**
 | |
|  *  This structure is used to store a decoded frame information and data.
 | |
|  */
 | |
| typedef struct {
 | |
|     /**
 | |
|     * The PTS of the frame.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     int64_t             pts;
 | |
| 
 | |
|     /**
 | |
|     * The CoreVideo buffer that contains the decoded data.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     CVPixelBufferRef    cv_buffer;
 | |
| 
 | |
|     /**
 | |
|     * A pointer to the next frame.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     struct vda_frame    *next_frame;
 | |
| } vda_frame;
 | |
| 
 | |
| /**
 | |
|  * This structure is used to provide the necessary configurations and data
 | |
|  * to the VDA FFmpeg HWAccel implementation.
 | |
|  *
 | |
|  * The application must make it available as AVCodecContext.hwaccel_context.
 | |
|  */
 | |
| struct vda_context {
 | |
|     /**
 | |
|     * VDA decoder object.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     VDADecoder          decoder;
 | |
| 
 | |
|     /**
 | |
|     * VDA frames queue ordered by presentation timestamp.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     vda_frame           *queue;
 | |
| 
 | |
|     /**
 | |
|     * Mutex for locking queue operations.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     pthread_mutex_t     queue_mutex;
 | |
| 
 | |
|     /**
 | |
|     * The frame width.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by user.
 | |
|     */
 | |
|     int                 width;
 | |
| 
 | |
|     /**
 | |
|     * The frame height.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by user.
 | |
|     */
 | |
|     int                 height;
 | |
| 
 | |
|     /**
 | |
|     * The frame format.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by user.
 | |
|     */
 | |
|     int                 format;
 | |
| 
 | |
|     /**
 | |
|     * The pixel format for output image buffers.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by user.
 | |
|     */
 | |
|     OSType              cv_pix_fmt_type;
 | |
| 
 | |
|     /**
 | |
|     * The current bitstream buffer.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     uint8_t             *bitstream;
 | |
| 
 | |
|     /**
 | |
|     * The current size of the bitstream.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     int                 bitstream_size;
 | |
| 
 | |
|     /**
 | |
|     * The reference size used for fast reallocation.
 | |
|     *
 | |
|     * - encoding: unused
 | |
|     * - decoding: Set/Unset by libavcodec.
 | |
|     */
 | |
|     int                 ref_size;
 | |
| };
 | |
| 
 | |
| /** Create the video decoder. */
 | |
| int ff_vda_create_decoder(struct vda_context *vda_ctx,
 | |
|                           uint8_t *extradata,
 | |
|                           int extradata_size);
 | |
| 
 | |
| /** Destroy the video decoder. */
 | |
| int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
 | |
| 
 | |
| /** Return the top frame of the queue. */
 | |
| vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
 | |
| 
 | |
| /** Release the given frame. */
 | |
| void ff_vda_release_vda_frame(vda_frame *frame);
 | |
| 
 | |
| /**
 | |
|  * @}
 | |
|  */
 | |
| 
 | |
| #endif /* AVCODEC_VDA_H */
 |