From patchwork Thu Feb 4 19:09:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25444 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a5b:101:0:0:0:0:0 with SMTP id 1csp1376251ybx; Thu, 4 Feb 2021 11:12:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDz9Vrqmn2ovTex6EukUHk1PNvPtcQT7xTYxua4DcvEh6aCoQc+4/XPhlLzzyaydXOFtiO X-Received: by 2002:a17:907:933:: with SMTP id au19mr562593ejc.51.1612465961161; Thu, 04 Feb 2021 11:12:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612465961; cv=none; d=google.com; s=arc-20160816; b=CuoCuQ96S/didz4ZQd8FGiE990JOZIefLf8UJfaIX0BUv0AfcPKz8LwzNc4PywbqO7 y9NYrmi7zrlV5rt39mqnKtzxw7JQsP1tPHEASe6KG9agPpJedZwxUddHyuI56PlkzNnt BbUzpAXsoBfpm9By4bL/fcXk0PM7SrROfCt4R44L/q7AqK+Hd7CRZY2apkiPpki3lera 0nBe/WXnR8XaTWk/DnLZUmlv4KzGewixouotQ+mrBAI9mBLquhM3XI7C8wjcQFki7s5j mARSE5Z5p66+/464YeKEPRdECjTXjO5m6xXAnQ/OY+CxE3mn7XmXhTOVzseYLaesYWQp zGdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=6wR8d8czPSW2hKy7UtvYz58oGQnA3c/s/4nVT16yq/g=; b=RKGeehX0jZtGvG7cpDoo4+UTFtwogGfYJQyG8yaOOm3gQBDoPzPsLjZBzSXnDqfy+q 1rkbCgE5ay93CiFLZ8mV4XedR66F/O6J2350vFFvO4oJBafBUVmTNbR/Z4I71sckpknF zpH4AW2+1v9YJYlKGpBveSoPDbncrQJSzMy5SHF/Sjfrd72uxaA/pOQ237qV3BO32wwp 6NkkHIJ521ZfCruAzMWCUMZTWRSkQM1/pBWTdM8cgsrnh8CfyyaQCqVaumSWxhfn4iz3 NTaljgBLFmaZguKHURmSqqTgBgcfxjKSqDu3fWuPikhzx+z9ERApbzKAjTMUemmKCnin gAFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VqP5jWG4; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m19si3471028ejj.220.2021.02.04.11.12.40; Thu, 04 Feb 2021 11:12:41 -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=@gmail.com header.s=20161025 header.b=VqP5jWG4; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C3C3968A779; Thu, 4 Feb 2021 21:11:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02BBC6880AF for ; Thu, 4 Feb 2021 21:10:59 +0200 (EET) Received: by mail-qt1-f169.google.com with SMTP id e11so3223262qtg.6 for ; Thu, 04 Feb 2021 11:10:59 -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=kGUf7GpJDUg/AMJ01vO/31sHTCnRNffWzJgst1pmEyw=; b=VqP5jWG46/yGMI4XTWV7E2cE9mgL+QXPkH0u4jDIvEtEnnyW/dekqO2wV3dmkCKJ01 P00fOMZj8NnWgcRtVIg8yZy1m/VCLlmbBGcvlmBzDZmD55teY+4O0NbBITDsfL/aY81k 2abQmgeSfv46IDHcf/3LIJg8ndmUwjt6Xux2NAQHhL4QZf5sxhvwGWiiC+1jKx/Mvg05 3cV/LpjLiRUoCkA3LGqjUG1iAGBysGl15mUc6Xd6pDVGw73ZeJMnw73dFxS8O9XZOWjK uH2Sm+Gnr8YaDyHujmHQzguvz6FBiOH48KXEdYi+dAgPpVCHBb14Wy/X79s7FtetBUGJ bBPg== 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=kGUf7GpJDUg/AMJ01vO/31sHTCnRNffWzJgst1pmEyw=; b=GmXmanTQirprxppwig4xvu1jAAMA6NOPkuT07JKQK+7IvGMpv+wLtvZ8Z2iQc6Szv0 AyJGVe7mLW/a4pZOa75RdT/rCc2NvJ9DFJ6yBAuiIxTx6oEomKhEIlIbL4wi48sqCFHM LurEThlfSDmppr/4EipEffGAc3QllRVsXbPQdjBK3YbWP6eVB90Cpih4DOBedrqEG45v X+n1AhFEaW5DIH3m4zLAgELXx0NcTLX52EYTnYB19mhD1t6QDbUK4RLyq6RUMJn0wdjy lJfPjH2DoRQxcFwbS/tYWZIm8bf12AXqeXTr90hiYC37Avzxw28lEeCGgIhNb3l6VEwv K/mg== X-Gm-Message-State: AOAM530faDUIdw4nHAGJlUPABbOMYe3NTpn5/YSbxX5iO1cFRmqU0Oom QpspGny82aRBsX7mHmCDlupOtCZOSA8= X-Received: by 2002:ac8:768c:: with SMTP id g12mr1085186qtr.24.1612465858065; Thu, 04 Feb 2021 11:10:58 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.10.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:10:57 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:31 -0300 Message-Id: <20210204191005.48190-17-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 16/50] avformat/dv: use av_packet_alloc() to allocate packets 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" X-TUID: K/TYcOShWtat Content-Length: 8179 Signed-off-by: James Almer --- This one must be committed after the upcoming major bump, as it changes the return value of an avpriv function. libavdevice/iec61883.c | 2 +- libavformat/dv.c | 56 ++++++++++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c index cafafb2672..4582ada151 100644 --- a/libavdevice/iec61883.c +++ b/libavdevice/iec61883.c @@ -191,7 +191,7 @@ static int iec61883_parse_queue_dv(struct iec61883_data *dv, AVPacket *pkt) int size; size = avpriv_dv_get_packet(dv->dv_demux, pkt); - if (size > 0) + if (size) return size; packet = dv->queue_first; diff --git a/libavformat/dv.c b/libavformat/dv.c index 26a78139f5..f5c0c44afc 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -45,7 +45,7 @@ struct DVDemuxContext { AVFormatContext* fctx; AVStream* vst; AVStream* ast[4]; - AVPacket audio_pkt[4]; + AVPacket *audio_pkt[4]; uint8_t audio_buf[4][8192]; int ach; int frames; @@ -261,11 +261,10 @@ static int dv_extract_audio_info(DVDemuxContext *c, const uint8_t *frame) c->ast[i]->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; c->ast[i]->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; - av_init_packet(&c->audio_pkt[i]); - c->audio_pkt[i].size = 0; - c->audio_pkt[i].data = c->audio_buf[i]; - c->audio_pkt[i].stream_index = c->ast[i]->index; - c->audio_pkt[i].flags |= AV_PKT_FLAG_KEY; + c->audio_pkt[i]->size = 0; + c->audio_pkt[i]->data = c->audio_buf[i]; + c->audio_pkt[i]->stream_index = c->ast[i]->index; + c->audio_pkt[i]->flags |= AV_PKT_FLAG_KEY; } c->ast[i]->codecpar->sample_rate = dv_audio_frequency[freq]; c->ast[i]->codecpar->channels = 2; @@ -332,6 +331,12 @@ static int dv_init_demux(AVFormatContext *s, DVDemuxContext *c) c->vst->codecpar->bit_rate = 25000000; c->vst->start_time = 0; + for (int i = 0; i < 4; i++) { + c->audio_pkt[i] = av_packet_alloc(); + if (!c->audio_pkt[i]) + return AVERROR(ENOMEM); + } + return 0; } @@ -353,13 +358,15 @@ DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s) int avpriv_dv_get_packet(DVDemuxContext *c, AVPacket *pkt) { - int size = -1; + int size = 0; int i; for (i = 0; i < c->ach; i++) { - if (c->ast[i] && c->audio_pkt[i].size) { - *pkt = c->audio_pkt[i]; - c->audio_pkt[i].size = 0; + if (c->ast[i] && c->audio_pkt[i]->size) { + int ret = av_packet_ref(pkt, c->audio_pkt[i]); + if (ret < 0) + return ret; + c->audio_pkt[i]->size = 0; size = pkt->size; break; } @@ -384,9 +391,9 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, /* FIXME: in case of no audio/bad audio we have to do something */ size = dv_extract_audio_info(c, buf); for (i = 0; i < c->ach; i++) { - c->audio_pkt[i].pos = pos; - c->audio_pkt[i].size = size; - c->audio_pkt[i].pts = (c->sys->height == 720) ? (c->frames & ~1) : c->frames; + c->audio_pkt[i]->pos = pos; + c->audio_pkt[i]->size = size; + c->audio_pkt[i]->pts = (c->sys->height == 720) ? (c->frames & ~1) : c->frames; ppcm[i] = c->audio_buf[i]; } if (c->ach) @@ -396,15 +403,14 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, * channels 0,1 and odd 2,3. */ if (c->sys->height == 720) { if (buf[1] & 0x0C) { - c->audio_pkt[2].size = c->audio_pkt[3].size = 0; + c->audio_pkt[2]->size = c->audio_pkt[3]->size = 0; } else { - c->audio_pkt[0].size = c->audio_pkt[1].size = 0; + c->audio_pkt[0]->size = c->audio_pkt[1]->size = 0; } } /* Now it's time to return video packet */ size = dv_extract_video_info(c, buf); - av_init_packet(pkt); pkt->data = buf; pkt->pos = pos; pkt->size = size; @@ -439,8 +445,8 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c, void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset) { c->frames = frame_offset; - c->audio_pkt[0].size = c->audio_pkt[1].size = 0; - c->audio_pkt[2].size = c->audio_pkt[3].size = 0; + c->audio_pkt[0]->size = c->audio_pkt[1]->size = 0; + c->audio_pkt[2]->size = c->audio_pkt[3]->size = 0; } /************************************************************ @@ -539,7 +545,7 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) size = avpriv_dv_get_packet(&c->dv_demux, pkt); - if (size < 0) { + if (!size) { int ret; int64_t pos = avio_tell(s->pb); if (!c->dv_demux.sys) @@ -614,6 +620,17 @@ static int dv_probe(const AVProbeData *p) return 0; } +static int dv_read_close(AVFormatContext *s) +{ + RawDVContext *r = s->priv_data; + DVDemuxContext *c = &r->dv_demux; + + for (int i = 0; i < 4; i++) + av_packet_free(&c->audio_pkt[i]); + + return 0; +} + AVInputFormat ff_dv_demuxer = { .name = "dv", .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), @@ -622,5 +639,6 @@ AVInputFormat ff_dv_demuxer = { .read_header = dv_read_header, .read_packet = dv_read_packet, .read_seek = dv_read_seek, + .read_close = dv_read_close, .extensions = "dv,dif", };