From patchwork Fri Mar 5 16:33:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26152 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 C870344B0AC for ; Fri, 5 Mar 2021 18:42:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24D5C68ACDD; Fri, 5 Mar 2021 18:36:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0867E68ACDB for ; Fri, 5 Mar 2021 18:36:08 +0200 (EET) Received: by mail-qk1-f171.google.com with SMTP id x10so2531591qkm.8 for ; Fri, 05 Mar 2021 08:36:08 -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=u7+itW9odUSIg7tNx7olb7ETDZgAvz9Tsfqz+SpK4lI=; b=M7Q+UfqtPkzT7dt7pZFOjNIGMswCBicoO/SkRwrceHnCT1A9P//+e+RC1HCMC/bGEY B14CBEbXJOGHxZZcbOGzLJYC1Ul/lqZDDiXrqIq2HrHT0ES7ZQpERvAzG6nbDKCLMybM 14TTHkSk1hV4gaomGXL1VVOhz/VhK3l+CODmfSNBnTvW+a2EM3hJjJW1sakk3iJ/cfQv BFtbsbdPb1Ld6HVkgO+RhK0FYouiB3I4IRPl5ZQVO6w9I2nmFA0besz94KVh/aG90YUC C/UdEd3UXBguVyUPhs19lWr469SJexTTsxDOKP15NjjDYyw0keeZEejMRusLu+C5rLgK LJbg== 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=u7+itW9odUSIg7tNx7olb7ETDZgAvz9Tsfqz+SpK4lI=; b=UoSGrVim8iKvKUD4Gz8+jlXkcqUkWFaw3UxZG5eU9U8QiFnUImEnDrY+60wCUUcuPx BjJkSsE3b4Fs+EhCVjycH/rePfKHdIdrq1Igcy9+fQf4Gs55J59qGHIliVCPnn8G7MZy Rk0BeKCxuVzi6jE/DNUMnHKaEJjM4rANkp4+gW8OVPFwNkoaqmc1w/Cl/NjOE9GSdt2H aJ2WO3TZ/3UzhRGpUvw0cqQh45jxWf+Rc/5TTOnmL9ghSWVgg35lrrCayMae+jRQt1+8 tL4glA7iu0b4Gyx7Btlw/RZyllJ6jsQ4gmAbyVy7O5svYW3im6x+hjGbfNg2ZZmU72QN 7L8Q== X-Gm-Message-State: AOAM533XztgCLMzdX91qxoxA21b/y4e9ctW90yQpJ8qMDZboNyqD4b8g EHtymRH4u0KCQm7ytKyLOGjUt+qi5ii53g== X-Google-Smtp-Source: ABdhPJy+KdsOLJ0/jnS1I0ZTB5H7QRCop+zkPs6VdjqBK5Z0HUPdphTEGnqb8f53p6hswl0AHEqd+g== X-Received: by 2002:a05:620a:4549:: with SMTP id u9mr9474260qkp.113.1614962167627; Fri, 05 Mar 2021 08:36:07 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.36.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:36:07 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:24 -0300 Message-Id: <20210305163339.63164-34-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 33/48] 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 --- 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 5acb2e8fbb..c34a69b5de 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -674,8 +674,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; @@ -873,8 +872,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, @@ -976,7 +974,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; @@ -1035,7 +1033,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; @@ -1059,9 +1056,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);