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, }; From patchwork Fri Jul 24 08:37:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21246 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 6B4D544BAFC for ; Fri, 24 Jul 2020 11:37:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A86D68B77D; Fri, 24 Jul 2020 11:37:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E93E68B579 for ; Fri, 24 Jul 2020 11:37:50 +0300 (EEST) Received: by mail-ej1-f65.google.com with SMTP id gg18so5776190ejb.6 for ; Fri, 24 Jul 2020 01:37:50 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=is03ln0lGx0Ovflq+SliuWmOxYwjKbUbKxlQCET0H/w=; b=Ff+s9nd2yB379c15ry4iQ45yMlNrzDetvu6DvBDTjwYkc67iDUv2KaXqSLd8PVr5G7 3UlFA3uOSoadNEGduDoxqFhiip/fO2jPhQPm78GJWJeZjjDrXfSMD5IZEcE8jdqj61uo CHxCmCcyx8Rog7ME7QPfn8hJ2aRSsmXvq7pVun8eZ+La4GzXpn5XjCySSjj/OTJhKGAY fi4bAdmmq+4NX0U3xgPPzVIO2JuQJQKCtyyqTl85w9fsjx+hweXgfprcMyVo5rtyl0Lh vscl5HDA1z+YGXHWb8+WMlLg1i1WRwZiBwtknu1WhjvYx1Fq3zL/vTO6iXRR35E4IoEN ZYKg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=is03ln0lGx0Ovflq+SliuWmOxYwjKbUbKxlQCET0H/w=; b=YR9NwcqPHzBZk+os+YUIRw2VSGq3A2m85jqOBQMAU1IcDakjfPKPrY9bSmaIiTzTRO 6EGonv3aoYu+rT0mNNmTrbQKw8ETXnPBCXKsuioIrleRJXNi5pCP0cUxM6fRF1mquAO3 OE9cnDnk93i0vA7JDYAyBtpbaCBCntYgY0TkJg+C+s2Px5P6S8b4tDpb6JRvjaVyrjmP n3sqBrXhHpC8WtHpFKXYAljMfQ4u61xw0F+dgmqzoThAi4bjb1BF07fDVzOGJVUPFGTS DICp7L1XNjfFxGj6LsGHnl4E4eStUjjzSDE6qnlapu5c6zGvS4y+TL9kJrCs2U8Mrmmc oUKw== X-Gm-Message-State: AOAM530SJwzOMpjJdVbxFcLyNegP2B9VDQkjkkyjDjA/4VDKcA0+WZt8 dRhg5d/cl4PMCE4x0lN2XvYYkF/L X-Google-Smtp-Source: ABdhPJyGf0fEC9n42wg2TYZ1ic9Jp/u1nuew/c55xKNU1UmXUBL9rfV/I/e4ndbfrd/w+9H5wlojQg== X-Received: by 2002:a17:906:ca4c:: with SMTP id jx12mr4007697ejb.231.1595579869396; Fri, 24 Jul 2020 01:37:49 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id r19sm239487edi.85.2020.07.24.01.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 01:37:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jul 2020 10:37:15 +0200 Message-Id: <20200724083717.8491-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724041021.23977-1-andreas.rheinhardt@gmail.com> References: <20200724041021.23977-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/smacker: Set audio duration 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" Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 5507e7c169..4ab150a6f0 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -315,7 +315,8 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) } pkt->stream_index = smk->indexes[i]; pkt->pts = smk->aud_pts[i]; - smk->aud_pts[i] += AV_RL32(pkt->data); + pkt->duration = AV_RL32(pkt->data); + smk->aud_pts[i] += pkt->duration; smk->next_audio_index = i + 1; return 0; } From patchwork Fri Jul 24 08:37:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21247 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 627F8448D9F for ; Fri, 24 Jul 2020 11:38:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 489DC68B7C6; Fri, 24 Jul 2020 11:38:20 +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 A4BFE68B579 for ; Fri, 24 Jul 2020 11:38:14 +0300 (EEST) Received: by mail-ej1-f67.google.com with SMTP id l4so9116742ejd.13 for ; Fri, 24 Jul 2020 01:38:14 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=kGHcgvmk7BpuFCdX0qKPzyvAv8Ng0yh365q0Mua/rp0=; b=bJjNtQKffEsHmLGno8t5mHj40pgfbHGYEpiaUojqxs2Q1Blb0ac7StQrVDbzvKMmig sJ1rPpWpRPah7UT8uQQ6wtH1hx40u3h6hh+qeoU8FSVq7HUIQnXFk+xpVcK6vVYvkBxt BQMdzfU1ZcmtTMhPuQW3tbqfyRkwZmX23/JgxNOsG/JXSHPN+IaruO3RgirZfB730Gir aRZchKPmVN5xsjthttr/nRJzGQsTXxvsCeDy+YhV2Qo45LyOs212Wpt3r3rx8hq8humo x1L+3jfUJBvtXdAgvu0YjrKlu7Ber1L/pQD4S6qSa902HHUGImdlvIVQP35d2rPkTKYP kn5g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=kGHcgvmk7BpuFCdX0qKPzyvAv8Ng0yh365q0Mua/rp0=; b=PM/xgDR2sD9KQGys9vog+Io6Ty/loACeR3AV0p/QfIKJUyBfFH/UEcujnLoCT8gLJM UqTQFDdW7/hI3gFiVSkZirkJajCzg5zVN+22567Am31VzTIU5ddIZFkhF7cgp8Si07Ff dKvuNegKruK8hJL01Su64RAyPQ9eN0rdnnU98ovKPFTpYPB5HrqGeD+wPExWCfXsa3zP AAuChiSmoNVG/Y+WY0RgpT/a+CwBPk/WHQPykXtKDPzitcEamTiz37fn6BvwNqE8ISH6 9KCmwyWgO85rOMuP5YvoHIgkR2up9tWHbSm+QqxqEh+JTz/eX9prSJ2F6RlIYEtfDasj 6A6g== X-Gm-Message-State: AOAM532jun/SAVlkB1L44wbeHE9jdgrdylouPLNYy50Nz5wxgoEpC7cX WjWctZ+9syFZNjWhJiZ18mMq9d2a X-Google-Smtp-Source: ABdhPJy2HT3NvQBSypSHndKxdxUlCaZMHYa48FLqdsnfiiH9IoqBRqnHrImA4Q24gT2m4lwci2ZjiQ== X-Received: by 2002:a17:906:8602:: with SMTP id o2mr8380155ejx.277.1595579893742; Fri, 24 Jul 2020 01:38:13 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id r19sm239487edi.85.2020.07.24.01.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 01:38:13 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jul 2020 10:37:16 +0200 Message-Id: <20200724083717.8491-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724041021.23977-1-andreas.rheinhardt@gmail.com> References: <20200724041021.23977-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/smacker: Fix duration for PCM audio 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" For non-PCM audio, a Smacker frame contains the size of the decoded audio in the first four bytes of the audio packet data; for PCM data, said information would be redundant and according to [1] this field does not exist. Therefore this commit sets the duration and timestamps properly for PCM audio. [1]: https://wiki.multimedia.cx/index.php/Smacker#Audio_Track_Chunk Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 4ab150a6f0..b7a68a63f3 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -52,6 +52,7 @@ typedef struct SmackerContext { int cur_frame; int videoindex; int indexes[7]; + int duration_size[7]; /* current frame for demuxing */ uint32_t frame_size; int flags; @@ -197,6 +198,8 @@ static int smacker_read_header(AVFormatContext *s) if (par->bits_per_coded_sample == 16 && par->codec_id == AV_CODEC_ID_PCM_U8) par->codec_id = AV_CODEC_ID_PCM_S16LE; + else + smk->duration_size[i] = 4; avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->channels * par->bits_per_coded_sample / 8); } @@ -297,7 +300,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) uint32_t size; size = avio_rl32(s->pb); - if ((int)size < 8 || size > smk->frame_size) { + if ((int)size < 4 + smk->duration_size[i] || size > smk->frame_size) { av_log(s, AV_LOG_ERROR, "Invalid audio part size\n"); ret = AVERROR_INVALIDDATA; goto next_frame; @@ -315,7 +318,8 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) } pkt->stream_index = smk->indexes[i]; pkt->pts = smk->aud_pts[i]; - pkt->duration = AV_RL32(pkt->data); + pkt->duration = smk->duration_size[i] ? AV_RL32(pkt->data) + : size; smk->aud_pts[i] += pkt->duration; smk->next_audio_index = i + 1; return 0; From patchwork Fri Jul 24 08:37:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21248 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 94500448D9F for ; Fri, 24 Jul 2020 11:38:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DE1B68B7F1; Fri, 24 Jul 2020 11:38:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A743768B7DF for ; Fri, 24 Jul 2020 11:38:15 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id y10so9200057eje.1 for ; Fri, 24 Jul 2020 01:38:15 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=IqeCreyeK/nZFMi4S+xwoAlp4NmS0w2fcZwm5eNNeQY=; b=VEk9lRrzaJ7OkqAFsP9uI9kc8TArm95CvEkux8caODHmW29LSjCsLWYJmaeOJuvG/X fyLLF9o9jgTDdLJiHt57JnjLY0XyssXTSHNLxGfXsRFYf1dg7qIGbmc9eIww6v8uDEvr Z2uaLg7WHW7g04onsiaToquHr/RH5vDufj2YfOrXAnclHOaSedLhZQHgSo1S1C4MTY6/ nEJSno3HzOD1EOat1wZ5Nr5lH79Gz2BlJRvXza10BlcoNyd76H5+ESLODcLW4RVV7786 QW3wEwjRHT2A65WhVo45tJltOir1rDBIVyekHnv5K1+ncanBVKxYGEoFz3dTun+j+9qe qUMg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=IqeCreyeK/nZFMi4S+xwoAlp4NmS0w2fcZwm5eNNeQY=; b=Fizkcn7NzEYRdQmuyKNWTjm2reVk0/G6ERGWfB92Jdds6LwlR9ZmuBTvwqkvPeTJLC 2UELspqXD/+4g9Pxn8LYnEEH/29uZsUCzT07KaB7kq9LqYekyP6MGFSEfrKFcbgxg9Kx ZaEMBDoIy4xXGTjYQEDm/FxYnovJpn5HyVSJGHL7EPARZt8mpjrUuwwtcgKeoNVwpTsl JMmHlQv8FtKii8Lvq4I2gegDjRv5w/6ob28jRwuCe9hbVFo+rSwf+wA0dD6oOHS7Qn5U xUF3WJUnvD/mPe+XgfudwIeD8jDXSJRdJyFUSFlj69YAjcvm+SqEpPaFmBrD2nqwyD9r wmdg== X-Gm-Message-State: AOAM530c5EhJvx2OMUBvsslnYS+/opg0IUC8Jdj/z6QJmYDQ3zzQRgsv TjJBDp8QQjAB4qexnetiAk3BWfXu X-Google-Smtp-Source: ABdhPJwEZ9PPshYS/aah6/GY0kMFyp3t1nBvzA7O8Q/SIdMDntjQ+bGuRNd7PmFSM6DegaNjGRxTDQ== X-Received: by 2002:a17:907:20b4:: with SMTP id pw20mr8460296ejb.225.1595579894793; Fri, 24 Jul 2020 01:38:14 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id r19sm239487edi.85.2020.07.24.01.38.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 01:38:14 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jul 2020 10:37:17 +0200 Message-Id: <20200724083717.8491-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724041021.23977-1-andreas.rheinhardt@gmail.com> References: <20200724041021.23977-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/smacker: Don't return packets for streams with AVDISCARD_ALL 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" Signed-off-by: Andreas Rheinhardt --- libavformat/smacker.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index b7a68a63f3..9966a67055 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -308,8 +308,11 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) smk->frame_size -= size; size -= 4; - if (smk->indexes[i] < 0) { - avio_skip(s->pb, size); + if (smk->indexes[i] < 0 || + s->streams[smk->indexes[i]]->discard >= AVDISCARD_ALL) { + smk->aud_pts[i] += smk->duration_size[i] ? avio_rl32(s->pb) + : size; + avio_skip(s->pb, size - smk->duration_size[i]); continue; } if ((ret = av_get_packet(s->pb, pkt, size)) != size) { @@ -326,6 +329,10 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt) } } + if (s->streams[smk->videoindex]->discard >= AVDISCARD_ALL) { + ret = FFERROR_REDO; + goto next_frame; + } if (smk->frame_size >= INT_MAX/2) { ret = AVERROR_INVALIDDATA; goto next_frame;