From patchwork Thu Nov 16 16:36:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip Langdale X-Patchwork-Id: 6119 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6023903jah; Thu, 16 Nov 2017 08:36:34 -0800 (PST) X-Google-Smtp-Source: AGs4zMZHJ4c96fw2Vj4F1+U9mLdzdY/0eB16VzBlteLzJA74Vw0mVptEN3cYB3vgpjg9BLL9Cp3A X-Received: by 10.223.132.194 with SMTP id 60mr2081987wrg.249.1510850193906; Thu, 16 Nov 2017 08:36:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510850193; cv=none; d=google.com; s=arc-20160816; b=CPBj9oreuK8xc1wOP9fZNPzKFwnhCw64EoQzh/e11CZAY7I1I8LUrbil9HMSrFtVHX uWSpmpuaeIwShgR73cTI+SE4pNpdSLfFtnrLoUm5zkQk3gcxrLJMXEEH+meb8cQ3TuS4 VYd3LZ+iNOjEeB5+Inibq2Si+1BWYea3VK5PJHf180O8bFlF455tD9ODznkrSN+XbJma /moCJKogy1233ryLuVt6e4dXpRGFsmVTPtHVLepx7NG+XwCFwWOQL5EVU9h3z1V0D9s6 Hx27jXxrQro8GSQ5oCCT7mexQuHrsiY/W8mPo/0jbPackI5YfWKpRGlrRllYV/G6btkL okXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=JCzo94Wk2XcScCpKRyB4e4ffVv2LIWEffebrBihqFZo=; b=lE2VzIKlgwOX5LVRegYdrD0mfqj3HbRJVDQoF49qKEvGKtC6fQFIapOmDAd3pHk+LH HlPeO/OjCLh1wyz8DGAyU+vL2pVRtfwkAQ+8cYYi9F0b9dzwPnk5OUN7IzHSIoP5YdDm E0e/UfyXM4KlVKreevzAComWmvZfZRoeb8pCgLmUaY6Cw6bkM+IuSSbosmwrsf/r51h/ arz/Z5UxIJFM+rKM5kSlsCy95SCguJu2H6uG35cfXEaS98IVRalqFFE0uIplWGdwJ4/r cbOUqzrl9syRQ17014IH/pUdD/4ESiLfbctMSYwNBZPA1yqMobCjuVPTJiDZAZuH7Ci2 zTyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org header.s=mail header.b=tZpfQQ+o; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 46si1197346wrt.394.2017.11.16.08.36.33; Thu, 16 Nov 2017 08:36:33 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@overt.org header.s=mail header.b=tZpfQQ+o; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEA0F689E1F; Thu, 16 Nov 2017 18:36:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f99.google.com (mail-it0-f99.google.com [209.85.214.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CB7868056A for ; Thu, 16 Nov 2017 18:36:10 +0200 (EET) Received: by mail-it0-f99.google.com with SMTP id m191so702337itg.2 for ; Thu, 16 Nov 2017 08:36:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=p8wuwo7CP2vydeEByFNA0UBEbau3sTxCsCCCXA/6DM4=; b=lqzSkD1rTmW7LF8A6hBEfLgyd/nVn1xwLMbWZjS7DIYoaTPsaq664VIWhlRRud2i4C 4nd+opjJ8BABYFJxPd7ezMdw8C586Xe34YYdWXX8IYGyISGG5gzbWB1nHbl4JWFR3XwT uJmKbtoP8/E7X9ULnrJdaJRR8RUkC712Ttfg0xBlmmUvEwEdbPBcIeaaowU5K0djN0un wJZ6VCjnO9ywyQfI7CmIl+ZjbvqsbepACWt5shUebNUOeopqn/BNieTiMOa1eObs8qku xYDLEUECzYCUwBjOiVBHoDjBF1xQIJhaHStPSYJjCtJP807lenNPmcFlxO8bniPp/pXf yqhw== X-Gm-Message-State: AJaThX7uxD5PCAbTy9enX+Xo2eCbQhJM5W74YaQMqkBZ1jgiHUgZJt65 8TMiN8TM5vWi7cHwF0ionsgzLTtQLnJVf93gWP3YM6xt0fso1A== X-Received: by 10.36.55.83 with SMTP id r80mr2955812itr.93.1510850184591; Thu, 16 Nov 2017 08:36:24 -0800 (PST) Received: from mail.overt.org (155.208.178.107.bc.googleusercontent.com. [107.178.208.155]) by smtp-relay.gmail.com with ESMTPS id h66sm690983itg.0.2017.11.16.08.36.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Nov 2017 08:36:24 -0800 (PST) X-Relaying-Domain: gapps.overt.org Received: from authenticated-user (mail.overt.org [107.178.208.155]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.overt.org (Postfix) with ESMTPSA id DF53860046; Thu, 16 Nov 2017 16:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=overt.org; s=mail; t=1510850184; bh=HonENr2RulYHT5U7flg5E/S4sbQit6hMlMMjh98J5Ok=; h=From:To:Cc:Subject:Date:From; b=tZpfQQ+o/bjHJ25OCApY5vAJYNIzgUA4/2CnCg4Mz3zMSGQkp6uBbrb73UMKdXF6s au74l9iPuDgCfv+JH/M1qQHhAsNYqr/TR1tgYqjQZFu8FOnklM4Xj8htUylhWvaUmP vzqoNdFcBBPWj73iSEm+KtHpJJOXWTCqnclVMjrXovhKNsXInhunipQ/GMTrAdJMFB Uls8ioBuNvKfv6szDKCBeHIO9CZ6zw8rUIr5UsTRVwIT/IxVt68F0EPn3OgfCi1taH dTthkIBIbMbm24IED7k7RJ63pSnQstWMb0PoFXzDZHihwJiVvP7UrqoyHjc+M4Sgrd 9llsqtNl3jEjA== From: Philip Langdale To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Nov 2017 08:36:10 -0800 Message-Id: <20171116163610.13812-1-philipl@overt.org> Subject: [FFmpeg-devel] [PATCH] avcodec: Implement mpeg2 nvdec hwaccel X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Philip Langdale MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is mostly straight-forward. The weird part is that it should just work for mpeg1, but I see corruption in my test cases, so I'm going to try and fix that separately. Signed-off-by: Philip Langdale --- Changelog | 2 +- configure | 2 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/mpeg12dec.c | 3 + libavcodec/nvdec.c | 11 ++-- libavcodec/nvdec_mpeg12.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 8 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 libavcodec/nvdec_mpeg12.c diff --git a/Changelog b/Changelog index d2b5530ad7..385fe4037c 100644 --- a/Changelog +++ b/Changelog @@ -13,7 +13,7 @@ version : - PCE support for extended channel layouts in the AAC encoder - native aptX encoder and decoder - Raw aptX muxer and demuxer -- NVIDIA NVDEC-accelerated H.264, HEVC, VC1 and VP9 hwaccel decoding +- NVIDIA NVDEC-accelerated H.264, HEVC, MPEG-2, VC1 and VP9 hwaccel decoding - Intel QSV-accelerated overlay filter diff --git a/configure b/configure index 84f0a04925..1eedad208b 100755 --- a/configure +++ b/configure @@ -2713,6 +2713,8 @@ mpeg2_dxva2_hwaccel_deps="dxva2" mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" mpeg2_mediacodec_hwaccel_deps="mediacodec" mpeg2_mmal_hwaccel_deps="mmal" +mpeg2_nvdec_hwaccel_deps="nvdec" +mpeg2_nvdec_hwaccel_select="mpeg2video_decoder" mpeg2_qsv_hwaccel_deps="libmfx" mpeg2_vaapi_hwaccel_deps="vaapi" mpeg2_vaapi_hwaccel_select="mpeg2video_decoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6315672573..494c76da76 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -854,6 +854,7 @@ OBJS-$(CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o OBJS-$(CONFIG_MPEG1_XVMC_HWACCEL) += mpegvideo_xvmc.o OBJS-$(CONFIG_MPEG2_D3D11VA_HWACCEL) += dxva2_mpeg2.o OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) += dxva2_mpeg2.o +OBJS-$(CONFIG_MPEG2_NVDEC_HWACCEL) += nvdec_mpeg12.o OBJS-$(CONFIG_MPEG2_QSV_HWACCEL) += qsvdec_other.o OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += vaapi_mpeg2.o OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) += vdpau_mpeg12.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index e213f3757c..e0adb71951 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -96,6 +96,7 @@ static void register_all(void) REGISTER_HWACCEL(MPEG2_D3D11VA2, mpeg2_d3d11va2); REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2); REGISTER_HWACCEL(MPEG2_MMAL, mpeg2_mmal); + REGISTER_HWACCEL(MPEG2_NVDEC, mpeg2_nvdec); REGISTER_HWACCEL(MPEG2_QSV, mpeg2_qsv); REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi); REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau); diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index d5bc5f21b2..2b213eebcd 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1141,6 +1141,9 @@ static const enum AVPixelFormat mpeg1_hwaccel_pixfmt_list_420[] = { }; static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] = { +#if CONFIG_MPEG2_NVDEC_HWACCEL + AV_PIX_FMT_CUDA, +#endif #if CONFIG_MPEG2_XVMC_HWACCEL AV_PIX_FMT_XVMC, #endif diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 20d7c3db27..3d62840e9f 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -52,11 +52,12 @@ typedef struct NVDECFramePool { static int map_avcodec_id(enum AVCodecID id) { switch (id) { - case AV_CODEC_ID_H264: return cudaVideoCodec_H264; - case AV_CODEC_ID_HEVC: return cudaVideoCodec_HEVC; - case AV_CODEC_ID_VC1: return cudaVideoCodec_VC1; - case AV_CODEC_ID_VP9: return cudaVideoCodec_VP9; - case AV_CODEC_ID_WMV3: return cudaVideoCodec_VC1; + case AV_CODEC_ID_H264: return cudaVideoCodec_H264; + case AV_CODEC_ID_HEVC: return cudaVideoCodec_HEVC; + case AV_CODEC_ID_MPEG2VIDEO: return cudaVideoCodec_MPEG2; + case AV_CODEC_ID_VC1: return cudaVideoCodec_VC1; + case AV_CODEC_ID_VP9: return cudaVideoCodec_VP9; + case AV_CODEC_ID_WMV3: return cudaVideoCodec_VC1; } return -1; } diff --git a/libavcodec/nvdec_mpeg12.c b/libavcodec/nvdec_mpeg12.c new file mode 100644 index 0000000000..a03b51dd17 --- /dev/null +++ b/libavcodec/nvdec_mpeg12.c @@ -0,0 +1,153 @@ +/* + * MPEG-2 HW decode acceleration through NVDEC + * + * Copyright (c) 2017 Philip Langdale + * + * 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 + */ + +#include "avcodec.h" +#include "mpegvideo.h" +#include "nvdec.h" +#include "decode.h" + +static int get_ref_idx(AVFrame *frame) +{ + FrameDecodeData *fdd; + NVDECFrame *cf; + + if (!frame || !frame->private_ref) + return -1; + + fdd = (FrameDecodeData*)frame->private_ref->data; + cf = (NVDECFrame*)fdd->hwaccel_priv; + if (!cf) + return -1; + + return cf->idx; +} + +static int nvdec_mpeg12_start_frame(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) +{ + MpegEncContext *s = avctx->priv_data; + + NVDECContext *ctx = avctx->internal->hwaccel_priv_data; + CUVIDPICPARAMS *pp = &ctx->pic_params; + CUVIDMPEG2PICPARAMS *ppc = &pp->CodecSpecific.mpeg2; + FrameDecodeData *fdd; + NVDECFrame *cf; + AVFrame *cur_frame = s->current_picture.f; + + int ret, i; + + ret = ff_nvdec_start_frame(avctx, cur_frame); + if (ret < 0) + return ret; + + fdd = (FrameDecodeData*)cur_frame->private_ref->data; + cf = (NVDECFrame*)fdd->hwaccel_priv; + + *pp = (CUVIDPICPARAMS) { + .PicWidthInMbs = (cur_frame->width + 15) / 16, + .FrameHeightInMbs = (cur_frame->height + 15) / 16, + .CurrPicIdx = cf->idx, + + .intra_pic_flag = s->pict_type == AV_PICTURE_TYPE_I, + .ref_pic_flag = s->pict_type == AV_PICTURE_TYPE_I || + s->pict_type == AV_PICTURE_TYPE_P, + + .CodecSpecific.mpeg2 = { + .ForwardRefIdx = get_ref_idx(s->last_picture.f), + .BackwardRefIdx = get_ref_idx(s->next_picture.f), + + .picture_coding_type = s->pict_type, + .full_pel_forward_vector = s->full_pel[0], + .full_pel_backward_vector = s->full_pel[1], + .intra_dc_precision = s->intra_dc_precision, + .frame_pred_frame_dct = s->frame_pred_frame_dct, + .concealment_motion_vectors = s->concealment_motion_vectors, + .q_scale_type = s->q_scale_type, + .intra_vlc_format = s->intra_vlc_format, + .alternate_scan = s->alternate_scan, + .top_field_first = s->top_field_first, + } + }; + + ppc->f_code[0][0] = s->mpeg_f_code[0][0]; + ppc->f_code[0][1] = s->mpeg_f_code[0][1]; + ppc->f_code[1][0] = s->mpeg_f_code[1][0]; + ppc->f_code[1][1] = s->mpeg_f_code[1][1]; + + for (i = 0; i < 64; ++i) { + ppc->QuantMatrixIntra[i] = s->intra_matrix[i]; + ppc->QuantMatrixInter[i] = s->inter_matrix[i]; + } + + return 0; +} + +static int nvdec_mpeg12_end_frame(AVCodecContext *avctx) +{ + NVDECContext *ctx = avctx->internal->hwaccel_priv_data; + int ret = ff_nvdec_end_frame(avctx); + ctx->bitstream = NULL; + return ret; +} + +static int nvdec_mpeg12_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, uint32_t size) +{ + NVDECContext *ctx = avctx->internal->hwaccel_priv_data; + void *tmp; + + tmp = av_fast_realloc(ctx->slice_offsets, &ctx->slice_offsets_allocated, + (ctx->nb_slices + 1) * sizeof(*ctx->slice_offsets)); + if (!tmp) + return AVERROR(ENOMEM); + ctx->slice_offsets = tmp; + + if (!ctx->bitstream) + ctx->bitstream = (uint8_t*)buffer; + + ctx->slice_offsets[ctx->nb_slices] = buffer - ctx->bitstream; + ctx->bitstream_len += size; + ctx->nb_slices++; + + return 0; +} + +static int nvdec_mpeg12_frame_params(AVCodecContext *avctx, + AVBufferRef *hw_frames_ctx) +{ + // Each frame can at most have one P and one B reference + return ff_nvdec_frame_params(avctx, hw_frames_ctx, 2); +} + +#if CONFIG_MPEG2_NVDEC_HWACCEL +AVHWAccel ff_mpeg2_nvdec_hwaccel = { + .name = "mpeg2_nvdec", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MPEG2VIDEO, + .pix_fmt = AV_PIX_FMT_CUDA, + .start_frame = nvdec_mpeg12_start_frame, + .end_frame = nvdec_mpeg12_end_frame, + .decode_slice = nvdec_mpeg12_decode_slice, + .frame_params = nvdec_mpeg12_frame_params, + .init = ff_nvdec_decode_init, + .uninit = ff_nvdec_decode_uninit, + .priv_data_size = sizeof(NVDECContext), +}; +#endif diff --git a/libavcodec/version.h b/libavcodec/version.h index a75c885768..5b25a9a8ac 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 3 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \