From patchwork Tue Nov 10 00:58:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23458 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 88F04448FFF for ; Tue, 10 Nov 2020 03:07:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F9DC68BD00; Tue, 10 Nov 2020 03:07:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 429B568AA33 for ; Tue, 10 Nov 2020 03:07:39 +0200 (EET) Received: by mail-oi1-f196.google.com with SMTP id k26so12455422oiw.0 for ; Mon, 09 Nov 2020 17:07:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=pF167CLA8zuL9ghiyeuLM+3q6xBRbIO+MW4hCJgGEBI=; b=tQ/j27d2Wu2EmhyR9E/YwslNv+HQF5xUl01Re0dvvJQgxFhUZ8XfwUnuj2Ux6EjyJr uvu6ex9fPtoof4el2qVBbcJ5oUcSPUBzbBVXrE/WrosSfwN00KMrUN5CqhWqN0FbJwPX eQt5/ed2Hwl1X8Z84gYEqTFJvY/sY/yul57Hxp6DHTILQy9o/affdrw64exbcQ/P0rfE yFBKuKJWKfcK0McawQdVuiHvS1G+D4JT/Y99HGLFQSaicBqm2rsFBUlbMpTDUU8yL/yU O+0AISTo/MmZEC5UxnDt618+eudYRQt0MnApQyzn+C+PnDDRFSoSANbMMBq2gKdgCa0p r4MQ== 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; bh=pF167CLA8zuL9ghiyeuLM+3q6xBRbIO+MW4hCJgGEBI=; b=iepg003VlEUUXERwhkLshkzoOux/7Py/2iGxccFW6iWHvJe6ccl6y8Sx6lkknxOEza kED+r+DbOZsMa4qHUHt3SXQzTRmeMZ5glKBlcMxBEo74mMF9RQLAHVVkwVu0CTwBvmSK j/dx3T8PExSAhllSL0RwW2iQ64IYmTablYF7m4STxW/95jGuSu8fDruZdM2zHl5eO3X9 ho6hTO7CVFDRqXcKmolSeezkJN3EXHie7niDi7bqYoj4vGZeXYXm4gPCAKjfLyGrc3hx T1d2+UI4LFlTG7UUV6fZkscu35pbS4WEbMQfz+LNrPTlJtSMWbvM/bcUpZDPOg0e8qEo 9mQg== X-Gm-Message-State: AOAM533C/iQKoa16CXebID7RBgzlbWSunoCIFjUd52W/iB1q40eNt4Cx hsu7LBfILMbylVtbPwNCWjHmFJLCLJrLJw== X-Google-Smtp-Source: ABdhPJzKTyZrwoB1U/nP5zUW4Bys+T4tAw1oKzF0f9AuyUvAXgGrVGXH+IbdafwfBJljPg0WZbzrUA== X-Received: by 2002:a17:90a:67c5:: with SMTP id g5mr2124709pjm.13.1604970101428; Mon, 09 Nov 2020 17:01:41 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r127sm12183969pfc.159.2020.11.09.17.01.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2020 17:01:40 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 08:58:33 +0800 Message-Id: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/4] avfilter/vf_fade: simplify code to use pts timebase for time check 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_fade.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index 58d7f8c..af4795c 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -62,6 +62,7 @@ typedef struct FadeContext { int alpha; int is_planar; uint64_t start_time, duration; + uint64_t start_time_pts, duration_pts; enum {VF_FADE_WAITING=0, VF_FADE_FADING, VF_FADE_DONE} fade_state; uint8_t color_rgba[4]; ///< fade color int black_fade; ///< if color_rgba is black @@ -422,6 +423,11 @@ static int config_props(AVFilterLink *inlink) s->is_rgb = pixdesc->flags & AV_PIX_FMT_FLAG_RGB; s->is_packed_rgb = !s->is_planar && s->is_rgb; + if (s->duration) + s->duration_pts = av_rescale_q(s->duration, AV_TIME_BASE_Q, inlink->time_base); + if (s->start_time) + s->start_time_pts = av_rescale_q(s->start_time, AV_TIME_BASE_Q, inlink->time_base); + /* use CCIR601/709 black level for studio-level pixel non-alpha components */ s->black_level = ff_fmt_is_in(inlink->format, studio_level_pix_fmts) && !s->alpha ? 16 * (1 << (s->depth - 8)): 0; @@ -440,29 +446,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; FadeContext *s = ctx->priv; - double frame_timestamp = frame->pts == AV_NOPTS_VALUE ? -1 : frame->pts * av_q2d(inlink->time_base); // Calculate Fade assuming this is a Fade In if (s->fade_state == VF_FADE_WAITING) { s->factor=0; - if (frame_timestamp >= s->start_time/(double)AV_TIME_BASE + if (frame->pts >= s->start_time_pts && inlink->frame_count_out >= s->start_frame) { // Time to start fading s->fade_state = VF_FADE_FADING; // Save start time in case we are starting based on frames and fading based on time - if (s->start_time == 0 && s->start_frame != 0) { - s->start_time = frame_timestamp*(double)AV_TIME_BASE; + if (s->start_time_pts == 0 && s->start_frame != 0) { + s->start_time_pts = frame->pts; } // Save start frame in case we are starting based on time and fading based on frames - if (s->start_time != 0 && s->start_frame == 0) { + if (s->start_time_pts != 0 && s->start_frame == 0) { s->start_frame = inlink->frame_count_out; } } } if (s->fade_state == VF_FADE_FADING) { - if (s->duration == 0) { + if (s->duration_pts == 0) { // Fading based on frame count s->factor = (inlink->frame_count_out - s->start_frame) * s->fade_per_frame; if (inlink->frame_count_out > s->start_frame + s->nb_frames) { @@ -471,10 +476,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) } else { // Fading based on duration - s->factor = (frame_timestamp - s->start_time/(double)AV_TIME_BASE) - * (float) UINT16_MAX / (s->duration/(double)AV_TIME_BASE); - if (frame_timestamp > s->start_time/(double)AV_TIME_BASE - + s->duration/(double)AV_TIME_BASE) { + s->factor = (frame->pts - s->start_time_pts) * UINT16_MAX / s->duration_pts; + if (frame->pts > s->start_time_pts + s->duration_pts) { s->fade_state = VF_FADE_DONE; } } From patchwork Tue Nov 10 00:58:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23457 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 AB56D44B231 for ; Tue, 10 Nov 2020 03:01:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8668768BCA8; Tue, 10 Nov 2020 03:01:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E714A68BCA8 for ; Tue, 10 Nov 2020 03:01:44 +0200 (EET) Received: by mail-pg1-f193.google.com with SMTP id h6so8665558pgk.4 for ; Mon, 09 Nov 2020 17:01:44 -0800 (PST) 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; bh=pnxVywQXuIVxAkUafY/a4LIaEQX3By8IhMib3wDG3z8=; b=F9oA4GZMAO2sqXIsW8VT1JrdI7Ta1p0xmBvXUs3grsrqFHRDL1mpNzYmfZ+++VJ2Ft 5QESvB8v7RAOa48E3G0M/18QYC+TvJc5oJOnbKvxNSeT0Cmx4BI4iUtPDzNMyHXipJuH +ZzPd19mnJGsEu41gK2J+fsuAJYzI8jipSHcXombCEZXvsVKIBkg3G/FwhBOryboOrnU wCbzrEJyPBcySE67WphS2EOaXU34psE4o+T/Bodp1+m9BF/SGSDesuJ0NcUKdWn7E04u CcYULIkwzdi3tBhMROZGLSMY1ZprhPdF2FtrQv//gjBmledl8rjolt0pUC4Lqq7bzW7e b9lA== 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; bh=pnxVywQXuIVxAkUafY/a4LIaEQX3By8IhMib3wDG3z8=; b=sE2npukpoVhjPUptG8TxlRongv7cvAQGz2SM22Gq/xQC+lD91Gomq7kK0SWxAvS0Ql EpwAH30CXXMwEMCffotIo8Cx7Vnn1MyCg5ECtrLD0sfmW884L3rhwvWNQyH+fJoSwDpA OGK/5mwzNKgTbjCoRrX7LpnMg285Ne+d+FmxrRwA0QHKOU57St7N+0UUYUBcHtu+V5JQ CztkaaM7uOC6/OdpGafvqr5pWkQqBylj4tNmgzwlHMaW44cNIV0QfSqVrKWWvGJRFp2H 4aRXfcySt0NcMBKO4gyKJTUKRGtA2WxHceRbZbyNzRdzwNzj/569aq59tvvJwyLQEEns SYYQ== X-Gm-Message-State: AOAM532Ugth2x/b4TcVDxGnUNsUb+OqdSp4coI3nnVijuTbYjLPgTH6E QJ6ijPt7LrrL29JLmN2qFN0N+His+G/+fw== X-Google-Smtp-Source: ABdhPJzote4xalc8ylj1ea7L4xJtlenvWEIrJbkmDYuyajkMWQyvJCzcQFlQ+XYSl74StslqXXJZEg== X-Received: by 2002:a62:18d1:0:b029:18b:7897:579d with SMTP id 200-20020a6218d10000b029018b7897579dmr16097129pfy.10.1604970102998; Mon, 09 Nov 2020 17:01:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r127sm12183969pfc.159.2020.11.09.17.01.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2020 17:01:42 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 08:58:34 +0800 Message-Id: <1604969916-3030-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> References: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/4] avfilter/vf_fade: config_props -> config_input 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/vf_fade.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c index af4795c..51eea04 100644 --- a/libavfilter/vf_fade.c +++ b/libavfilter/vf_fade.c @@ -404,7 +404,7 @@ static int filter_slice_alpha16(AVFilterContext *ctx, void *arg, int jobnr, return 0; } -static int config_props(AVFilterLink *inlink) +static int config_input(AVFilterLink *inlink) { FadeContext *s = inlink->dst->priv; const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(inlink->format); @@ -553,7 +553,7 @@ static const AVFilterPad avfilter_vf_fade_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = config_props, + .config_props = config_input, .filter_frame = filter_frame, .needs_writable = 1, }, From patchwork Tue Nov 10 00:58:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23459 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 7C413448FFF for ; Tue, 10 Nov 2020 03:07:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 65CFB68BD30; Tue, 10 Nov 2020 03:07:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f195.google.com (mail-vk1-f195.google.com [209.85.221.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD795680C49 for ; Tue, 10 Nov 2020 03:07:46 +0200 (EET) Received: by mail-vk1-f195.google.com with SMTP id q77so2341545vkq.1 for ; Mon, 09 Nov 2020 17:07:46 -0800 (PST) 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; bh=s6IlWRcITrt95HybmMQEVtnvhYBDUnqgdxAZhlA14U4=; b=Xziq8x6QNwpYXyA+4J72d3o8rIusqoa4zzsnWQCofUe45Uhzs81mbgXKuYOwvouPJn H1Tfi8ZGAnQ+B+L+nRIqwK1RZZr6Zka/eZTv4/qssn9XnyFzefDn7cuyMmvAJraHeGi+ 6EBGPwg4Fp7UZC6a0hY/ppPcRknSJuKA6krnC+zd6+xWKV2o+4UNzwvWBdy+DaYNSRSW VSZnZRSJBr6PKNt2c0NM26j1SDGtvaVWPQYKzDbPqMdt76p74kpEa7VH14nxmj6Olede ko7wREtko6OI1T8F7v2z91OuKlvDm1IMYjW/CSpAqOXVGU4tCBwLcfJz4uBtInHmJP7F wmtQ== 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; bh=s6IlWRcITrt95HybmMQEVtnvhYBDUnqgdxAZhlA14U4=; b=ly7h8e3a8QUZg/3K36lRho0KMdQCaXu1vBkHJ1q4TNgvT+zRzkKx3Ywimts7U0oXv/ OmSqVgNzdez/2P3135c0ALB2mTyXhdDJJdYrhynPZ5rNIC8RQtNM/xuZnue/0UMdyzZj rjyCX4xxcLKUD5YLmKCH5XUKwMEqHtmCYazwJp+3Re3VlFmpf+DgSizUySN4Z1p9UZUH 1h3Ype64zXDbG4PRh3HG/DQ2PftZziOwzMl1B0iROOISiyivWGBMeP4RY8LpclQbu2Da AwR7p6g4sTfvC1ly+kbl23Ala9aPl1ODK8FA3i/C7E9Hb2v/8j1tpb5BfvZFoMaikmsK fAdw== X-Gm-Message-State: AOAM5333OGnflAvfNxWgYtCulYmFyuNpLeYpNo9Xq2exQRN88qec8G+i 64c86zB3sMjeHJ5u5SrGt9yr3s+FJt0apw== X-Google-Smtp-Source: ABdhPJw8xflgpr2+hLntapg/XYS4bMfIC5Axu3Z8gnKn6sYSHjI25XUDRDwyaUYH3NFO8qFV6xLltA== X-Received: by 2002:aa7:8281:0:b029:164:cc0f:2b3a with SMTP id s1-20020aa782810000b0290164cc0f2b3amr16376716pfm.30.1604970104576; Mon, 09 Nov 2020 17:01:44 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r127sm12183969pfc.159.2020.11.09.17.01.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2020 17:01:44 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 08:58:35 +0800 Message-Id: <1604969916-3030-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> References: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avformat/dvenc: s->streams[i] -> st 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dvenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index b04d604..1c38673 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -307,14 +307,15 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) /* We have to sort out where audio and where video stream is */ for (i=0; inb_streams; i++) { - switch (s->streams[i]->codecpar->codec_type) { + AVStream *st = s->streams[i]; + switch (st->codecpar->codec_type) { case AVMEDIA_TYPE_VIDEO: if (vst) return NULL; - vst = s->streams[i]; + vst = st; break; case AVMEDIA_TYPE_AUDIO: if (c->n_ast > 1) return NULL; - c->ast[c->n_ast++] = s->streams[i]; + c->ast[c->n_ast++] = st; break; default: goto bail_out; From patchwork Tue Nov 10 00:58:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23460 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 6A0D8448FFF for ; Tue, 10 Nov 2020 03:07:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F6A868BD36; Tue, 10 Nov 2020 03:07:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C47768B9B7 for ; Tue, 10 Nov 2020 03:07:52 +0200 (EET) Received: by mail-oi1-f194.google.com with SMTP id q206so12405307oif.13 for ; Mon, 09 Nov 2020 17:07:52 -0800 (PST) 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; bh=754nYCoOYN5W5wbK8rlLSXzSyndT+pCVwht7p9/aqFk=; b=LtmJ51tjL5yyTsbjYVwtvhLGJn0V0U7JkspIb0/+DvQ8a+YaO7ABhLkBtARsXFmqEh l8KBjNnobsiyJJikqbb/W5sQVG52FsdZEVwnk7oeUMqgcAkGL7xWQcVVmUH/aWpnCk29 tsIjupV5E6GpAL8NXXUGTd/GS3WUSPmrUJRhO1gEVx4GBMfv7HQyLMxJAcFAmqHQS/yH eRLX69dNv/UelwLd7EjMstmvCVEY3Sfi+T1jN5GTKOgUq1mdKU+DhZdRh8zPo0nv9oSc BoPOTy8RAHhYi1+NWfOV5o0Iw9oJJ9UI55czvYUkuq7QIfDp1ZNjZHZiEy7Y56QAocN0 BzyQ== 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; bh=754nYCoOYN5W5wbK8rlLSXzSyndT+pCVwht7p9/aqFk=; b=f3w56dZhoKhA0qIGJd2nuyZizcyzqyHiwSxb4HiGil3C15DTG06gTPPwAGjDr+uUNl s5SgovdYaRMJ5bIbQwGqy2B1CJWQmQ3qR0ktMvPiOb0dBtI0FUSOq3oB9R9dTY9/Fk/G /d64M/bc73rsRi7+qhf922fqlZxvpYq0Ja0NtJfiJEt2xoMmuoWMsx81WA2JB81VaE3z FbpN4bkO+tF41g3YfVxQg4Kjb0JUnWnrAvB/2ht361XxRlf3LhnWRP4aDePJavT9AM/1 ah8bcNtdiafE4QMQkF5KYQvTKTFrykcJwW+upfw+QehU1ZAuftt+vsmvGZKrDy5IDC2Y 2ogw== X-Gm-Message-State: AOAM530WbhtFdB5RrYg9Was6lBnsm4v4uKE8jI2iiShClDaLWjyXA/tw wnuSpHmzCvlqxsaqclvW9r7xbh1587gAFw== X-Google-Smtp-Source: ABdhPJyiAI3E5keqsIPH182eeWvopNz8lhSnrADD6WwJZcCpuDU3rI87ZjtPGaTICNKytkAYMUpr2A== X-Received: by 2002:a17:90a:5204:: with SMTP id v4mr1897337pjh.188.1604970106236; Mon, 09 Nov 2020 17:01:46 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r127sm12183969pfc.159.2020.11.09.17.01.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2020 17:01:45 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 08:58:36 +0800 Message-Id: <1604969916-3030-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> References: <1604969916-3030-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] avformat/dvenc: check the format before vst and ast[i] are initialized 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/dvenc.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libavformat/dvenc.c b/libavformat/dvenc.c index 1c38673..6c0d40f 100644 --- a/libavformat/dvenc.c +++ b/libavformat/dvenc.c @@ -311,10 +311,20 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) switch (st->codecpar->codec_type) { case AVMEDIA_TYPE_VIDEO: if (vst) return NULL; + if (st->codecpar->codec_id != AV_CODEC_ID_DVVIDEO) + goto bail_out; vst = st; break; case AVMEDIA_TYPE_AUDIO: if (c->n_ast > 1) return NULL; + /* Some checks -- DV format is very picky about its incoming streams */ + if(st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE || + st->codecpar->channels != 2) + goto bail_out; + if (st->codecpar->sample_rate != 48000 && + st->codecpar->sample_rate != 44100 && + st->codecpar->sample_rate != 32000 ) + goto bail_out; c->ast[c->n_ast++] = st; break; default: @@ -322,20 +332,9 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s) } } - /* Some checks -- DV format is very picky about its incoming streams */ - if (!vst || vst->codecpar->codec_id != AV_CODEC_ID_DVVIDEO) + if (!vst) goto bail_out; - for (i=0; in_ast; i++) { - if (c->ast[i]) { - if(c->ast[i]->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE || - c->ast[i]->codecpar->channels != 2) - goto bail_out; - if (c->ast[i]->codecpar->sample_rate != 48000 && - c->ast[i]->codecpar->sample_rate != 44100 && - c->ast[i]->codecpar->sample_rate != 32000 ) - goto bail_out; - } - } + c->sys = av_dv_codec_profile2(vst->codecpar->width, vst->codecpar->height, vst->codecpar->format, vst->time_base); if (!c->sys)