From patchwork Sun Aug 2 11:47:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21452 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 DA56A44B548 for ; Sun, 2 Aug 2020 14:48:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B5F7768BA69; Sun, 2 Aug 2020 14:48:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A60A768B9C3 for ; Sun, 2 Aug 2020 14:47:56 +0300 (EEST) Received: by mail-ed1-f68.google.com with SMTP id bs17so6545713edb.1 for ; Sun, 02 Aug 2020 04:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oNTcdtXfsk95dCCbr/ewFF/wrKdgsMIKzpuXMbCAuwI=; b=ZQgrlFJOzaR9CThfFbzvJt00Ay45jEpxzIxykExdmiI4OEdBujHkmd4fBaocJRi2zp hP50oO6qL+HrinqFOWg6QFPD+cfNd8sjjvJH2f6cL7QWoyOvUMjCni70cRugKv/dxs8i igHajIsYuv/rwQy7/AnCg4CgY4xlxC35qoWzqy/ACdrxmhTiNBtGFIEEZxlgin0nCnyP fPF31+a7mxhyRU+NIlPmlq2DjJMMjgiEZ8GSTxQc8EQZVKp+37y31iGOYLa7GQD2Ul0d Q3Wm8s2ZDP0+t0BiEe4JlcrZAmV/OWYL41EjthQXO4AWOjSAIiF2y8mkYzvxkRrBPO7x gBZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oNTcdtXfsk95dCCbr/ewFF/wrKdgsMIKzpuXMbCAuwI=; b=h0lTDbkLqxTIINiwHLGwsrh+tk/vrWlm2d1TFmoQ3kyiIxTSaYNzwb/8qCv8+4duFF TiQHhip+IhC1LmxWAOOLZ+orn40iB6hwTbh2Jo0n414nonbn3YD+uPRWfZqz0kKH2ov5 8BUHO9YgG/8SLaCTS+QAg5oIshzPJJz6P7L4rQ9h5VX2p0B5lAX3ma6ZWghr2YjDjCMc 67uxuCTQ6auddF+SbxB55SsaEMeoLc/6Q6FX0naOfaLqXek5amQ2XSyBO583RjmLZx3S djO8EoxEwp0HsAlNqIkUVOA0uDEXj3pzjtBgm10MWflkqXdaFmEgqHK5EtAcCn3s8r/w MzKw== X-Gm-Message-State: AOAM530nU9uxRpfSC7QLmRVD83RgHjrc/5KO4tYl2oH1abduZAbeSTkb pXznyb8OsY+19zNiJ46vOwlfrCRI X-Google-Smtp-Source: ABdhPJwqbiU2lodWMStPi59Ysk33KYXzG5RIlOpS83wY/mkoJ4YIyXYEL4/2fp8+gBGkn15SJpSlvw== X-Received: by 2002:aa7:cdd0:: with SMTP id h16mr8466582edw.116.1596368875638; Sun, 02 Aug 2020 04:47:55 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id w5sm13506454edi.74.2020.08.02.04.47.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2020 04:47:54 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Aug 2020 13:47:30 +0200 Message-Id: <20200802114731.901-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/dv: Avoid alloction of DVDemuxContext 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit avoids allocating a DVDemuxContext when demuxing raw DV by making it part of the demuxer's context. This also allows to remove dv_read_close(). Signed-off-by: Andreas Rheinhardt --- libavformat/dv.c | 73 +++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 41 deletions(-) diff --git a/libavformat/dv.c b/libavformat/dv.c index e99422d4b5..9179e6cec6 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -321,6 +321,21 @@ static int dv_extract_timecode(DVDemuxContext* c, const uint8_t* frame, char *tc /* The following 3 functions constitute our interface to the world */ +static int dv_init_demux(AVFormatContext *s, DVDemuxContext *c) +{ + c->vst = avformat_new_stream(s, NULL); + if (!c->vst) + return AVERROR(ENOMEM); + + c->fctx = s; + c->vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + c->vst->codecpar->codec_id = AV_CODEC_ID_DVVIDEO; + c->vst->codecpar->bit_rate = 25000000; + c->vst->start_time = 0; + + return 0; +} + DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s) { DVDemuxContext *c; @@ -329,18 +344,11 @@ DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s) if (!c) return NULL; - c->vst = avformat_new_stream(s, NULL); - if (!c->vst) { + if (dv_init_demux(s, c)) { av_free(c); return NULL; } - c->fctx = s; - c->vst->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - c->vst->codecpar->codec_id = AV_CODEC_ID_DVVIDEO; - c->vst->codecpar->bit_rate = 25000000; - c->vst->start_time = 0; - return c; } @@ -452,7 +460,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; @@ -479,7 +487,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 @@ -497,16 +505,14 @@ static int dv_read_header(AVFormatContext *s) RawDVContext *c = s->priv_data; int ret; - c->dv_demux = avpriv_dv_init_demux(s); - if (!c->dv_demux) - return AVERROR(ENOMEM); + if ((ret = dv_init_demux(s, &c->dv_demux)) < 0) + return ret; state = avio_rb32(s->pb); while ((state & 0xffffff7f) != 0x1f07003f) { if (avio_feof(s->pb)) { av_log(s, AV_LOG_ERROR, "Cannot find DV header.\n"); - ret = AVERROR_INVALIDDATA; - goto fail; + return AVERROR_INVALIDDATA; } if (state == 0x003f0700 || state == 0xff3f0700) marker_pos = avio_tell(s->pb); @@ -521,33 +527,26 @@ static int dv_read_header(AVFormatContext *s) if (avio_read(s->pb, c->buf + 4, DV_PROFILE_BYTES - 4) != DV_PROFILE_BYTES - 4 || avio_seek(s->pb, -DV_PROFILE_BYTES, SEEK_CUR) < 0) { - ret = AVERROR(EIO); - goto fail; + 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"); - ret = AVERROR_INVALIDDATA; - goto fail; + 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); return 0; - -fail: - av_freep(&c->dv_demux); - - return ret; } static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -555,14 +554,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; @@ -570,7 +569,7 @@ 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; @@ -580,7 +579,7 @@ 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) @@ -590,13 +589,6 @@ static int dv_read_seek(AVFormatContext *s, int stream_index, return 0; } -static int dv_read_close(AVFormatContext *s) -{ - RawDVContext *c = s->priv_data; - av_freep(&c->dv_demux); - return 0; -} - static int dv_probe(const AVProbeData *p) { unsigned marker_pos = 0; @@ -646,7 +638,6 @@ 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", };