From patchwork Thu Feb 4 19:09:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25424 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6F6F044A506 for ; Thu, 4 Feb 2021 21:14:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0A66689D16; Thu, 4 Feb 2021 21:11:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E79EC68AA24 for ; Thu, 4 Feb 2021 21:11:39 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id o18so3206433qtp.10 for ; Thu, 04 Feb 2021 11:11:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=brO8vWTDfhIE7QOm0p+mvRH53yrC9+XYZYwnR/pphm4=; b=fKxFtLpubTx2+IgywxPVXO3HfkoVFv5c7u5+8MuKvNTEAoItDcitZjmJMkFICeLxr+ GEITTOI78DJ/S/jRM5Lt9sd07iYHjO/uFpd/YVDsTBXky5DQeitwLTP/3A/e9WVhJxBi ReDEPVmkLrbSrO2QkkSHdIuIR+3qubdOWmPg39Z+oLpn3PxYJBwD+0k+h7B+fFY6BCxC pKRPf4nEv4cWu+G6bXUHpgD5A3Pl6FPuvOrvBVgr1mntrQvdQUKCMmNspcfsEqGzISfg MZAg3E85QBudMnwDyS71pzByrcrgToG4S7niVRcf+QkKJg8dvjj9GJG4rcFTWC9bZXms IEkQ== 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:mime-version:content-transfer-encoding; bh=brO8vWTDfhIE7QOm0p+mvRH53yrC9+XYZYwnR/pphm4=; b=GWlol5kfbUIZ64F70nMg21/g02uFl6N6TwU3IOxz/xXECNQCuXutESHVGTY1YjR92v KqIb3zBVA3jEt1vift560f60z85RdIQlM8Jq1vBbJsVBFL23ISHkY6XqaCSB2dN0E9Pt 2/wMpG0gkKayEHmxS/+gHmXdh/gObhBeTvyBIwMjnFJH+lYQ9X6R3zmLstDRoIF2FLic zxc3ycJeojKCQNQL3zOsK0GfHrEU4s0LjArr0+04bxfH6TWGKJ1bJpKQrpJC3/w0zrR+ pUlxHsqpS+0pxwr5/YASHjp5rQNxrCGMEIn1V08Oj5vxmmb51rFt1IMhvrhu75qSaRU4 ZwEQ== X-Gm-Message-State: AOAM531QGCBfKY/iuSKdZitSdZHT7Bg9wf7qt+WBtqGR3CGTcXoUsreU YCiIaI6hkqL7VHbvgGVtx578CxrvUvU= X-Google-Smtp-Source: ABdhPJzd0Lm6WvGEkmmrWEPTKD8V0TkXXL3L7gD2LOhFw8hpH0sL3QsLmuJF8pWWxlQgzOfabq/9+g== X-Received: by 2002:ac8:4794:: with SMTP id k20mr1087495qtq.36.1612465898460; Thu, 04 Feb 2021 11:11:38 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.11.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:11:37 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:49 -0300 Message-Id: <20210204191005.48190-35-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 34/50] avdevice/decklink_dec: stop using av_init_packet() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- I only removed the calls to av_init_packet() here because i can't test this code at all, so i'll leave it to the maintainer. libavdevice/decklink_dec.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 4f8103e614..23f8946d37 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -673,8 +673,7 @@ static void handle_klv(AVFormatContext *avctx, decklink_ctx *ctx, IDeckLinkVideo klv.insert(klv.end(), packet.data.begin(), packet.data.end()); } - AVPacket klv_packet; - av_init_packet(&klv_packet); + AVPacket klv_packet = { 0 }; klv_packet.pts = pts; klv_packet.dts = pts; klv_packet.flags |= AV_PKT_FLAG_KEY; @@ -872,8 +871,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( // Handle Video Frame if (videoFrame) { - AVPacket pkt; - av_init_packet(&pkt); + AVPacket pkt = { 0 }; if (ctx->frameCount % 25 == 0) { unsigned long long qsize = avpacket_queue_size(&ctx->queue); av_log(avctx, AV_LOG_DEBUG, @@ -975,7 +973,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( if (!no_video) { IDeckLinkVideoFrameAncillary *vanc; - AVPacket txt_pkt; + AVPacket txt_pkt = { 0 }; uint8_t txt_buf0[3531]; // 35 * 46 bytes decoded teletext lines + 1 byte data_identifier + 1920 bytes OP47 decode buffer uint8_t *txt_buf = txt_buf0; @@ -1034,7 +1032,6 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( txt_buf[1] = 0x2c; // data_unit_length txt_buf += 46; } - av_init_packet(&txt_pkt); txt_pkt.pts = pkt.pts; txt_pkt.dts = pkt.dts; txt_pkt.stream_index = ctx->teletext_st->index; @@ -1058,9 +1055,8 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( // Handle Audio Frame if (audioFrame) { - AVPacket pkt; + AVPacket pkt = { 0 }; BMDTimeValue audio_pts; - av_init_packet(&pkt); //hack among hacks pkt.size = audioFrame->GetSampleFrameCount() * ctx->audio_st->codecpar->channels * (ctx->audio_depth / 8);