From patchwork Fri Apr 30 18:07:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp698219pxb; Fri, 30 Apr 2021 11:13:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxZX1ej4ZnvGjRTH/DWN20A3emJHKQKKY+oYb86fmc3cpQf6ET/wMgaRwEe9YRNXv4HQdI X-Received: by 2002:a17:906:170f:: with SMTP id c15mr5796004eje.358.1619806430840; Fri, 30 Apr 2021 11:13:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619806430; cv=none; d=google.com; s=arc-20160816; b=JzdQ4ylNCOEEVvJkcd/MmpvnWXHENsYWINdQaL/ONzjYinSLwOnyqS6Ktfq0+BWuhz 7r5rXCj2rhpnqE5K1zsL0mK/wVq8g9y3XR7rOsU5hrg+VPDJD9DG1fNQcd6NE4tjLUIi H41LONakfMK8f0vtY0Xi7XmwNLXWnpVhJ/bTRwE64CNROunu1ijxQ9W9AYvlEGMHCKMv h4uMblxAfprJnIMGDi00R5g9tb204gLHOclOAtJXJHElyzIfZ4TF77L9OW5Bu8G/kYc5 xWjrRKMzLz9SckBl2sEHWsw9YauxArRrzrzdWEqTsLWvshMQF/1nIyBut6esOAbHTuQJ Tkrw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=mJwW1z1jJ+81XvXeJBMB1jT9e9N+3HWdeDwbV4U5Sc0=; b=AS33W6+nZM3QVyDm1Lp5pDUcAvwvidfEzkjIjwaUVXK2NhxRBuI9bfr6dTW1qrBpXQ OwM2Wqvvp6aQJanbi7sU9b8nadOr3Q917cSQYsjBozYjQd17YrijEagSIf40MZIYZykk f+hvGf1XRl35ZEsXKKK8sXXbVROGuflTu3HiXklH9rwPoihzxO5O2pbtEuV3BwPnSXzM +BbR25fNLjrRuDR10BEDTxlB7SrM6/RzDx7ZcASLoKQyV6S6KVe8uPocdS4eKYp8iD2o /VjxN5ziCeSvbgovtV+xIwrazM9JLizYPkfPcc69cJPrMhfeeamIrnKpDDjjICOgUQsG SFhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Q2KA90AR; 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 o8si2619499edc.50.2021.04.30.11.13.49; Fri, 30 Apr 2021 11:13:50 -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=Q2KA90AR; 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 343BF6891DA; Fri, 30 Apr 2021 21:13:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11C28680836 for ; Fri, 30 Apr 2021 21:13:40 +0300 (EEST) Received: by mail-qk1-f177.google.com with SMTP id q136so50653828qka.7 for ; Fri, 30 Apr 2021 11:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=LyoIdljy/xveE+YQjN83qZj2DQcrNnzoDZExDBOgzQ0=; b=Q2KA90AR7jUp3bkncBvQVAcqqDY76I/WM2o47XH9sGDg94BlveysoXZuAKN/8KYtns INfEWJWxClTXPioNBtrRfy8Jj2NjC80y+gJkDirLCMIoVS7AMnZGYP2oBNPXI5rB/whd tNf5MVlTHKXrD5vetI/IGr8JChMLR+KMRsUk7CxaZiSOy6e1VSYr7WSrGuAUP3D/MG6c gkXBvjJIbuzv+RxzVk6AsjY1TFnjmFPNtVDD+1CDyHzuusD3tgKcQHElKw+djVUkErSo 9cY15W6/X3q8wzt80HsaIONL9mRoF2Hx4fnqDJiHt0HVL/vVE9Dd+uGjkSeEiyquqUm/ MR1Q== 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:mime-version :content-transfer-encoding; bh=LyoIdljy/xveE+YQjN83qZj2DQcrNnzoDZExDBOgzQ0=; b=HrJPEbS4Aeo2dB9oipKWf8dbpCnCBbivXIizFgWuDQzNhVsfIvlt0df1j2L9Q+5k+u UZtB82yqikjNhhNpxVsOPPZiJ3TmsQkQtQtO40EOOHe75GPIrEDBZ3TDUIE3zHf7KDll wCLa5r9zfG39lJtr19hUZug2tXWZldl+qMemPK+cOrDRR9Ul4RhtFcKKndLJU9OxFYmK IPcyzitGmSAY8o7rCNC2mfaqEmRKdkVr/DQlO153AzWWCZBjI0dykVwxh5W7oa59OTxO mkr+P0Chjfeq2psCcffjVKLjaiP/Lx5/Lp+jeH6rwJ8DO150E7mw8cAz4cteGLd4S3VU C37g== X-Gm-Message-State: AOAM533IVbbHuSYeowhMlhR4+FfjiMclg51jgzL9xqoC0LrHZ53LtxEQ 4HQG8KtMl+/NJRVZFBtDcJUoI8VFmqo= X-Received: by 2002:ac8:4a19:: with SMTP id x25mr2005306qtq.389.1619806035867; Fri, 30 Apr 2021 11:07:15 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.172]) by smtp.gmail.com with ESMTPSA id y21sm1972443qki.103.2021.04.30.11.07.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 11:07:15 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Apr 2021 15:07:00 -0300 Message-Id: <20210430180701.63566-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/dv: add avpriv_dv_close_demux 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: l5sGQh3snDzu This is in preparation for the next commit. Signed-off-by: James Almer --- libavdevice/iec61883.c | 2 +- libavformat/avidec.c | 2 +- libavformat/dv.c | 56 ++++++++++++++++++++++++++++-------------- libavformat/dv.h | 1 + libavformat/mov.c | 2 +- 5 files changed, 41 insertions(+), 22 deletions(-) diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c index e7b71c757a..18ad704066 100644 --- a/libavdevice/iec61883.c +++ b/libavdevice/iec61883.c @@ -463,7 +463,7 @@ static int iec61883_close(AVFormatContext *context) } else { iec61883_dv_fb_stop(dv->iec61883_dv); iec61883_dv_fb_close(dv->iec61883_dv); - av_freep(&dv->dv_demux); + avpriv_dv_close_demux(&dv->dv_demux); } while (dv->queue_first) { DVPacket *packet = dv->queue_first; diff --git a/libavformat/avidec.c b/libavformat/avidec.c index d5dcab6193..2d0d2a7389 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1951,7 +1951,7 @@ static int avi_read_close(AVFormatContext *s) } } - av_freep(&avi->dv_demux); + avpriv_dv_close_demux(&avi->dv_demux); return 0; } diff --git a/libavformat/dv.c b/libavformat/dv.c index cbb38cbd7d..a948fc0b98 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -318,7 +318,17 @@ static int dv_extract_timecode(DVDemuxContext* c, const uint8_t* frame, char *tc return 1; } -/* The following 3 functions constitute our interface to the world */ +/* The following 4 functions constitute our interface to the world */ + +void avpriv_dv_close_demux(DVDemuxContext **pc) +{ + DVDemuxContext *c = *pc; + + if (!c) + return; + + av_freep(pc); +} static int dv_init_demux(AVFormatContext *s, DVDemuxContext *c) { @@ -343,10 +353,8 @@ DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s) if (!c) return NULL; - if (dv_init_demux(s, c)) { - av_free(c); - return NULL; - } + if (dv_init_demux(s, c)) + avpriv_dv_close_demux(&c); return c; } @@ -448,7 +456,7 @@ void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset) ************************************************************/ typedef struct RawDVContext { - DVDemuxContext dv_demux; + DVDemuxContext *dv_demux; uint8_t buf[DV_MAX_FRAME_SIZE]; } RawDVContext; @@ -471,7 +479,7 @@ static int dv_read_timecode(AVFormatContext *s) { goto finish; } - ret = dv_extract_timecode(&c->dv_demux, partial_frame, timecode); + ret = dv_extract_timecode(c->dv_demux, partial_frame, timecode); if (ret) av_dict_set(&s->metadata, "timecode", timecode, 0); else @@ -486,10 +494,10 @@ static int dv_read_header(AVFormatContext *s) { unsigned state, marker_pos = 0; RawDVContext *c = s->priv_data; - int ret; - if ((ret = dv_init_demux(s, &c->dv_demux)) < 0) - return ret; + c->dv_demux = avpriv_dv_init_demux(s); + if (!c->dv_demux) + return AVERROR(ENOMEM); state = avio_rb32(s->pb); while ((state & 0xffffff7f) != 0x1f07003f) { @@ -513,18 +521,18 @@ static int dv_read_header(AVFormatContext *s) return AVERROR(EIO); } - c->dv_demux.sys = av_dv_frame_profile(c->dv_demux.sys, + c->dv_demux->sys = av_dv_frame_profile(c->dv_demux->sys, c->buf, DV_PROFILE_BYTES); - if (!c->dv_demux.sys) { + if (!c->dv_demux->sys) { av_log(s, AV_LOG_ERROR, "Can't determine profile of DV input stream.\n"); return AVERROR_INVALIDDATA; } - s->bit_rate = av_rescale_q(c->dv_demux.sys->frame_size, + s->bit_rate = av_rescale_q(c->dv_demux->sys->frame_size, (AVRational) { 8, 1 }, - c->dv_demux.sys->time_base); + c->dv_demux->sys->time_base); if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) dv_read_timecode(s); @@ -537,14 +545,14 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) int size; RawDVContext *c = s->priv_data; - size = avpriv_dv_get_packet(&c->dv_demux, pkt); + size = avpriv_dv_get_packet(c->dv_demux, pkt); if (size < 0) { int ret; int64_t pos = avio_tell(s->pb); - if (!c->dv_demux.sys) + if (!c->dv_demux->sys) return AVERROR(EIO); - size = c->dv_demux.sys->frame_size; + size = c->dv_demux->sys->frame_size; ret = avio_read(s->pb, c->buf, size); if (ret < 0) { return ret; @@ -552,17 +560,26 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EIO); } - size = avpriv_dv_produce_packet(&c->dv_demux, pkt, c->buf, size, pos); + size = avpriv_dv_produce_packet(c->dv_demux, pkt, c->buf, size, pos); } return size; } +static int dv_read_close(AVFormatContext *s) +{ + RawDVContext *r = s->priv_data; + + avpriv_dv_close_demux(&r->dv_demux); + + return 0; +} + static int dv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) { RawDVContext *r = s->priv_data; - DVDemuxContext *c = &r->dv_demux; + DVDemuxContext *c = r->dv_demux; int64_t offset = dv_frame_offset(s, c, timestamp, flags); if (avio_seek(s->pb, offset, SEEK_SET) < 0) @@ -621,6 +638,7 @@ const AVInputFormat ff_dv_demuxer = { .read_probe = dv_probe, .read_header = dv_read_header, .read_packet = dv_read_packet, + .read_close = dv_read_close, .read_seek = dv_read_seek, .extensions = "dv,dif", }; diff --git a/libavformat/dv.h b/libavformat/dv.h index 160c6ab873..c441a23156 100644 --- a/libavformat/dv.h +++ b/libavformat/dv.h @@ -32,6 +32,7 @@ typedef struct DVDemuxContext DVDemuxContext; DVDemuxContext* avpriv_dv_init_demux(AVFormatContext* s); +void avpriv_dv_close_demux(DVDemuxContext **c); int avpriv_dv_get_packet(DVDemuxContext*, AVPacket *); int avpriv_dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int, int64_t); void ff_dv_offset_reset(DVDemuxContext *c, int64_t frame_offset); diff --git a/libavformat/mov.c b/libavformat/mov.c index ca8f06c4cd..d2d34d574f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7385,7 +7385,7 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->coll); } - av_freep(&mov->dv_demux); + avpriv_dv_close_demux(&mov->dv_demux); avformat_free_context(mov->dv_fctx); mov->dv_fctx = NULL;