From patchwork Fri Sep 25 12:19:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 22578 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 F0D5E448926 for ; Fri, 25 Sep 2020 15:24:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBBC568AF83; Fri, 25 Sep 2020 15:24:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D93668AEEB for ; Fri, 25 Sep 2020 15:24:43 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id s13so2841858wmh.4 for ; Fri, 25 Sep 2020 05:24:43 -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; bh=JHiUbKEqIXpr/14rddvEFTI+LHvtc6cYURjzZqBaegQ=; b=PugTTe+l4Kbj6RGCdfbIpzqHGnCEL4L/M6+QR+BP0iXdGr/M6Zys1X4eHB0zEEhOdw nfpMKgkg4x29sxRLO3QwoEoXXSKpmy9iipBoYiMFRoh978nuySOLnUux671/X+Xy1CAo 9wF+FvLpnKcGZU7pvS2OKe7UMAEjnOyD98VDq0cEj5qh6Hi7F5fHVLDCqpiXD47UGk6X EEA7s6QBiVlUy/C8tqIWDhnCu0+DL4wabhGp2YH6VR0HA8CIl9XjZPp4QcGU6nF0chDa 6Myd2IAxp7nXolQkM75Q3Hmb2tc1yWWCB7oqYPltn6RSsLO/hyMbMTBkRiiazZv5Qf6N Oytg== 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=JHiUbKEqIXpr/14rddvEFTI+LHvtc6cYURjzZqBaegQ=; b=uh5n9/3nJiymfn0reEMwMf2xL1sRx7XR46/BbxlMglw5PKWL9E49aGMAn9rXyqswlv F6wRhO3LXNu+zvNKJ41woGfqNrm0h1R+IcLuXEbSkA4CB3HiRWa/URXsQ47/52UwHUpQ pzRDVIR3i5xHOwtNb2Gu7Pqh/Py2GfigWkZujiCNaolUi/ck8PUQ7B2eKp6zfpx8iV3y t6c/90xHpVbO/EGDqE39O6PWIBm9qO+sHapvL5QEAIUEb0CVouAk9Z+ncquQ7JUEy8ae c2y7WE8Xx+/Y6L4JfTukSPocxwIGbcgHLAvnt/3y5XhDq4p1egK3zh7Lf/2gWi0/1yIz nv+Q== X-Gm-Message-State: AOAM530Pg1anPPR0ruPrxp8Lw0d5dbgo2HSsA7cqcIeP6jnKYE1s8bQY bWHmxsaOqEDAwWQ/6rZvZxgEnDNEFLQ= X-Google-Smtp-Source: ABdhPJwu+gTl1quLvVj4ZyYVMpKAnlOVl2b+mYLdb46ReeLK6XbXcMLWrksGDuJbL4E0gffTnag9xw== X-Received: by 2002:a7b:c84a:: with SMTP id c10mr2845066wml.139.1601036374515; Fri, 25 Sep 2020 05:19:34 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id i3sm2690481wrs.4.2020.09.25.05.19.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 05:19:33 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Sep 2020 20:19:10 +0800 Message-Id: <1601036351-25991-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/2] examples/muxing: misc style fixes 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao misc style fixes. Signed-off-by: Jun Zhao --- doc/examples/muxing.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/doc/examples/muxing.c b/doc/examples/muxing.c index bd16486..42f704c 100644 --- a/doc/examples/muxing.c +++ b/doc/examples/muxing.c @@ -200,7 +200,7 @@ static void add_stream(OutputStream *ost, AVFormatContext *oc, * the motion of the chroma plane does not match the luma plane. */ c->mb_decision = 2; } - break; + break; default: break; @@ -284,25 +284,25 @@ static void open_audio(AVFormatContext *oc, AVCodec *codec, OutputStream *ost, A } /* create resampler context */ - ost->swr_ctx = swr_alloc(); - if (!ost->swr_ctx) { - fprintf(stderr, "Could not allocate resampler context\n"); - exit(1); - } + ost->swr_ctx = swr_alloc(); + if (!ost->swr_ctx) { + fprintf(stderr, "Could not allocate resampler context\n"); + exit(1); + } - /* set options */ - av_opt_set_int (ost->swr_ctx, "in_channel_count", c->channels, 0); - av_opt_set_int (ost->swr_ctx, "in_sample_rate", c->sample_rate, 0); - av_opt_set_sample_fmt(ost->swr_ctx, "in_sample_fmt", AV_SAMPLE_FMT_S16, 0); - av_opt_set_int (ost->swr_ctx, "out_channel_count", c->channels, 0); - av_opt_set_int (ost->swr_ctx, "out_sample_rate", c->sample_rate, 0); - av_opt_set_sample_fmt(ost->swr_ctx, "out_sample_fmt", c->sample_fmt, 0); - - /* initialize the resampling context */ - if ((ret = swr_init(ost->swr_ctx)) < 0) { - fprintf(stderr, "Failed to initialize the resampling context\n"); - exit(1); - } + /* set options */ + av_opt_set_int (ost->swr_ctx, "in_channel_count", c->channels, 0); + av_opt_set_int (ost->swr_ctx, "in_sample_rate", c->sample_rate, 0); + av_opt_set_sample_fmt(ost->swr_ctx, "in_sample_fmt", AV_SAMPLE_FMT_S16, 0); + av_opt_set_int (ost->swr_ctx, "out_channel_count", c->channels, 0); + av_opt_set_int (ost->swr_ctx, "out_sample_rate", c->sample_rate, 0); + av_opt_set_sample_fmt(ost->swr_ctx, "out_sample_fmt", c->sample_fmt, 0); + + /* initialize the resampling context */ + if ((ret = swr_init(ost->swr_ctx)) < 0) { + fprintf(stderr, "Failed to initialize the resampling context\n"); + exit(1); + } } /* Prepare a 16 bit dummy audio frame of 'frame_size' samples and @@ -349,10 +349,10 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost) if (frame) { /* convert samples from native format to destination codec format, using the resampler */ - /* compute destination number of samples */ - dst_nb_samples = av_rescale_rnd(swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples, - c->sample_rate, c->sample_rate, AV_ROUND_UP); - av_assert0(dst_nb_samples == frame->nb_samples); + /* compute destination number of samples */ + dst_nb_samples = av_rescale_rnd(swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples, + c->sample_rate, c->sample_rate, AV_ROUND_UP); + av_assert0(dst_nb_samples == frame->nb_samples); /* when we pass a frame to the encoder, it may keep a reference to it * internally; @@ -519,7 +519,6 @@ static AVFrame *get_video_frame(OutputStream *ost) static int write_video_frame(AVFormatContext *oc, OutputStream *ost) { return write_frame(oc, ost->enc, ost->st, get_video_frame(ost)); - } static void close_stream(AVFormatContext *oc, OutputStream *ost) From patchwork Fri Sep 25 12:19:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 22579 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 00186448F6A for ; Fri, 25 Sep 2020 15:25:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1C5868B567; Fri, 25 Sep 2020 15:25:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7574868B562 for ; Fri, 25 Sep 2020 15:25:48 +0300 (EEST) Received: by mail-ej1-f53.google.com with SMTP id e23so3392181eja.3 for ; Fri, 25 Sep 2020 05:25:48 -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; bh=EScni8lsJEHF2Z+feOOL9jYoYiNq9nhor2BCK/Cge64=; b=B51X3P9QoBGrEYROgAtCm2G+54PmxH0L/ADaPnX911+w/ZIJeaZGdplpxAZoNtiUe4 xVuYwp/ut9DSS4QVeVVC2kUJqGwK8czy6fbBNT1mH6r+E/Vo0bQbjbcfXUeBJbNJlABu +cn7QiY6LSqW0GMA0JqkcZwA1R14YvTOpGlnGV8WAQBpHqPdCof5TeBhQ/UFjXsqwMNA PyYeWnuYvGJhkC0nYckvPbJY/d1bSv/9/REvKMPCcIX08y0WopL4Qx+VvkgjctKftSgQ Wop84kfyYgbAKKRBWK/X8a2h9troMuntenho/qz0QKZnO/5sgwDPfB/zX3IM4k384gRG v1FQ== 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=EScni8lsJEHF2Z+feOOL9jYoYiNq9nhor2BCK/Cge64=; b=bjHKNFqrnXg+jPB7lNX03GsQWRUUlxaN/uFNXGyJEeFVEUWiKVo2pt1qxmJGzdO4pl 0x23Kaba8VAnPCUItRPk0P/jw0A6v/M/RvagJGw9ZQoxZNEsvbItduIxFDulBk50zDG9 D2a5cPeJ6KyFUM/ZNXTzVQ8ZoY8YiG9at+v2FobMiJ3fm9Z1/HnZHJg58RHtsu0d++bc cZTo73fDc3iVXqkLzbo8pKO/Rn2FEeqVTy85AK+kYW2TPhNYjSLRoPlHISi2GOHUedEO hdroVCZQ9emL+PXCsCh2JDhzxoQh4z/luBsdpLxytEqIQ3zy0LdPoltAAy1mJfYfta+C kDYg== X-Gm-Message-State: AOAM530MBMAVAQo2dr0Ukg8mMIeImavOpxQ8XmgQfvStcTeuwcf3u9hi ft/nD527OWR1TaQ1XMvDj5d4ljks7z8= X-Google-Smtp-Source: ABdhPJwaw7CHj+1NtwJAxMh4c6pBM+y4SNhf/jvaoJcxKZ4eWw8/vCgl8RLlbldE9P6sxe1pJrFOjQ== X-Received: by 2002:adf:8b1d:: with SMTP id n29mr4047678wra.383.1601036375002; Fri, 25 Sep 2020 05:19:35 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id i3sm2690481wrs.4.2020.09.25.05.19.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 05:19:34 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Sep 2020 20:19:11 +0800 Message-Id: <1601036351-25991-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1601036351-25991-1-git-send-email-mypopydev@gmail.com> References: <1601036351-25991-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/hls: add AC-3/EAC-3 to allowed extensions file list 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Add AC-3/EAC-3 to allowed extensions file list. From HTTP Live Streaming 2nd Edition draft-pantos-hls-rfc8216bis-07 section 3.1.3.Packed Audio, HLS demuxer need to support MP3/AC-3/EAC-3. Signed-off-by: Jun Zhao --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index f33ff3f..72e28ab 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2371,7 +2371,7 @@ static const AVOption hls_options[] = { OFFSET(live_start_index), AV_OPT_TYPE_INT, {.i64 = -3}, INT_MIN, INT_MAX, FLAGS}, {"allowed_extensions", "List of file extensions that hls is allowed to access", OFFSET(allowed_extensions), AV_OPT_TYPE_STRING, - {.str = "3gp,aac,avi,flac,mkv,m3u8,m4a,m4s,m4v,mpg,mov,mp2,mp3,mp4,mpeg,mpegts,ogg,ogv,oga,ts,vob,wav"}, + {.str = "3gp,aac,avi,ac3,eac3,flac,mkv,m3u8,m4a,m4s,m4v,mpg,mov,mp2,mp3,mp4,mpeg,mpegts,ogg,ogv,oga,ts,vob,wav"}, INT_MIN, INT_MAX, FLAGS}, {"max_reload", "Maximum number of times a insufficient list is attempted to be reloaded", OFFSET(max_reload), AV_OPT_TYPE_INT, {.i64 = 1000}, 0, INT_MAX, FLAGS},