From patchwork Fri Apr 30 18:07:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27545 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp698820pxb; Fri, 30 Apr 2021 11:14:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzuYn0nXB6nUI0htygNY4FjY5tHQH4mMp56BSyUpigEixB+pGuHvbeGPWo6aVi7mhn0fVl X-Received: by 2002:aa7:db9a:: with SMTP id u26mr7511880edt.292.1619806476873; Fri, 30 Apr 2021 11:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619806476; cv=none; d=google.com; s=arc-20160816; b=wDEaNgkVyOYQw4a+ZfExQjpqKipghGQ/f90qfTDITtnqEPFbeoN+1TOIrXwvOIWLyv e8amJOAutZraEpvngrOqcsMKAsFF8lW1H/ExmRlLknkewJZRj5tS4wlPwotWdbQPDuHp wm9HWLd5m6v6DTuwQa2kjRdkZFuY1gdiZYwys4sX9T4Hp1NGEiuMDQPgMmKCJfXlNimE klkdsDSLyM4yihr+M457tbdAgjmnSEWkmvdeqcG3ob5da7olFsiPv3euvG5OvWlKrKAI VhV29OlRn6njQQQGXp2Av8ctF16Ic46fK6chmOUyrDo3Ad5pSxhBc/jI8kcwDahcfHXN uVcw== 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=ANIlra8l99esIVLBrCdUm0s21t1BbFVeCP8ffQRjuIw=; b=OE4epDSawU3MGd0vURLBy5OgvQ2zvQhvFCTLjds0ToFXvtqKoGw8ow42wDf9E2TFCy 7VAeVbpalH3wfRgCwUg6XPX3+mKagal2cV0ZKhRB2VTp1vbng7si7b4v1cwSVHEvk5mA 0HunCvB7Fp/py2rO3EMI3gYJv1i+3T/3QxQTYlpuln9w2NGbF5VR2/IAYqz6dkpYrgXb SAVgy5wt0saNv93sxB40JOOVzfAeazwF4jQuvV5+LEkqXkHABd1OGbmlAvt5GLNEW1cc udG0QVHyDsWww4Riu4+A+KedZy2+4kPswh2xqv4lhbTEYlN3vRpZ5KJ4BnzbSXzpzArA RfAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Hcs4e2UM; 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 js19si4543301ejc.419.2021.04.30.11.14.36; Fri, 30 Apr 2021 11:14:36 -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=@gmail.com header.s=20161025 header.b=Hcs4e2UM; 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 8A3A5680836; Fri, 30 Apr 2021 21:14:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2A76680836 for ; Fri, 30 Apr 2021 21:14:27 +0300 (EEST) Received: by mail-qk1-f180.google.com with SMTP id o5so71642354qkb.0 for ; Fri, 30 Apr 2021 11:14:27 -0700 (PDT) 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=WhieI1sbzs/1jFzXlahFnsCD8mJgp3Fqf1x6sKh7fJ0=; b=Hcs4e2UMdexIlFr5PXCam+j8SxgpndCMu79vh7kIQlRnldDFmj240w2GUapCtaq5VA 8qpze4DTh5+CItziJpj+8t5MXMk9FDZ2ELv8v3IevSFHDjPwHeZ4hVJoso8hIgJ/cflM WXKuhiKN+QiychQHkEbIqTOgdaHJlr4BlVYIVPJfWmf0TIDkOYcOsuzHtxXkPxcmVQz2 d4aFeZkxjd3BnXOn6ObtgebMqNKahcVyvme/LgNfTIvf3oKZhzzBiisN/OVjSjnDIDLq pBR3gxv7jxJ+yqC6zBnUVf6ZKI2jmpKLD5fastEk98oXdVTLLx2BIns49Ab8XyqTm9J+ rtAQ== 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=WhieI1sbzs/1jFzXlahFnsCD8mJgp3Fqf1x6sKh7fJ0=; b=IUyvrtos7oGVpjQzfp1CEF1TUpWpeyCTCm607ZdOAFNP/DWqa0jg82taDgqku8SX5g qIiwqJGE6OZ+DsG5/1vjlpx1vTZBAsHZHdtLSo39Fecg8kB3E9DWfI5ttRUD9hI9B/xa 8RXMbDlw79jTkddLFY3DV/k5ODf/W/n4anhp2xv6yippU48ke6xXo5YDcLkmMX928Uwc FCUs/nHDLp8zhzY7u2aEFgI0l3LizZNRpcPuRe1dXqN4EYTckx+tpQ8lgG2gds10jqog jTETqYngxQyXxFEYRd4mJmXrFEgP1c+VyAfsEz/ouhOt3gT1ou/6FLY4UXebsb8Kr9SP gHHQ== X-Gm-Message-State: AOAM532Y6Cx/O1beuVjblx3q2efpfBn5tdu+InY3Wu5/dEGoSsa1TQ/l gLvBh+ZLBbkghoDrRHFKW9Ry090spg0= X-Received: by 2002:ac8:4c89:: with SMTP id j9mr5048283qtv.105.1619806037136; Fri, 30 Apr 2021 11:07:17 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.172]) by smtp.gmail.com with ESMTPSA id y21sm1972443qki.103.2021.04.30.11.07.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 11:07:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Apr 2021 15:07:01 -0300 Message-Id: <20210430180701.63566-2-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210430180701.63566-1-jamrial@gmail.com> References: <20210430180701.63566-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dv: use av_packet_alloc() to allocate packets X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: eGVmWlX1eojw As avpriv_dv_get_packet can fail now, make it return < 0 on error, 0 on no packet found, and > 0 on packet found. Signed-off-by: James Almer --- libavdevice/iec61883.c | 2 +- libavformat/avidec.c | 4 +++- libavformat/dv.c | 51 ++++++++++++++++++++++++++---------------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c index 18ad704066..de9f48b8fc 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/avidec.c b/libavformat/avidec.c index 2d0d2a7389..2f493e42a6 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1440,8 +1440,10 @@ static int avi_read_packet(AVFormatContext *s, AVPacket *pkt) if (CONFIG_DV_DEMUXER && avi->dv_demux) { int size = avpriv_dv_get_packet(avi->dv_demux, pkt); - if (size >= 0) + if (size > 0) return size; + else if (size < 0) + return AVERROR(ENOMEM); else goto resync; } diff --git a/libavformat/dv.c b/libavformat/dv.c index a948fc0b98..1adc9fdb7b 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,11 @@ 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; + av_packet_unref(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->ast[i]->codecpar->sample_rate = dv_audio_frequency[freq]; c->ast[i]->codecpar->channels = 2; @@ -327,6 +327,9 @@ void avpriv_dv_close_demux(DVDemuxContext **pc) if (!c) return; + for (int i = 0; i < 4; i++) + av_packet_free(&c->audio_pkt[i]); + av_freep(pc); } @@ -336,6 +339,12 @@ static int dv_init_demux(AVFormatContext *s, DVDemuxContext *c) if (!c->vst) return AVERROR(ENOMEM); + for (int i = 0; i < 4; i++) { + c->audio_pkt[i] = av_packet_alloc(); + if (!c->audio_pkt[i]) + return AVERROR(ENOMEM); + } + c->fctx = s; c->vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; c->vst->codecpar->codec_id = AV_CODEC_ID_DVVIDEO; @@ -361,13 +370,14 @@ 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) { + if (av_packet_ref(pkt, c->audio_pkt[i]) < 0) + return -1; + c->audio_pkt[i]->size = 0; size = pkt->size; break; } @@ -392,9 +402,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) @@ -404,15 +414,15 @@ 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); + av_packet_unref(pkt); pkt->data = buf; pkt->pos = pos; pkt->size = size; @@ -447,8 +457,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; } /************************************************************ @@ -547,7 +557,10 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) size = avpriv_dv_get_packet(c->dv_demux, pkt); - if (size < 0) { + if (size < 0) + return AVERROR(ENOMEM); + + if (!size) { int ret; int64_t pos = avio_tell(s->pb); if (!c->dv_demux->sys)