2c54155407
Most of the changes are just trivial are just trivial replacements of fields from MpegEncContext with equivalent fields in H264Context. Everything in h264* other than h264.c are those trivial changes. The nontrivial parts are: 1) extracting a simplified version of the frame management code from mpegvideo.c. We don't need last/next_picture anymore, since h264 uses its own more complex system already and those were set only to appease the mpegvideo parts. 2) some tables that need to be allocated/freed in appropriate places. 3) hwaccels -- mostly trivial replacements. for dxva, the draw_horiz_band() call is moved from ff_dxva2_common_end_frame() to per-codec end_frame() callbacks, because it's now different for h264 and MpegEncContext-based decoders. 4) svq3 -- it does not use h264 complex reference system, so I just added some very simplistic frame management instead and dropped the use of ff_h264_frame_start(). Because of this I also had to move some initialization code to svq3. Additional fixes for chroma format and bit depth changes by Janne Grunau <janne-libav@jannau.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
58 lines
1.9 KiB
C
58 lines
1.9 KiB
C
/*
|
|
* DXVA2 HW acceleration
|
|
*
|
|
* copyright (c) 2010 Laurent Aimar
|
|
*
|
|
* This file is part of Libav.
|
|
*
|
|
* Libav 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.
|
|
*
|
|
* Libav 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 Libav; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_DXVA_INTERNAL_H
|
|
#define AVCODEC_DXVA_INTERNAL_H
|
|
|
|
#define _WIN32_WINNT 0x0600
|
|
#define COBJMACROS
|
|
|
|
#include "config.h"
|
|
|
|
#include "dxva2.h"
|
|
#if HAVE_DXVA_H
|
|
#include <dxva.h>
|
|
#endif
|
|
|
|
#include "avcodec.h"
|
|
#include "mpegvideo.h"
|
|
|
|
void *ff_dxva2_get_surface(const Picture *picture);
|
|
|
|
unsigned ff_dxva2_get_surface_index(const struct dxva_context *,
|
|
const Picture *picture);
|
|
|
|
int ff_dxva2_commit_buffer(AVCodecContext *, struct dxva_context *,
|
|
DXVA2_DecodeBufferDesc *,
|
|
unsigned type, const void *data, unsigned size,
|
|
unsigned mb_count);
|
|
|
|
|
|
int ff_dxva2_common_end_frame(AVCodecContext *, Picture *,
|
|
const void *pp, unsigned pp_size,
|
|
const void *qm, unsigned qm_size,
|
|
int (*commit_bs_si)(AVCodecContext *,
|
|
DXVA2_DecodeBufferDesc *bs,
|
|
DXVA2_DecodeBufferDesc *slice));
|
|
|
|
#endif /* AVCODEC_DXVA_INTERNAL_H */
|