From patchwork Sat Jun 5 15:01:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2030131iof; Sat, 5 Jun 2021 08:02:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTPPau8KECGoyvOYeZthzoxPm0gbKHKcDKAgr+vsiAkF92U5kC/QqK2xy2VoGGVUf5+Lgv X-Received: by 2002:a17:907:779a:: with SMTP id ky26mr9447046ejc.293.1622905340268; Sat, 05 Jun 2021 08:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622905340; cv=none; d=google.com; s=arc-20160816; b=N1JFgXoOQ4B26NFgmwXkma1F5JTb3u1JSNuHtF0bKBJabH4K0OFt68nDH2WNQJSO3t AQt+CHYM1sbhXGSsqu+ArMelKIm/0k73ttt+d6Vf6IcePkLA/HhQ5PLtXfqRR+OJYcpT QQB8W4hTRWkmVg4jHehiVjOmmyDsYbCj45u3FkTW3DyzZKYerdryKFIftsrfa13ebxl1 BcZjtpC50AlL30l3Ldpsw2+wwRyM53TrHjU7NNshIG9qSg8ifdt733kHSX6jZZNnAgxF rJRbmS18Xsq/eWwDLNhZc9c+CjggpRXyMUpzvpAboZQhRv5yDAnbR2z4nX9URyfNR7bv qliA== 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=8gG/vy7/xMHefDdaJCFaRBb8e1Bv4mSdok31WqLQuEU=; b=wgot7XgaemKuNVvbC3XzEmRp6mhhTxVdgDRwsXo54WMPYUuAA3T/7Q9C9z1y91YXvN VA4vs3DqjcV2VmCRRz1l1wM6PMUf9XeXSZCzhwBMPrt+H2U60ImgpMK21/oNbptbD8xw I4264z0w6hUxR2AsT0StErr2VMoH0Eb95/XeNKbYunuetwpTxm5/OCABN0iGp1OiegXU n+4BT7iFEsvHjVJEfcSAqHPHnc2CgEv8t97RdHAhyLLSJGQpuJSAwrAZk9oz0RHUQaV4 vUPkW0Se+NivU8WuzS66uqiWkg1zWdH7VJumpF3d3Zxrq7Iro9VXhEzZM3EG5zNhPw98 sVUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QnKdvO1l; 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 i11si9323261edb.418.2021.06.05.08.02.19; Sat, 05 Jun 2021 08:02:20 -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=QnKdvO1l; 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 8726E68A538; Sat, 5 Jun 2021 18:02:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C15E68A4FA for ; Sat, 5 Jun 2021 18:02:11 +0300 (EEST) Received: by mail-qk1-f179.google.com with SMTP id j184so12364519qkd.6 for ; Sat, 05 Jun 2021 08:02:11 -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=41seoTm+FLwxjRuHmqFRN9oFuHBNUZWGMZ25Pv6+pIM=; b=QnKdvO1l3X0SKWMSHQvdOwPtmyERb/UsHtSiavUVWrqmJrc3/umcXcfl030P8cer42 IhFR/rOHHHG0dm5HUpnN2Nn49y0b7jR9nG74GyORkXuJl6qzQASjzl+GtjAgumkaqZN/ rhi3h3S+1SHyf5LJORioInuw0TAGPtUkBlNmwj1ArOdgVuAfqI4dxwJ4IX0t0bRYfzdj mOKLhwgj7pqxyaVVCr9a7Z/yPqFOep6Epj6ncVEq8Z/aAARo4RPew6rItYAzSKy1sTFh 9BJ4MQA8dPrD3XpJejGgIUQUGTy0nBpE1ZMYmjdFKzQH67sSzWDQQK3aiFbq282woPb/ KlOA== 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=41seoTm+FLwxjRuHmqFRN9oFuHBNUZWGMZ25Pv6+pIM=; b=qCBJN5ONmQyC7tDlPjJMheMInYfVpfcarSHC1tAltj50c0A983nvxRSTaPcgAUwWpA 15xL1axVW5V65uEpHDr4QzXOzulRnDBamM5yql02kIJpm2zuIrGq1Ja9w6jWH7RV3WKl sE/wVrkIATb6wRlIcqYbKkroTCoJHLG+8Lolw8xj+EpK4CYlr9En/wU495JiUl8NRSor tecdNWB7J+Xchu3xJ2hbmlksLr2fTUrzkB5NEbStmPXncyeIe0ZmbPXaYIbDmVJeDUnd Qy2I9tcBOryyeiLU96JWtObXjgk3ciVDMXLQdpY72cCcWWtdjiHiALTW/cQ7/wOHhhGT 1FiA== X-Gm-Message-State: AOAM533+bsGsCz6Y6bRu/H/Dy2I4PvzFwJYElz0z5MXOSDef1Ha6PyXN RRhoCIjiD2LZefQgo16Ia+/8fCeQ+dM= X-Received: by 2002:a05:620a:1021:: with SMTP id a1mr8974592qkk.399.1622905329200; Sat, 05 Jun 2021 08:02:09 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.13]) by smtp.gmail.com with ESMTPSA id w4sm4706044qtv.79.2021.06.05.08.02.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jun 2021 08:02:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Jun 2021 12:01:47 -0300 Message-Id: <20210605150149.2334-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/utils: make ff_update_cur_dts() an avpriv function 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: +lw92UaMf9eV libavdevice needs it. Signed-off-by: James Almer --- libavformat/aadec.c | 4 ++-- libavformat/brstm.c | 2 +- libavformat/idcin.c | 2 +- libavformat/internal.h | 2 +- libavformat/matroskadec.c | 2 +- libavformat/mca.c | 2 +- libavformat/mp3dec.c | 2 +- libavformat/mpc8.c | 2 +- libavformat/mxfdec.c | 4 ++-- libavformat/utils.c | 8 ++++---- libavformat/vpk.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 9fe24d5d53..70df0439bd 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -238,7 +238,7 @@ static int aa_read_header(AVFormatContext *s) st->duration = (largest_size - CHAPTER_HEADER_SIZE * s->nb_chapters) * TIMEPREC; - ff_update_cur_dts(s, st, 0); + avpriv_update_cur_dts(s, st, 0); avio_seek(pb, start, SEEK_SET); c->current_chapter_size = 0; c->seek_offset = 0; @@ -365,7 +365,7 @@ static int aa_read_seek(AVFormatContext *s, c->seek_offset = (MP3_FRAME_SIZE - chapter_pos % MP3_FRAME_SIZE) % MP3_FRAME_SIZE; } - ff_update_cur_dts(s, s->streams[0], ch->start + (chapter_pos + c->seek_offset) * TIMEPREC); + avpriv_update_cur_dts(s, s->streams[0], ch->start + (chapter_pos + c->seek_offset) * TIMEPREC); return 1; } diff --git a/libavformat/brstm.c b/libavformat/brstm.c index f1f0f86ed5..601f73dd33 100644 --- a/libavformat/brstm.c +++ b/libavformat/brstm.c @@ -477,7 +477,7 @@ static int read_seek(AVFormatContext *s, int stream_index, return ret; b->current_block = timestamp; - ff_update_cur_dts(s, st, timestamp * b->samples_per_block); + avpriv_update_cur_dts(s, st, timestamp * b->samples_per_block); return 0; } diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 0c38d880f4..b7402107da 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -358,7 +358,7 @@ static int idcin_read_seek(AVFormatContext *s, int stream_index, int64_t ret = avio_seek(s->pb, idcin->first_pkt_pos, SEEK_SET); if (ret < 0) return ret; - ff_update_cur_dts(s, s->streams[idcin->video_stream_index], 0); + avpriv_update_cur_dts(s, s->streams[idcin->video_stream_index], 0); idcin->next_chunk_is_video = 1; idcin->current_audio_chunk = 0; return 0; diff --git a/libavformat/internal.h b/libavformat/internal.h index 970fccf6c2..9882454d59 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -635,7 +635,7 @@ int ff_seek_frame_binary(AVFormatContext *s, int stream_index, * @param timestamp new dts expressed in time_base of param ref_st * @param ref_st reference stream giving time_base of param timestamp */ -void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp); +void avpriv_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp); int ff_find_last_ts(AVFormatContext *s, int stream_index, int64_t *ts, int64_t *pos, int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t )); diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 73e1ddb68d..356a02339c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3859,7 +3859,7 @@ static int matroska_read_seek(AVFormatContext *s, int stream_index, } matroska->skip_to_keyframe = 1; matroska->done = 0; - ff_update_cur_dts(s, st, st->internal->index_entries[index].timestamp); + avpriv_update_cur_dts(s, st, st->internal->index_entries[index].timestamp); return 0; err: // slightly hackish but allows proper fallback to diff --git a/libavformat/mca.c b/libavformat/mca.c index 0fd5ce8aaf..ca0f76d6bf 100644 --- a/libavformat/mca.c +++ b/libavformat/mca.c @@ -213,7 +213,7 @@ static int read_seek(AVFormatContext *s, int stream_index, return ret; m->current_block = timestamp; - ff_update_cur_dts(s, st, timestamp * m->samples_per_block); + avpriv_update_cur_dts(s, st, timestamp * m->samples_per_block); return 0; } diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index b12cd31148..c6949e6095 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -589,7 +589,7 @@ static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp, ie1.timestamp = frame_duration * av_rescale(best_pos - s->internal->data_offset, mp3->frames, mp3->header_filesize); } - ff_update_cur_dts(s, st, ie->timestamp); + avpriv_update_cur_dts(s, st, ie->timestamp); return 0; } diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index ff6f43231c..5498ce940d 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -320,7 +320,7 @@ static int mpc8_read_seek(AVFormatContext *s, int stream_index, int64_t timestam if(index < 0) return -1; if (avio_seek(s->pb, st->internal->index_entries[index].pos, SEEK_SET) < 0) return -1; - ff_update_cur_dts(s, st, st->internal->index_entries[index].timestamp); + avpriv_update_cur_dts(s, st, st->internal->index_entries[index].timestamp); return 0; } diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 3bf480a3a6..e489e59e5d 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3815,7 +3815,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti if (seekpos < 0) return seekpos; - ff_update_cur_dts(s, st, sample_time); + avpriv_update_cur_dts(s, st, sample_time); mxf->current_klv_data = (KLVPacket){{0}}; } else { MXFPartition *partition; @@ -3868,7 +3868,7 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti if ((ret = mxf_edit_unit_absolute_offset(mxf, t, sample_time, source_track->edit_rate, &sample_time, &seekpos, &partition, 1)) < 0) return ret; - ff_update_cur_dts(s, st, sample_time); + avpriv_update_cur_dts(s, st, sample_time); if (source_track->wrapping == ClipWrapped) { KLVPacket klv = partition->first_essence_klv; if (seekpos < klv.next_klv - klv.length || seekpos >= klv.next_klv) { diff --git a/libavformat/utils.c b/libavformat/utils.c index fe8eaa6cb3..13c0ade5ba 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1848,7 +1848,7 @@ void ff_read_frame_flush(AVFormatContext *s) } } -void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp) +void avpriv_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp) { int i; @@ -2156,7 +2156,7 @@ int ff_seek_frame_binary(AVFormatContext *s, int stream_index, return ret; ff_read_frame_flush(s); - ff_update_cur_dts(s, st, ts); + avpriv_update_cur_dts(s, st, ts); return 0; } @@ -2350,7 +2350,7 @@ static int seek_frame_generic(AVFormatContext *s, int stream_index, ie = &st->internal->index_entries[st->internal->nb_index_entries - 1]; if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0) return ret; - ff_update_cur_dts(s, st, ie->timestamp); + avpriv_update_cur_dts(s, st, ie->timestamp); } else { if ((ret = avio_seek(s->pb, s->internal->data_offset, SEEK_SET)) < 0) return ret; @@ -2388,7 +2388,7 @@ static int seek_frame_generic(AVFormatContext *s, int stream_index, ie = &st->internal->index_entries[index]; if ((ret = avio_seek(s->pb, ie->pos, SEEK_SET)) < 0) return ret; - ff_update_cur_dts(s, st, ie->timestamp); + avpriv_update_cur_dts(s, st, ie->timestamp); return 0; } diff --git a/libavformat/vpk.c b/libavformat/vpk.c index 9eb3eb5362..d542a0806d 100644 --- a/libavformat/vpk.c +++ b/libavformat/vpk.c @@ -130,7 +130,7 @@ static int vpk_read_seek(AVFormatContext *s, int stream_index, return ret; vpk->current_block = timestamp; - ff_update_cur_dts(s, st, timestamp * samples_per_block); + avpriv_update_cur_dts(s, st, timestamp * samples_per_block); return 0; }