From patchwork Fri Jul 24 04:10:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21244 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 7080244988E for ; Fri, 24 Jul 2020 07:10:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32CA868B6CA; Fri, 24 Jul 2020 07:10:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D685068B6A0 for ; Fri, 24 Jul 2020 07:10:30 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id ga4so8544079ejb.11 for ; Thu, 23 Jul 2020 21:10:30 -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=EzbgoCsNMzmmqNzLrro+q91+fbI3/y1DKcJREHVmJtM=; b=Tgx13WtjOlsyl9yDVXTSsvAdCdWbtx3NAHWcLGjuVX1C+8jKsDHIUwljmw7FUWJjtI J97OIIL9MTn8yA4txLUIlTFDJd6NQGtdtkugwwq9oauP2eI57BTBbLtU0E/Zq2V2wXoA CnYTpRAlMCIva6gptbX1MSsGibA+Ds1FSQPgHBbm2FEEiJKZbTAlF+X7U6mOYNogiPBH l9Folcqfc8Co1FcOV8rGHPF5WmTMzDGu4FqYECgAGNLENzh6QZ64i3o/Nqqq5nLPKtrd UXMZLcyDjZCVNuQnd+I/Ngv+eNkrOVHx7/zy85xEA8x1wDi3FMBlhJaPUPA4Zcc3HtY9 CW/A== 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=EzbgoCsNMzmmqNzLrro+q91+fbI3/y1DKcJREHVmJtM=; b=QbEE3W9KhhLlznkKTuptYw1FGNLr30PZKN655PpEnMok2DE1nVIKog9buLb1vDFa89 aoLmYPV9NUbWIuFLc/CPS8Cdb7kavwd93ELRRtXU1kmuGpnknkVp0ZaCimy+IvYmt9zh mFL8NFNm1Iuiq5HOyfvi2VqMd0AXWIefgBb2Tru8N9hBugnTSVVobE+uffgwkXBI0G3L 6X508But+cwX2UjJAzPNLFdqv79KTUrBeFBH2Vq0qcAD8XfgujC8rjDOHwr9Y/I6lI1a uj4o5PoxMaQNjQNribYBjOyq9ZHEeZHvTd9XmO/dGTuL5pdsM8yvGMqeSpIBTqG7Xr/y DPkQ== X-Gm-Message-State: AOAM533D/9gLKAZWRrs5Ujq6X3qa1vuUrv41LaAQlhe8stAA7C6ByaSd wXoQVmNBhGrmJUwtnFbdkBP2tK09 X-Google-Smtp-Source: ABdhPJx5kA0g6kiHgvzKJIdojQuyn7q9zb5iN1rEO8TyPOcje1Kp/v7ha9vD00ITvEq3EdZ85wj5AA== X-Received: by 2002:a17:906:2681:: with SMTP id t1mr7290973ejc.350.1595563829973; Thu, 23 Jul 2020 21:10:29 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id h24sm177499ejk.12.2020.07.23.21.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 21:10:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jul 2020 06:10:21 +0200 Message-Id: <20200724041021.23977-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/smacker: Support seeking to first frame 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: Timotej Lazar Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Timotej Lazar Add .read_seek function to the smacker demuxer for the special case of seeking to ts=0. This is useful because smacker – like bink, with a similar implementation – was mostly used to encode clips in video games, where random seeks are rare but looping media are common. Signed-off-by: Timotej Lazar --- libavformat/smacker.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 0ca5a87b8f..5507e7c169 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -349,6 +349,31 @@ next_frame: return ret; } +static int smacker_read_seek(AVFormatContext *s, int stream_index, + int64_t timestamp, int flags) +{ + SmackerContext *smk = s->priv_data; + int64_t ret; + + /* only rewinding to start is supported */ + if (timestamp != 0) { + av_log(s, AV_LOG_ERROR, + "Random seeks are not supported (can only seek to start).\n"); + return AVERROR(EINVAL); + } + + if ((ret = avio_seek(s->pb, s->internal->data_offset, SEEK_SET)) < 0) + return ret; + + smk->cur_frame = 0; + smk->next_audio_index = 0; + smk->new_palette = 0; + memset(smk->pal, 0, sizeof(smk->pal)); + memset(smk->aud_pts, 0, sizeof(smk->aud_pts)); + + return 0; +} + AVInputFormat ff_smacker_demuxer = { .name = "smk", .long_name = NULL_IF_CONFIG_SMALL("Smacker"), @@ -356,4 +381,5 @@ AVInputFormat ff_smacker_demuxer = { .read_probe = smacker_probe, .read_header = smacker_read_header, .read_packet = smacker_read_packet, + .read_seek = smacker_read_seek, };