From patchwork Wed Jan 6 15:35:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24805 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 F392244B7F6 for ; Wed, 6 Jan 2021 17:35:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BED8368A08B; Wed, 6 Jan 2021 17:35:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B6F0689C22 for ; Wed, 6 Jan 2021 17:35:41 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id 15so2451173pgx.7 for ; Wed, 06 Jan 2021 07:35:41 -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=Hr7wV8XyWTqaU3Dn+tS8q8dQydphHyKpGI3TrDvyvtg=; b=NtjwpcW5uhPMFymd36StT1q2sXBJfnzXdgXILDfnHhZ9rToJ17geVl2t1tGfT6DT0t lGrxSU1h4dH2DRy8VGMXAlF6AVvTxGgPKG6vU96K6SlTWMcUCrS2wUmQEBDA8Des1L6f CuTxiTWwAmkCjiWDrPbZK7xnQydKZ5Z5q7FGUiLVxlDP9yH78e+QfYXnzJQ3/p7ccuMy Lr6bVi/yxr02ZyDXhgjNUks5PlUd0hSpTGvY1a6Sx7e6KA6xgCzpqypEmq4G0vbNjk8T fkHalMaKVaAc4BOOp24Cxp8PuTxwnUVtgXi2HDhi0pfcvR9jN2MkMThomZyuiSFWOPKY 0fhw== 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=Hr7wV8XyWTqaU3Dn+tS8q8dQydphHyKpGI3TrDvyvtg=; b=m4c7EVSVjiOMVXRrpRA3mJgJa5BOtmr7gzUz+TpIsONKVpp9sIcgbKJL2iw/5ha5Gb U2yH3iyEk0uVKQvToIuQL6s/UQLbwfL/iYluAS+wBWMOOIjKKthBEBQdXaL3M2Y/JY78 rxZ9q+7adlybXFHqDDAwX1ZRCMvnJf+3BWPV2cmhgFtobgZfHVTfT1U5vT3jw8MU3C4J 4wUG8Opp9vnwcAtADcsh3J3hTF08a9xtIfItxPxAWhfi1V0YT7SAaBxK4yA91wTlyuta wk9/4mXkgFEBNe9JgoP+ISWTfiCB53H6624/YNF5ea7KK7SCvTby7lZn6/oKlUs2gFbA UXTw== X-Gm-Message-State: AOAM531NTfLvMO+9fa/s1p9bZ10IEzD5krgoxJrP7cZHMhBOoJ1SZcYd qZnlSpjWHBPZKGYtB/S+fD+93w7tzaM= X-Google-Smtp-Source: ABdhPJz2rwQQy5bxBdyzfUtXmsOsh0hiP3VhU6tkqCMFtxQiAbTK2mdXrJ3LkUOjwRgSp5kPEz2LJg== X-Received: by 2002:aa7:9312:0:b029:1a3:82bd:83cc with SMTP id 18-20020aa793120000b02901a382bd83ccmr4429542pfj.11.1609947339093; Wed, 06 Jan 2021 07:35:39 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v15sm2937963pfn.217.2021.01.06.07.35.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 07:35:38 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jan 2021 23:35:27 +0800 Message-Id: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/udp: add memory alloc checks 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/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/udp.c b/libavformat/udp.c index 13c346a..d33e4d6 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -892,6 +892,10 @@ static int udp_open(URLContext *h, const char *uri, int flags) /* start the task going */ s->fifo = av_fifo_alloc(s->circular_buffer_size); + if (!s->fifo) { + av_log(h, AV_LOG_ERROR, "av_fifo_alloc failed\n"); + goto fail; + } ret = pthread_mutex_init(&s->mutex, NULL); if (ret != 0) { av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret)); From patchwork Wed Jan 6 15:35:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24808 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 1CE6544BC83 for ; Wed, 6 Jan 2021 17:43:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01BF868A2B1; Wed, 6 Jan 2021 17:43:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8F1D68920B for ; Wed, 6 Jan 2021 17:43:41 +0200 (EET) Received: by mail-pg1-f175.google.com with SMTP id g15so2468512pgu.9 for ; Wed, 06 Jan 2021 07:43:41 -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=SLZef+z6iejgLXNgm7fVxfcXVL4gIw2EmdcS1RK0i4U=; b=GMAYIdMDEL8PwCP5dmZ1L5sOmPNh0DagPYXI+xauVdlGDpNAl70RPH5TXLxFU83Zf+ y57ZEA8vlWFNf3msW3tq2n6M3UzzzqKlLJehZkaUF/fzt0HnnNzg+CamZ0qnAjJ//e4M t5KyXrJTQ1J2YFDAlNd3MhNEGDOsIgWqvgqq8stri4hbzI3m4vYCj7kCQocv3LkrlS8y qcFcQehNgxj+QYLfee3JdOeC6gN9x8BnzLLdINVmR4J5cabC5jtnOqoTB85/RbiXuxK7 b1VmIDxM7JXApFAwLPRjIJswMDR2pC05QM5/z4PhMvoUk2xoSDThmgsbBAG2lIwctgd/ yikw== 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=SLZef+z6iejgLXNgm7fVxfcXVL4gIw2EmdcS1RK0i4U=; b=fNh7p0cFTw/V6QFeaolBuTCdHgamHtjz9XJm7xOHpiq/RoGHCSM9ogSZePS1MtAF0O 2beLeiQXbXZ8Bc+6emN3tOjSR/jH9shVSulGnNuhKYAoRPwRGCdfBKOoyk81GQtpIOdt AgxYtVRQcme4q7TI8GEjgnapYVYvB2e5mAAcoI/t8EruW76akfmKd4Rx5bm0o09qZL+y /7LuHMw5XtyqaKnsGt3KukF9qQMD5pWXWAAuDMcIJwjGEDNI+0E58wSpDtfHFS6mCvl5 YAx8HuJBkg1NFiM2ApaR8Nu8uqFv21ixOJp4FisTj6tUIQXJy/+Rw8YMVN3EHNQVGe7q FvbA== X-Gm-Message-State: AOAM5319lh/27awx3bIQUTrnEC3Muk2kILN10pMsayRuivPAP3QphSuq RRTWBKz8uJ6yvl/S1XuO6+0op0I69/4= X-Google-Smtp-Source: ABdhPJxML4sJ330kYh9hT0sXlEAa8nKTk59j4mW9U5ml6SEbFQJw3C3NdYAChKnTJ2Y3CTCtez7JPw== X-Received: by 2002:a63:1456:: with SMTP id 22mr5095589pgu.386.1609947340778; Wed, 06 Jan 2021 07:35:40 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v15sm2937963pfn.217.2021.01.06.07.35.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 07:35:40 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jan 2021 23:35:28 +0800 Message-Id: <1609947331-6849-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> References: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avformat/mxfenc: simplify the code and use mode for OP1a/D10/OPAtom muxer 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/mxfenc.c | 73 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index d8678c9..7fce7b9 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -60,12 +60,13 @@ #include "mxf.h" #include "config.h" -extern AVOutputFormat ff_mxf_d10_muxer; -extern AVOutputFormat ff_mxf_opatom_muxer; - #define EDIT_UNITS_PER_BODY 250 #define KAG_SIZE 512 +#define MODE_OP1a 0x01 +#define MODE_D10 0x02 +#define MODE_OPA 0x04 + typedef struct MXFIndexEntry { uint64_t offset; unsigned slice_offset; ///< offset of audio slice @@ -258,6 +259,7 @@ typedef struct MXFContext { int store_user_comments; int track_instance_count; // used to generate MXFTrack uuids int cbr_index; ///< use a constant bitrate index + int mode; } MXFContext; static const uint8_t uuid_base[] = { 0xAD,0xAB,0x44,0x24,0x2f,0x25,0x4d,0xc7,0x92,0xff,0x29,0xbd }; @@ -630,7 +632,7 @@ static void mxf_write_preface(AVFormatContext *s) // operational pattern mxf_write_local_tag(pb, 16, 0x3B09); - if (s->oformat == &ff_mxf_opatom_muxer) + if (mxf->mode == MODE_OPA) avio_write(pb, opatom_ul, 16); else avio_write(pb, op1a_ul, 16); @@ -723,7 +725,7 @@ static void mxf_write_identification(AVFormatContext *s) MXFContext *mxf = s->priv_data; AVIOContext *pb = s->pb; const char *company = "FFmpeg"; - const char *product = s->oformat != &ff_mxf_opatom_muxer ? "OP1a Muxer" : "OPAtom Muxer"; + const char *product = mxf->mode != MODE_OPA ? "OP1a Muxer" : "OPAtom Muxer"; const char *version; int length; @@ -821,7 +823,7 @@ static void mxf_write_track(AVFormatContext *s, AVStream *st, MXFPackage *packag // write edit rate mxf_write_local_tag(pb, 8, 0x4B01); - if (st == mxf->timecode_track && s->oformat == &ff_mxf_opatom_muxer) { + if (st == mxf->timecode_track && mxf->mode == MODE_OPA) { avio_wb32(pb, mxf->tc.rate.num); avio_wb32(pb, mxf->tc.rate.den); } else { @@ -857,7 +859,7 @@ static void mxf_write_common_fields(AVFormatContext *s, AVStream *st) // write duration mxf_write_local_tag(pb, 8, 0x0202); - if (st != mxf->timecode_track && s->oformat == &ff_mxf_opatom_muxer && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { + if (st != mxf->timecode_track && mxf->mode == MODE_OPA && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { avio_wb64(pb, mxf->body_offset / mxf->edit_unit_byte_count); } else { avio_wb64(pb, mxf->duration); @@ -1023,7 +1025,7 @@ static int64_t mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UI avio_wb32(pb, st->index+2); mxf_write_local_tag(pb, 8, 0x3001); - if (s->oformat == &ff_mxf_d10_muxer) { + if (mxf->mode == MODE_D10) { avio_wb32(pb, mxf->time_base.den); avio_wb32(pb, mxf->time_base.num); } else { @@ -1064,6 +1066,7 @@ static inline uint32_t rescale_mastering_luma(AVRational q) static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key) { + MXFContext *mxf = s->priv_data; MXFStreamContext *sc = st->priv_data; AVIOContext *pb = s->pb; int stored_width = 0; @@ -1095,7 +1098,7 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID mxf_write_local_tag(pb, 4, 0x3202); avio_wb32(pb, stored_height>>sc->interlaced); - if (s->oformat == &ff_mxf_d10_muxer) { + if (mxf->mode == MODE_D10) { //Stored F2 Offset mxf_write_local_tag(pb, 4, 0x3216); avio_wb32(pb, 0); @@ -1392,7 +1395,7 @@ static int64_t mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, int show_warnings = !mxf->footer_partition_offset; int64_t pos = mxf_write_generic_desc(s, st, key); - if (s->oformat == &ff_mxf_opatom_muxer) { + if (mxf->mode == MODE_OPA) { mxf_write_local_tag(pb, 8, 0x3002); avio_wb64(pb, mxf->body_offset / mxf->edit_unit_byte_count); } @@ -1406,17 +1409,17 @@ static int64_t mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, avio_wb32(pb, st->codecpar->sample_rate); avio_wb32(pb, 1); - if (s->oformat == &ff_mxf_d10_muxer) { + if (mxf->mode == MODE_D10) { mxf_write_local_tag(pb, 1, 0x3D04); avio_w8(pb, 0); } mxf_write_local_tag(pb, 4, 0x3D07); if (mxf->channel_count == -1) { - if (show_warnings && (s->oformat == &ff_mxf_d10_muxer) && (st->codecpar->channels != 4) && (st->codecpar->channels != 8)) + if (show_warnings && (mxf->mode == MODE_D10) && (st->codecpar->channels != 4) && (st->codecpar->channels != 8)) av_log(s, AV_LOG_WARNING, "the number of audio channels shall be 4 or 8 : the output will not comply to MXF D-10 specs, use -d10_channelcount to fix this\n"); avio_wb32(pb, st->codecpar->channels); - } else if (s->oformat == &ff_mxf_d10_muxer) { + } else if (mxf->mode == MODE_D10) { if (show_warnings && (mxf->channel_count < st->codecpar->channels)) av_log(s, AV_LOG_WARNING, "d10_channelcount < actual number of audio channels : some channels will be discarded\n"); if (show_warnings && (mxf->channel_count != 4) && (mxf->channel_count != 8)) @@ -1916,7 +1919,7 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid, avio_wb32(pb, index_byte_count ? indexsid : 0); // indexSID // BodyOffset - if (bodysid && mxf->edit_units_count && mxf->body_partitions_count && s->oformat != &ff_mxf_opatom_muxer) + if (bodysid && mxf->edit_units_count && mxf->body_partitions_count && mxf->mode != MODE_OPA) avio_wb64(pb, mxf->body_offset); else avio_wb64(pb, 0); @@ -1924,7 +1927,7 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid, avio_wb32(pb, bodysid); // bodySID // operational pattern - if (s->oformat == &ff_mxf_opatom_muxer) + if (mxf->mode == MODE_OPA) avio_write(pb, opatom_ul, 16); else avio_write(pb, op1a_ul, 16); @@ -2343,6 +2346,7 @@ static const UID *mxf_get_mpeg2_codec_ul(AVCodecParameters *par) static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt, MXFIndexEntry *e) { + MXFContext *mxf = s->priv_data; MXFStreamContext *sc = st->priv_data; uint32_t c = -1; int i; @@ -2399,7 +2403,7 @@ static int mxf_parse_mpeg2_frame(AVFormatContext *s, AVStream *st, } } } - if (s->oformat != &ff_mxf_d10_muxer) + if (mxf->mode != MODE_D10) sc->codec_ul = mxf_get_mpeg2_codec_ul(st->codecpar); return !!sc->codec_ul; } @@ -2466,7 +2470,7 @@ static int mxf_write_header(AVFormatContext *s) if (!s->nb_streams) return -1; - if (s->oformat == &ff_mxf_opatom_muxer && s->nb_streams !=1) { + if (mxf->mode == MODE_OPA && s->nb_streams !=1) { av_log(s, AV_LOG_ERROR, "there must be exactly one stream for mxf opatom\n"); return -1; } @@ -2474,6 +2478,13 @@ static int mxf_write_header(AVFormatContext *s) if (!av_dict_get(s->metadata, "comment_", NULL, AV_DICT_IGNORE_SUFFIX)) mxf->store_user_comments = 0; + mxf->mode = MODE_OP1a; + if (s->oformat) { + if (!strcmp("mxf", s->oformat->name)) mxf->mode = MODE_OP1a; + else if (!strcmp("mxf_d10",s->oformat->name)) mxf->mode = MODE_D10; + else if (!strcmp("mxf_opatom", s->oformat->name)) mxf->mode = MODE_OPA; + } + for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; MXFStreamContext *sc = av_mallocz(sizeof(*sc)); @@ -2482,7 +2493,7 @@ static int mxf_write_header(AVFormatContext *s) st->priv_data = sc; sc->index = -1; - if (((i == 0) ^ (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) && s->oformat != &ff_mxf_opatom_muxer) { + if (((i == 0) ^ (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) && mxf->mode != MODE_OPA) { av_log(s, AV_LOG_ERROR, "there must be exactly one video stream and it must be the first one\n"); return -1; } @@ -2526,12 +2537,12 @@ static int mxf_write_header(AVFormatContext *s) sc->video_bit_rate = st->codecpar->bit_rate; - if (s->oformat == &ff_mxf_d10_muxer || + if (mxf->mode == MODE_D10 || st->codecpar->codec_id == AV_CODEC_ID_DNXHD || st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO) mxf->cbr_index = 1; - if (s->oformat == &ff_mxf_d10_muxer) { + if (mxf->mode == MODE_D10) { int ntsc = mxf->time_base.den != 25; int ul_index; @@ -2569,7 +2580,7 @@ static int mxf_write_header(AVFormatContext *s) return -1; } avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); - if (s->oformat == &ff_mxf_d10_muxer) { + if (mxf->mode == MODE_D10) { if (st->index != 1) { av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n"); return -1; @@ -2581,7 +2592,7 @@ static int mxf_write_header(AVFormatContext *s) sc->index = INDEX_D10_AUDIO; sc->container_ul = ((MXFStreamContext*)s->streams[0]->priv_data)->container_ul; sc->frame_size = 4 + 8 * av_rescale_rnd(st->codecpar->sample_rate, mxf->time_base.num, mxf->time_base.den, AV_ROUND_UP) * 4; - } else if (s->oformat == &ff_mxf_opatom_muxer) { + } else if (mxf->mode == MODE_OPA) { AVRational tbc = av_inv_q(mxf->audio_edit_rate); if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE && @@ -2647,7 +2658,7 @@ static int mxf_write_header(AVFormatContext *s) present[sc->index]++; } - if (s->oformat == &ff_mxf_d10_muxer || s->oformat == &ff_mxf_opatom_muxer) { + if (mxf->mode == MODE_D10 || mxf->mode == MODE_OPA) { mxf->essence_container_count = 1; } @@ -2818,7 +2829,7 @@ static void mxf_compute_edit_unit_byte_count(AVFormatContext *s) MXFContext *mxf = s->priv_data; int i; - if (s->oformat == &ff_mxf_opatom_muxer) { + if (mxf->mode == MODE_OPA) { MXFStreamContext *sc = s->streams[0]->priv_data; mxf->edit_unit_byte_count = sc->frame_size; return; @@ -2889,7 +2900,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) mxf_compute_edit_unit_byte_count(s); } - if (s->oformat == &ff_mxf_opatom_muxer) + if (mxf->mode == MODE_OPA) return mxf_write_opatom_packet(s, pkt, &ie); if (!mxf->header_written) { @@ -2937,7 +2948,7 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) mxf_write_klv_fill(s); avio_write(pb, sc->track_essence_element_key, 16); // write key - if (s->oformat == &ff_mxf_d10_muxer && + if (mxf->mode == MODE_D10 && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { mxf_write_d10_audio_packet(s, st, pkt); } else { @@ -2959,7 +2970,7 @@ static void mxf_write_random_index_pack(AVFormatContext *s) avio_write(pb, random_index_pack_key, 16); klv_encode_ber_length(pb, 28 + 12LL*mxf->body_partitions_count); - if (mxf->edit_unit_byte_count && s->oformat != &ff_mxf_opatom_muxer) + if (mxf->edit_unit_byte_count && mxf->mode != MODE_OPA) avio_wb32(pb, 1); // BodySID of header partition else avio_wb32(pb, 0); @@ -2983,7 +2994,7 @@ static int mxf_write_footer(AVFormatContext *s) int i, err; if (!mxf->header_written || - (s->oformat == &ff_mxf_opatom_muxer && !mxf->body_partition_offset)) { + (mxf->mode == MODE_OPA && !mxf->body_partition_offset)) { /* reason could be invalid options/not supported codec/out of memory */ return AVERROR_UNKNOWN; } @@ -2992,7 +3003,7 @@ static int mxf_write_footer(AVFormatContext *s) mxf_write_klv_fill(s); mxf->footer_partition_offset = avio_tell(pb); - if (mxf->edit_unit_byte_count && s->oformat != &ff_mxf_opatom_muxer) { // no need to repeat index + if (mxf->edit_unit_byte_count && mxf->mode != MODE_OPA) { // no need to repeat index if ((err = mxf_write_partition(s, 0, 0, footer_partition_key, 0)) < 0) return err; } else { @@ -3006,7 +3017,7 @@ static int mxf_write_footer(AVFormatContext *s) mxf_write_random_index_pack(s); if (s->pb->seekable & AVIO_SEEKABLE_NORMAL) { - if (s->oformat == &ff_mxf_opatom_muxer) { + if (mxf->mode == MODE_OPA) { /* rewrite body partition to update lengths */ avio_seek(pb, mxf->body_partition_offset[0], SEEK_SET); if ((err = mxf_write_opatom_body_partition(s)) < 0) @@ -3014,7 +3025,7 @@ static int mxf_write_footer(AVFormatContext *s) } avio_seek(pb, 0, SEEK_SET); - if (mxf->edit_unit_byte_count && s->oformat != &ff_mxf_opatom_muxer) { + if (mxf->edit_unit_byte_count && mxf->mode != MODE_OPA) { if ((err = mxf_write_partition(s, 1, 2, header_closed_partition_key, 1)) < 0) return err; mxf_write_klv_fill(s); From patchwork Wed Jan 6 15:35:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24807 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 E7B8E44BC83 for ; Wed, 6 Jan 2021 17:43:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD8E768A1B9; Wed, 6 Jan 2021 17:43:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6249A68A08B for ; Wed, 6 Jan 2021 17:43:09 +0200 (EET) Received: by mail-pg1-f178.google.com with SMTP id v19so2448405pgj.12 for ; Wed, 06 Jan 2021 07:43:09 -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=aqZEx1q8Ik2M7KMzbpZPXFnzRDhIy5V0VgzT5IYp+5Y=; b=ZF1thZfWQTOlYNiR991646Gd0wQmRFrxbX1Ujp6ArNYNh+So/vA9uOTGlB6iLHp1eh pwDCVp7sLyS7d3MWNRU/ZArz5V9+cWPlpduaxMCdDpl+ngn6stavI4aH19/z5rRropkZ XrCrpUidbO0Pgn+fr7XJ0sdDLBiDayIK5yVpGR9Iuoszjv1qwNJvC8TEoPsOfCGd/f4z /ckacRi9fzarBjybLf4+4Kycko+Vv5hPr8rRSTAuGp5ycuj/XtiDzvs8wVQYUCuMOIHC AQ82/MTRjktzhNKxzZYY4caxq3R022gOeRLvtJWaz82Do04tO4rSZE6aa3t/G2ugrfja 1DOQ== 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=aqZEx1q8Ik2M7KMzbpZPXFnzRDhIy5V0VgzT5IYp+5Y=; b=nLff6mhJ5e69FBi/GvWMLL4r9fY0XjiAp7EPsFcwBCHzzgfdb2LwFncQtaOiHrVX8D lUjFo26Gz3dcWC50HnGWblDL1wwsWrFUaefZjvjeOMtqdvl6mXO2V0wNTuphvH2sI6VV SAm7nhnNTM8yAEpGp0DVS8H+cS8TjS52L96iP4+35EdOH0o3psJDqiMkN/Ti83LiBRCf lHwsgTJMYsKC/wBTY2UXs8Sx/CwFLFmsk8kzuCcJkUG0a5tI7c1AQVjNOZD+L2ax0bNH UC6DIOmMR1kzjZUk6zSYaMrTj6mLuYwEWlHhBZwyGPperxUZ+W79ataINXM/kGJOa819 kBEA== X-Gm-Message-State: AOAM531BrZ+O2UA/znwhxapqAE+amEmORDip811ufqyJ0lsWXe/O63Bp 28krlE2X1RqVWGR9wO/44ekC76g481s= X-Google-Smtp-Source: ABdhPJzvvvNCJFtWBW3AHGw8SoiBfvnM52hvNWcbo/jRLc1YYEy/Pdh1ChJwX//WwiT1HfqPU/9xJA== X-Received: by 2002:a65:6152:: with SMTP id o18mr5134032pgv.392.1609947342412; Wed, 06 Jan 2021 07:35:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v15sm2937963pfn.217.2021.01.06.07.35.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 07:35:41 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jan 2021 23:35:29 +0800 Message-Id: <1609947331-6849-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> References: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/mxfenc: prefer to use the existing metadata 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 Please check metadata with below command: ./ffmpeg -i ../fate-suite/mxf/Sony-00001.mxf -c:v copy -c:a copy out.mxf ./ffmpeg -i out.mxf company_name : FFmpeg product_name : OP1a Muxer product_version : 58.65.101o => company_name : SONY product_name : eVTR product_version : 1.00 So need to update fate-mxf fate test. Signed-off-by: Limin Wang --- libavformat/mxfenc.c | 12 ++++++++---- tests/ref/fate/mxf-d10-user-comments | 2 +- tests/ref/fate/mxf-opatom-user-comments | 2 +- tests/ref/fate/mxf-reel_name | 2 +- tests/ref/fate/mxf-user-comments | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 7fce7b9..a76a69c 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -724,16 +724,20 @@ static void mxf_write_identification(AVFormatContext *s) { MXFContext *mxf = s->priv_data; AVIOContext *pb = s->pb; - const char *company = "FFmpeg"; - const char *product = mxf->mode != MODE_OPA ? "OP1a Muxer" : "OPAtom Muxer"; - const char *version; + AVDictionaryEntry *com_entry = av_dict_get(s->metadata, "company_name", NULL, 0); + AVDictionaryEntry *product_entry = av_dict_get(s->metadata, "product_name", NULL, 0); + AVDictionaryEntry *version_entry = av_dict_get(s->metadata, "product_version", NULL, 0); + const char *company = com_entry ? com_entry->value : "FFmpeg"; + const char *product = product_entry ? product_entry->value : mxf->mode != MODE_OPA ? "OP1a Muxer" : "OPAtom Muxer"; + const char *version = NULL; + const char *product_version = version_entry ? version_entry->value : AV_STRINGIFY(LIBAVFORMAT_VERSION); int length; mxf_write_metadata_key(pb, 0x013000); PRINT_KEY(s, "identification key", pb->buf_ptr - 16); version = s->flags & AVFMT_FLAG_BITEXACT ? - "0.0.0" : AV_STRINGIFY(LIBAVFORMAT_VERSION); + "0.0.0" : product_version; length = 100 +mxf_utf16_local_tag_length(company) + mxf_utf16_local_tag_length(product) + mxf_utf16_local_tag_length(version); diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index de4f26c..4aebcaf 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -1 +1 @@ -68f0fa62b6a676894afbbe4c34ebf70b +84e289a83797e793bfa0d3a31f94ac6c diff --git a/tests/ref/fate/mxf-opatom-user-comments b/tests/ref/fate/mxf-opatom-user-comments index 90e3fb2..374a72a 100644 --- a/tests/ref/fate/mxf-opatom-user-comments +++ b/tests/ref/fate/mxf-opatom-user-comments @@ -1 +1 @@ -f6760a9e710ba478bc3949f3e5c9b34a +e7c41639b79ac54c4df05475fb0eea66 diff --git a/tests/ref/fate/mxf-reel_name b/tests/ref/fate/mxf-reel_name index 16022b1..6e3218f 100644 --- a/tests/ref/fate/mxf-reel_name +++ b/tests/ref/fate/mxf-reel_name @@ -1 +1 @@ -73a891041b2fc836a893ffb49fff4fff +be4c1b76138c855ac3e2d2579cbecc17 diff --git a/tests/ref/fate/mxf-user-comments b/tests/ref/fate/mxf-user-comments index ddf51d9..46db6a3 100644 --- a/tests/ref/fate/mxf-user-comments +++ b/tests/ref/fate/mxf-user-comments @@ -1 +1 @@ -1255faf854223a74d707553121e5eca3 +8f2360104655971dc5fb68f98eda1b84 From patchwork Wed Jan 6 15:35:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24806 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 0A1AC44B2C4 for ; Wed, 6 Jan 2021 17:42:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF77568A1B9; Wed, 6 Jan 2021 17:42:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF153680A4B for ; Wed, 6 Jan 2021 17:42:23 +0200 (EET) Received: by mail-il1-f181.google.com with SMTP id b10so1602772ilr.4 for ; Wed, 06 Jan 2021 07:42:23 -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=EiEe4FMkPUmw8KOAEfvvBztEAZRI2MskCgujqdTvggk=; b=C8gyPp85XJbJgMTK9lLRiCckZWrWN3VU+QX9qn6IEeYzeYPITf1f+5ysp2LFp5t7ZX ixthbquPQR3i48o0TgW2D8sbCqrgb+mI5Sn5TX9Wi8lfaGgKxUOJnjMq+GdrGjIWRm7w mNm3C8OOGm/zkJ7MvlRi9dRTbDJp0IqatGuYXLdfjUZ7qM4a06VOP8wgj80oK+wkAgz6 NzU7/hSXyXl3MwQTPFP5L+FtSQDkLFe1p3JOHsE3FIYkEOmImCG+hj87XGfHQUIbZZ7v 4F/gZo36LHZoqilfLvuRzLpsWCK6IBIvLtuXmQ1wJKRQqRzWulCeFCFaLJ4dhfX6qt2V gqJg== 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=EiEe4FMkPUmw8KOAEfvvBztEAZRI2MskCgujqdTvggk=; b=p210VD51omg9mCKY6i53wi0ZtJlkhptCbju7rzGfY2++necYNnUSlnQMqfKt9GnsBO bZjtSV6yKt+ISUC/na8fXELiyEk6Sisp0u7XCmnpqPBLsqX4CTX74NzG7wBPHsIHzZxt hxfx/23zyWWuGcUdyu6TR/HCPU5MLXvZEy6Klo/Cn8GPT0JsXJreBWED5IjThwwKXUXr E01x7XsTJWVo329WYav8GW/yOqHvX/5Rp0azcu5CbQqYrIjTRggZRlDN8+KXj7zhmcYu PaQIFarRRnvqLjceQpanIcmpdUe9Hnc4jqdAzOpBHCAIINOVMvmqW0tdX9bh6XHiKumb wsuA== X-Gm-Message-State: AOAM533FbWlV/lm7SnxWMNrT42vY/hLkEZcqWCbCB/obBGWJy5uKanUN nw/ELpMoh9Xg3zh72Q9zoWgflQ/OtKs= X-Google-Smtp-Source: ABdhPJy3IK78m/UUL314CAuc0c/4d+YEcTGEgBQoEk1ZjfVnbGYdBZ0mvjpiRCoUBfrkYL4w/XVBKQ== X-Received: by 2002:a63:5b1a:: with SMTP id p26mr5094722pgb.76.1609947344086; Wed, 06 Jan 2021 07:35:44 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v15sm2937963pfn.217.2021.01.06.07.35.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 07:35:43 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jan 2021 23:35:30 +0800 Message-Id: <1609947331-6849-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> References: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avformat/hlsenc: reindent the code 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/hlsenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index cafe0e8..7f38db7 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -3032,8 +3032,8 @@ static int hls_init(AVFormatContext *s) r = strftime_expand(vs->fmp4_init_filename, &expanded); if (r < 0) { - av_log(s, AV_LOG_ERROR, "Could not get segment filename with strftime\n"); - return r; + av_log(s, AV_LOG_ERROR, "Could not get segment filename with strftime\n"); + return r; } av_free(vs->fmp4_init_filename); vs->fmp4_init_filename = expanded; From patchwork Wed Jan 6 15:35:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 24809 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 96F8944BC83 for ; Wed, 6 Jan 2021 17:43:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7903F68A429; Wed, 6 Jan 2021 17:43:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47C5C68A0FE for ; Wed, 6 Jan 2021 17:43:46 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id c22so2440811pgg.13 for ; Wed, 06 Jan 2021 07:43: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=qUIOfVpICFUAm0pphpqT2bLzrPajKCFbu5lNNu49mrM=; b=Kuuw72iCiPAYigI8SY8r+HqFavHX9RKT6DuUyhxHLR6/2w3rNCmFA6an2aMyA/+agy hMbUeCqEKSpYRZWwpp37Wg0e04FtfQdzbubloUk4ri9SfSzNEIYXTtxvbQk1VZKtAC9G PT3Q6HPaTgo59G3wiTajGSrsSXFiZbT3+NSAwYygMcXTF/bwwTo/7LCod3j5gvKp0Ye0 e+AW5YFfnSBwuvo4QwC2fuS+9N7/exfYYYqJu/+xf4skgrE2SGPTcR24rpVR/560Epmr 33pXmzaKnUo0iIhHpynqHSy+RCfGe13YF5Plx4SsO1WrlX1C5h8jRi4Q1bwdTaaOI6FX lNhg== 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=qUIOfVpICFUAm0pphpqT2bLzrPajKCFbu5lNNu49mrM=; b=IPL45ks08yH6WbZJHkp4ZdOq3X1MnY9KjaNbYB5tbm8wvMWYR1xTrRVd4tk5Jkk3Qn eBrFPLUq4/VmRlUh5VMn3wTQxnWgBv92XpVSYlRPwPublYZ7d7y+aHIHGt8UCRcVjdG1 SVhLHmT7qigGjyKv9b3yHfTbZ8loRvkIelvbOyiRKnKiBPIbl6QIB4JxJitwWVOjeQtJ Az2YyfUtt8sLnLyJ5V04xWXjpmFEhdDHlkXAWeaG4YHd6eum8pqsdV/q1Rmo111Dv/Zx MxZCexld5N+phl83HMFpP39xOnOomUyLH+XKO+hGedVB1z9shW+YHo5GioDs27w0Ekkp 164g== X-Gm-Message-State: AOAM5304/MQyscWGGdnMJBkpbwEfGCCX2poQwiv1yGL/0PvGbGBq75V2 IXe9d5w1MWzN8BV2J1kuzJL8xdw8DXU= X-Google-Smtp-Source: ABdhPJyZGYvnZvW0LMXryMVIMXnwLc9T4vTQ6jvZSvMyPkkKaxRQLaPriU65GfBl2W9VQFcsuKxrHw== X-Received: by 2002:a63:220b:: with SMTP id i11mr5168475pgi.2.1609947345804; Wed, 06 Jan 2021 07:35:45 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v15sm2937963pfn.217.2021.01.06.07.35.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Jan 2021 07:35:45 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Jan 2021 23:35:31 +0800 Message-Id: <1609947331-6849-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> References: <1609947331-6849-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] avformat/hlsenc: use AV_OPT_TYPE_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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- doc/muxers.texi | 4 ++-- libavformat/hlsenc.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 8e12aca..044c16b 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -609,13 +609,13 @@ segmentation. This muxer supports the following options: @table @option -@item hls_init_time @var{seconds} +@item hls_init_time @var{duration} Set the initial target segment length in seconds. Default value is @var{0}. Segment will be cut on the next key frame after this time has passed on the first m3u8 list. After the initial playlist is filled @command{ffmpeg} will cut segments at duration equal to @code{hls_time} -@item hls_time @var{seconds} +@item hls_time @var{duration} Set the target segment length in seconds. Default value is 2. Segment will be cut on the next key frame after this time has passed. diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7f38db7..021a1ea 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -196,8 +196,8 @@ typedef struct HLSContext { int64_t start_sequence; uint32_t start_sequence_source_type; // enum StartSequenceSourceType - float time; // Set by a private option. - float init_time; // Set by a private option. + int64_t time; // Set by a private option. + int64_t init_time; // Set by a private option. int max_nb_segments; // Set by a private option. int hls_delete_threshold; // Set by a private option. #if FF_API_HLS_WRAP @@ -2454,9 +2454,9 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) if (vs->sequence - vs->nb_entries > hls->start_sequence && hls->init_time > 0) { /* reset end_pts, hls->recording_time at end of the init hls list */ - int64_t init_list_dur = hls->init_time * vs->nb_entries * AV_TIME_BASE; - int64_t after_init_list_dur = (vs->sequence - hls->start_sequence - vs->nb_entries) * (hls->time * AV_TIME_BASE); - hls->recording_time = hls->time * AV_TIME_BASE; + int64_t init_list_dur = hls->init_time * vs->nb_entries; + int64_t after_init_list_dur = (vs->sequence - hls->start_sequence - vs->nb_entries) * hls->time; + hls->recording_time = hls->time; end_pts = init_list_dur + after_init_list_dur ; } @@ -2941,7 +2941,7 @@ static int hls_init(AVFormatContext *s) av_log(hls, AV_LOG_DEBUG, "start_number evaluated to %"PRId64"\n", hls->start_sequence); } - hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE; + hls->recording_time = hls->init_time ? hls->init_time : hls->time; if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) { // Independent segments cannot be guaranteed when splitting by time @@ -3094,7 +3094,7 @@ static int hls_init(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "append_list mode does not support hls_init_time," " hls_init_time value will have no effect\n"); hls->init_time = 0; - hls->recording_time = hls->time * AV_TIME_BASE; + hls->recording_time = hls->time; } } @@ -3110,8 +3110,8 @@ static int hls_init(AVFormatContext *s) #define E AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { {"start_number", "set first number in the sequence", OFFSET(start_sequence),AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, E}, - {"hls_time", "set segment length in seconds", OFFSET(time), AV_OPT_TYPE_FLOAT, {.dbl = 2}, 0, FLT_MAX, E}, - {"hls_init_time", "set segment length in seconds at init list", OFFSET(init_time), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0, FLT_MAX, E}, + {"hls_time", "set segment length in seconds", OFFSET(time), AV_OPT_TYPE_DURATION, {.i64 = 2000000}, 0, INT64_MAX, E}, + {"hls_init_time", "set segment length in seconds at init list", OFFSET(init_time), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, INT64_MAX, E}, {"hls_list_size", "set maximum number of playlist entries", OFFSET(max_nb_segments), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E}, {"hls_delete_threshold", "set number of unreferenced segments to keep before deleting", OFFSET(hls_delete_threshold), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, E}, {"hls_ts_options","set hls mpegts list of options for the container format used for hls", OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E},