* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dxva2.h"
-#include "avcodec.h"
-
-#include "mpegvideo.h"
+#include "dxva2_internal.h"
#include "h264.h"
#include "h264data.h"
unsigned bitstream_size;
};
-static void *get_surface(const Picture *picture)
-{
- return picture->data[3];
-}
-static unsigned get_surface_index(const struct dxva_context *ctx,
- const Picture *picture)
-{
- void *surface = get_surface(picture);
- unsigned i;
-
- for (i = 0; i < ctx->surface_count; i++)
- if (ctx->surface[i] == surface)
- return i;
-
- assert(0);
- return 0;
-}
-
static void fill_picture_entry(DXVA_PicEntry_H264 *pic,
unsigned index, unsigned flag)
{
{
const MpegEncContext *s = &h->s;
const Picture *current_picture = s->current_picture_ptr;
- int i;
+ int i, j;
memset(pp, 0, sizeof(*pp));
/* Configure current picture */
fill_picture_entry(&pp->CurrPic,
- get_surface_index(ctx, current_picture),
+ ff_dxva2_get_surface_index(ctx, current_picture),
s->picture_structure == PICT_BOTTOM_FIELD);
/* Configure the set of references */
pp->UsedForReferenceFlags = 0;
pp->NonExistingFrameFlags = 0;
- for (i = 0; i < FF_ARRAY_ELEMS(pp->RefFrameList); i++) {
- if (i < h->short_ref_count + h->long_ref_count) {
- const Picture *r;
- if (i < h->short_ref_count) {
- r = h->short_ref[i];
- assert(!r->long_ref);
- } else {
- r = h->long_ref[i - h->short_ref_count];
- assert(r->long_ref);
- }
+ for (i = 0, j = 0; i < FF_ARRAY_ELEMS(pp->RefFrameList); i++) {
+ const Picture *r;
+ if (j < h->short_ref_count) {
+ r = h->short_ref[j++];
+ } else {
+ r = NULL;
+ while (!r && j < h->short_ref_count + 16)
+ r = h->long_ref[j++ - h->short_ref_count];
+ }
+ if (r) {
fill_picture_entry(&pp->RefFrameList[i],
- get_surface_index(ctx, r),
+ ff_dxva2_get_surface_index(ctx, r),
r->long_ref != 0);
if ((r->reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX)
static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
unsigned position, unsigned size)
{
- H264Context *h = avctx->priv_data; /* FIXME Can't use const because of get_bits_count */
+ const H264Context *h = avctx->priv_data;
struct dxva_context *ctx = avctx->hwaccel_context;
- MpegEncContext *s = &h->s;
+ const MpegEncContext *s = &h->s;
unsigned list;
memset(slice, 0, sizeof(*slice));
slice->num_ref_idx_l0_active_minus1 = h->ref_count[0] - 1;
if (h->list_count > 1)
slice->num_ref_idx_l1_active_minus1 = h->ref_count[1] - 1;
- slice->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2;
- slice->slice_beta_offset_div2 = h->slice_beta_offset / 2;
+ slice->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26;
+ slice->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26;
slice->Reserved8Bits = 0;
for (list = 0; list < 2; list++) {
const Picture *r = &h->ref_list[list][i];
unsigned plane;
fill_picture_entry(&slice->RefPicList[list][i],
- get_surface_index(ctx, r),
+ ff_dxva2_get_surface_index(ctx, r),
r->reference == PICT_BOTTOM_FIELD);
for (plane = 0; plane < 3; plane++) {
int w, o;
if (plane == 0 && h->luma_weight_flag[list]) {
- w = h->luma_weight[list][i];
- o = h->luma_offset[list][i];
+ w = h->luma_weight[i][list][0];
+ o = h->luma_weight[i][list][1];
} else if (plane >= 1 && h->chroma_weight_flag[list]) {
- w = h->chroma_weight[list][i][plane-1];
- o = h->chroma_offset[list][i][plane-1];
+ w = h->chroma_weight[i][list][plane-1][0];
+ o = h->chroma_weight[i][list][plane-1][1];
} else {
w = 1 << (plane == 0 ? h->luma_log2_weight_denom :
h->chroma_log2_weight_denom);
slice->slice_id = h->current_slice - 1;
}
-static int commit_buffer(AVCodecContext *avctx,
- struct dxva_context *ctx,
- DXVA2_DecodeBufferDesc *dsc,
- unsigned type, const void *data, unsigned size,
- unsigned mb_count)
-{
- void *dxva_data;
- unsigned dxva_size;
- int result;
-
- if (FAILED(IDirectXVideoDecoder_GetBuffer(ctx->decoder, type,
- &dxva_data, &dxva_size))) {
- av_log(avctx, AV_LOG_ERROR, "Failed to get a buffer for %d\n", type);
- return -1;
- }
- if (size <= dxva_size) {
- memcpy(dxva_data, data, size);
-
- memset(dsc, 0, sizeof(*dsc));
- dsc->CompressedBufferType = type;
- dsc->DataSize = size;
- dsc->NumMBsInBuffer = mb_count;
-
- result = 0;
- } else {
- av_log(avctx, AV_LOG_ERROR, "Buffer for type %d was too small\n", type);
- result = -1;
- }
- if (FAILED(IDirectXVideoDecoder_ReleaseBuffer(ctx->decoder, type))) {
- av_log(avctx, AV_LOG_ERROR, "Failed to release buffer type %d\n", type);
- result = -1;
- }
- return result;
-}
-
static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx,
DXVA2_DecodeBufferDesc *bs,
DXVA2_DecodeBufferDesc *sc)
{
- H264Context *h = avctx->priv_data;
- MpegEncContext *s = &h->s;
+ const H264Context *h = avctx->priv_data;
+ const MpegEncContext *s = &h->s;
const unsigned mb_count = s->mb_width * s->mb_height;
struct dxva_context *ctx = avctx->hwaccel_context;
const Picture *current_picture = h->s.current_picture_ptr;
slice_size = ctx_pic->slice_count * sizeof(*ctx_pic->slice_long);
}
assert((bs->DataSize & 127) == 0);
- return commit_buffer(avctx, ctx, sc,
- DXVA2_SliceControlBufferType,
- slice_data, slice_size, mb_count);
+ return ff_dxva2_commit_buffer(avctx, ctx, sc,
+ DXVA2_SliceControlBufferType,
+ slice_data, slice_size, mb_count);
}
static int decode_slice(AVCodecContext *avctx,
const uint8_t *buffer, uint32_t size)
{
- H264Context *h = avctx->priv_data; /* FIXME Can't use const because of get_bits_count */
+ const H264Context *h = avctx->priv_data;
struct dxva_context *ctx = avctx->hwaccel_context;
const Picture *current_picture = h->s.current_picture_ptr;
struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
return 0;
}
-static int ff_dxva2_common_end_frame(AVCodecContext *avctx, MpegEncContext *s,
- const void *pp, unsigned pp_size,
- const void *qm, unsigned qm_size,
- int (*commit_bs_si)(AVCodecContext *,
- DXVA2_DecodeBufferDesc *bs,
- DXVA2_DecodeBufferDesc *slice))
-{
- struct dxva_context *ctx = avctx->hwaccel_context;
- unsigned buffer_count = 0;
- DXVA2_DecodeBufferDesc buffer[4];
- DXVA2_DecodeExecuteParams exec;
- int result;
-
- if (FAILED(IDirectXVideoDecoder_BeginFrame(ctx->decoder,
- get_surface(s->current_picture_ptr),
- NULL))) {
- av_log(avctx, AV_LOG_ERROR, "Failed to begin frame\n");
- return -1;
- }
-
- result = commit_buffer(avctx, ctx, &buffer[buffer_count],
- DXVA2_PictureParametersBufferType,
- pp, pp_size, 0);
- if (result) {
- av_log(avctx, AV_LOG_ERROR,
- "Failed to add picture parameter buffer\n");
- goto end;
- }
- buffer_count++;
-
- if (qm_size > 0) {
- result = commit_buffer(avctx, ctx, &buffer[buffer_count],
- DXVA2_InverseQuantizationMatrixBufferType,
- qm, qm_size, 0);
- if (result) {
- av_log(avctx, AV_LOG_ERROR,
- "Failed to add inverse quantization matrix buffer\n");
- goto end;
- }
- buffer_count++;
- }
-
- result = commit_bs_si(avctx,
- &buffer[buffer_count + 0],
- &buffer[buffer_count + 1]);
- if (result) {
- av_log(avctx, AV_LOG_ERROR,
- "Failed to add bitstream or slice control buffer\n");
- goto end;
- }
- buffer_count += 2;
-
- /* TODO Film Grain when possible */
-
- assert(buffer_count == 1 + (qm_size > 0) + 2);
-
- memset(&exec, 0, sizeof(exec));
- exec.NumCompBuffers = buffer_count;
- exec.pCompressedBuffers = buffer;
- exec.pExtensionData = NULL;
- if (FAILED(IDirectXVideoDecoder_Execute(ctx->decoder, &exec))) {
- av_log(avctx, AV_LOG_ERROR, "Failed to execute\n");
- result = -1;
- }
-
-end:
- if (FAILED(IDirectXVideoDecoder_EndFrame(ctx->decoder, NULL))) {
- av_log(avctx, AV_LOG_ERROR, "Failed to end frame\n");
- result = -1;
- }
-
- if (!result)
- ff_draw_horiz_band(s, 0, s->avctx->height);
- return result;
-}
-
static int end_frame(AVCodecContext *avctx)
{
H264Context *h = avctx->priv_data;
AVHWAccel h264_dxva2_hwaccel = {
.name = "h264_dxva2",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,
.pix_fmt = PIX_FMT_DXVA2_VLD,
.capabilities = 0,
projects / ffmpeg / blobdiff