From patchwork Sat Apr 14 15:53:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 8442 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1937207jad; Sat, 14 Apr 2018 08:54:06 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+dXGVLdUWtxC5PleShIrk/qgRgN3xAvnN8OM72lN9poZpnT64r4w3gk62u5lQMe/gTsuZa X-Received: by 10.28.238.19 with SMTP id m19mr6453161wmh.126.1523721246911; Sat, 14 Apr 2018 08:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523721246; cv=none; d=google.com; s=arc-20160816; b=JTZ3v3OEgam/ABIzMSMrXhdBu0yr+4ZOi9lq8wFdbNz4agcNdnqNcxxJayOESUHXDb ysoS76r7mE3f0xIbz3ES1ouaAVeQ+hh/V9ukaDkRaYUI6cKSAWefaf/6+yP4aHK+Os+u fU1C7Fjxg4ci00PKxs/1v71H47Ls7E5FQC8ckN2cPUtRm0XJnP23zEUeWrKJRIMAvxPt 4pearU5gR7nt6jHMyhqokNmFMSNtsezWxLwLKKXCGm4eQqZEbCPIvqvS6ne8Rpl4EU2x sJCDdl7ZNnhZZeRXZMX+sAS5FhhRNdOjxokTrpfVZbxUYV0JfAbN39D2rRNHj+Y/B1xO bEkA== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=2LNvVtGkJR9goHfvpGY2VQZpJzxpM+fFUakHOI+Kzu8=; b=MvQ4aICNqxi6SsBjSuVy/Ia5mfRN6ZCYt2IA+92sPDIutK+JSW7+RBj+FgvCfYlP8F mvZEI6R4YeR/2A7uSKUkGgBGDEJKkhYb7InVgnX8ENhl+k+Tztr4eBv399ZRI2iTFV41 pd2qgRg5J5Fu8+yZPAvBMRaHDbq3p6xYVhId884z6hjS7jwpUxNrecb0l3puSY11QLfV Iv7ekSkwj6zysZbAfvddysGIy06/EE9YLRPAVgoRaC6bXl0zb141pi9m5IQKZQXbJgsg Ows41Gvg6Kds+aBE4tTOcIQK58kaOt2QtqXEckbLzn9cnnw8lQ8WXABTqQamEoe32RB/ pinw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=XaCqQfkk; 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 s2si3259554wmd.215.2018.04.14.08.54.06; Sat, 14 Apr 2018 08:54:06 -0700 (PDT) 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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=XaCqQfkk; 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 2831A689E17; Sat, 14 Apr 2018 18:53:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CACD5689C8D for ; Sat, 14 Apr 2018 18:53:25 +0300 (EEST) Received: by mail-wr0-f176.google.com with SMTP id d19so15116821wre.1 for ; Sat, 14 Apr 2018 08:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=jwWFMmZ9yzhu16yWEUfhXfNnY8/E7dzoVrQpYFDctDw=; b=XaCqQfkkNKBlkOSHFAmBaPkeeDQTLVGHbECipQVcObM+aDpGQRIiaemFRcEP6NNoE6 hwVCnZErMMpRwAP95+6g8K/QCrNunpGorxj+ll9noT1xjly9SIYTNlfQk2rnIoMdynqc xPVv2BCBLtB2XA5bs1YFI9MXIVsy/c+yWcFqJof26V/SykbzITO+peFn88krkuMSbpE/ o3GGehRs1Wou5aNzJ19mWIeBd/Dlj4olbbpc5LhQh6fVjm2QLzmG9z7l1zmbDCa2LQaT mn+/ct9Eb7RFVxemyEcfoQxXkOyy1NYd1EyB6uImt5zpJVr2FC0iY96XZQzENgYsqUNC mwgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=jwWFMmZ9yzhu16yWEUfhXfNnY8/E7dzoVrQpYFDctDw=; b=bE7g8jQ34NZimH7QjZ1lp3EF0KQ7ZAlZuoUxti7PXZ67qYkmhKYYjyXq51C50JXAh/ g6oXW6BPHVViAHnUN8ZC/+v/nR9clQY5Fn3plkq4FDmehA3x+IEAg5sk/7U+dXaqvkfb bQ4PVywMk41O1jiZXUZhPq1KUWQ3pJEY/lp2LHzWUxR6ZemXREMIUBZz1Mdaa8dEDmjc 6SpkjBx0g/emsG0oDHWuFh09RqIJVhJ//WnjwdqkPw49dfSNmT4UspGgFviTcvl1HKdO CfEVfqScxd1mMVJff7xiHqU5ECCwybAdaa4iAS9C1eZyqlmCiiI2F03yKKmiLZenT9Sc Pm1A== X-Gm-Message-State: ALQs6tCI3lQLh8YmyGSxXOeBVZ22qVjSZFp5NSx1DNHE/PneLF32kzuI h46zW3KaqQE3hMf4VdgldAzOKM/3 X-Received: by 10.28.192.8 with SMTP id q8mr6063976wmf.103.1523721230696; Sat, 14 Apr 2018 08:53:50 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id n49sm13651823wrn.50.2018.04.14.08.53.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Apr 2018 08:53:50 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Apr 2018 16:53:39 +0100 Message-Id: <20180414155339.22839-5-sw@jkqxz.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180414155339.22839-1-sw@jkqxz.net> References: <20180414155339.22839-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 5/5] amfenc: Remove spurious initialisations 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also minor cosmetics. --- libavcodec/amfenc.c | 70 ++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 44 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index e641048532..93fcee9480 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -107,16 +107,11 @@ static AMFTraceWriterVtbl tracer_vtbl = static int amf_load_library(AVCodecContext *avctx) { - AmfContext *ctx = avctx->priv_data; - AMFInit_Fn init_fun = NULL; - AMFQueryVersion_Fn version_fun = NULL; - AMF_RESULT res = AMF_OK; + AmfContext *ctx = avctx->priv_data; + AMFInit_Fn init_fun; + AMFQueryVersion_Fn version_fun; + AMF_RESULT res; - ctx->eof = 0; - ctx->delayed_drain = 0; - ctx->hw_frames_ctx = NULL; - ctx->hw_device_ctx = NULL; - ctx->delayed_surface = NULL; ctx->delayed_frame = av_frame_alloc(); if (!ctx->delayed_frame) { return AVERROR(ENOMEM); @@ -326,10 +321,10 @@ static int amf_init_context(AVCodecContext *avctx) static int amf_init_encoder(AVCodecContext *avctx) { - AmfContext *ctx = avctx->priv_data; - const wchar_t *codec_id = NULL; - AMF_RESULT res = AMF_OK; - enum AVPixelFormat pix_fmt; + AmfContext *ctx = avctx->priv_data; + const wchar_t *codec_id = NULL; + AMF_RESULT res; + enum AVPixelFormat pix_fmt; switch (avctx->codec->id) { case AV_CODEC_ID_H264: @@ -360,9 +355,9 @@ static int amf_init_encoder(AVCodecContext *avctx) int av_cold ff_amf_encode_close(AVCodecContext *avctx) { - AmfContext *ctx = avctx->priv_data; - if (ctx->delayed_surface) - { + AmfContext *ctx = avctx->priv_data; + + if (ctx->delayed_surface) { ctx->delayed_surface->pVtbl->Release(ctx->delayed_surface); ctx->delayed_surface = NULL; } @@ -402,11 +397,11 @@ int av_cold ff_amf_encode_close(AVCodecContext *avctx) static int amf_copy_surface(AVCodecContext *avctx, const AVFrame *frame, AMFSurface* surface) { - AMFPlane *plane = NULL; - uint8_t *dst_data[4]; - int dst_linesize[4]; - int planes; - int i; + AMFPlane *plane; + uint8_t *dst_data[4]; + int dst_linesize[4]; + int planes; + int i; planes = surface->pVtbl->GetPlanesCount(surface); av_assert0(planes < FF_ARRAY_ELEMS(dst_data)); @@ -437,11 +432,11 @@ static inline int timestamp_queue_enqueue(AVCodecContext *avctx, int64_t timesta static int amf_copy_buffer(AVCodecContext *avctx, AVPacket *pkt, AMFBuffer *buffer) { - AmfContext *ctx = avctx->priv_data; - int ret; - AMFVariantStruct var = {0}; - int64_t timestamp = AV_NOPTS_VALUE; - int64_t size = buffer->pVtbl->GetSize(buffer); + AmfContext *ctx = avctx->priv_data; + int ret; + AMFVariantStruct var = {0}; + int64_t timestamp = AV_NOPTS_VALUE; + int64_t size = buffer->pVtbl->GetSize(buffer); if ((ret = ff_alloc_packet2(avctx, pkt, size, 0)) < 0) { return ret; @@ -497,20 +492,7 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket *pkt, AMFBuffer *buff // amfenc API implementation int ff_amf_encode_init(AVCodecContext *avctx) { - AmfContext *ctx = avctx->priv_data; - int ret; - - ctx->factory = NULL; - ctx->debug = NULL; - ctx->trace = NULL; - ctx->context = NULL; - ctx->encoder = NULL; - ctx->library = NULL; - ctx->version = 0; - ctx->eof = 0; - ctx->format = 0; - ctx->tracer.vtbl = NULL; - ctx->tracer.avctx = NULL; + int ret; if ((ret = amf_load_library(avctx)) == 0) { if ((ret = amf_init_context(avctx)) == 0) { @@ -595,10 +577,10 @@ static void amf_release_buffer_with_frame_ref(AMFBuffer *frame_ref_storage_buffe int ff_amf_send_frame(AVCodecContext *avctx, const AVFrame *frame) { - AMF_RESULT res = AMF_OK; - AmfContext *ctx = avctx->priv_data; - AMFSurface *surface = NULL; - int ret; + AmfContext *ctx = avctx->priv_data; + AMFSurface *surface; + AMF_RESULT res; + int ret; if (!ctx->encoder) return AVERROR(EINVAL);