From patchwork Tue May 26 16:57:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19877 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 8372F44942B for ; Tue, 26 May 2020 19:57:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62780688187; Tue, 26 May 2020 19:57:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F6EF6805AA for ; Tue, 26 May 2020 19:57:42 +0300 (EEST) Received: by mail-pf1-f172.google.com with SMTP id x13so10400564pfn.11 for ; Tue, 26 May 2020 09:57:42 -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=ME7IUSqnmAr7j/HFXVy4q34QZtYUQxCBJ0sxZwClQbg=; b=s+xyzzJlfcSfDS+XiJish5jSnf/MxGkxpPbwEywFRTEgSOyD5lXkeJWpcfwYKXhHNl zr6zWvqG0DrF5ZASEDOjDM29pSlPkFRwHt/hK9GP9468wD7gLpEH9bZY3cOT5oRu8WCv FINUsmKsZGOkV3UTA7/fd5LKRYBrsRmRxxLU3v++0iG3JdvG78ohAAgPwvofTmLCPV1D PcbAzK5Cv9SJI480OafM7a8mhNVo3GP0rciQKCLKSHrSuUknTPuOmgHQ0FYhePDubLdV QHUJ/a3RZw/eyP7Bvn9FxBUnqfrkRs6T10hS/qpkmbHneCTTQu9m5D3gamizkQakGQTQ 7baw== 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=ME7IUSqnmAr7j/HFXVy4q34QZtYUQxCBJ0sxZwClQbg=; b=bMzUuZN54miPCuDMk0kxlTOzMZfhEbwPp7TLaY2ZNNXRscp5LLBJ5ua+JjeT235eN8 vz6xpHewrS3HxDFWETmTGI8/ENc/z9d8cxqlWNT25obmI8mTmH85QdBhHEnxSaCtYelM H3fMvHtOYfFM8pgFKUzLNzIYhjV+W/7rsDFzq10t/k1KndA97kyFfRtCl78D3m+ApWy/ Ep3P4YwvQkpJiIi/A1yzLTc5a6pZgIQOhGwVXXAbr+z7uZRX4c+X58yOr/VCxkZ6cKYP AhoXkg5NWMxUk3F5Wu0xPVNYL0NUTaiGYEq0ElABUmLhIY1qHWsRJiLTzy8nbb9iPGAH gP5Q== X-Gm-Message-State: AOAM5308bJ7oTmENXhIEp8C7J3WbyDhJYtH5Gnckv3UNR+1TilDVWwXv LSvkal9VvGuKth3mfi1hvsW/QbLP X-Google-Smtp-Source: ABdhPJzX+jB0zji4uS5SL0B8/K2mWbyZSiSzOIDDUQZ1tBQ7vSrgFMvDDWNKuvEQFM2j/NjC7PjUWw== X-Received: by 2002:a62:84c6:: with SMTP id k189mr22563828pfd.215.1590512260201; Tue, 26 May 2020 09:57:40 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h21sm57159pjz.6.2020.05.26.09.57.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 09:57:39 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 00:57:07 +0800 Message-Id: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH v2 1/4] lavc/aac_ac3_parser: improve the raw AAC file bit rate calculation 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 Now we just use one ADTS raw frame to calculate the bit rate, it's lead to a larger error when get the duration from bit rate, the improvement cumulate Nth ADTS frames to get the average bit rate. e,g used the command get the duration like: ffprobe -show_entries format=duration -i fate-suite/aac/foo.aac before this improvement dump the duration=2.173935 after this improvement dump the duration=1.979267 in fact, the real duration can be get by command like: ffmpeg -i fate-suite/aac/foo.aac -f null /dev/null with time=00:00:01.97 Also update the fate-adtstoasc_ticket3715. Signed-off-by: Jun Zhao --- libavcodec/aac_ac3_parser.c | 9 +++++++-- libavcodec/aac_ac3_parser.h | 2 ++ tests/ref/fate/adtstoasc_ticket3715 | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 54e4598..0746798 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -97,8 +97,13 @@ get_next: avctx->audio_service_type = s->service_type; } - if (avctx->codec_id != AV_CODEC_ID_EAC3) - avctx->bit_rate = s->bit_rate; + /* Calculate the average bit rate */ + s->frame_number++; + if (avctx->codec_id != AV_CODEC_ID_EAC3) { + avctx->bit_rate = + (s->last_bit_rate * (s->frame_number -1) + s->bit_rate)/s->frame_number; + s->last_bit_rate = avctx->bit_rate; + } } return i; diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h index c2506a5..b04041f 100644 --- a/libavcodec/aac_ac3_parser.h +++ b/libavcodec/aac_ac3_parser.h @@ -55,6 +55,8 @@ typedef struct AACAC3ParseContext { uint64_t state; int need_next_header; + int frame_number; + int last_bit_rate; enum AVCodecID codec_id; } AACAC3ParseContext; diff --git a/tests/ref/fate/adtstoasc_ticket3715 b/tests/ref/fate/adtstoasc_ticket3715 index 49fa3eb..3b473ee 100644 --- a/tests/ref/fate/adtstoasc_ticket3715 +++ b/tests/ref/fate/adtstoasc_ticket3715 @@ -1,4 +1,4 @@ -4110be924e21846d0e174fac679b062e *tests/data/fate/adtstoasc_ticket3715.mov +3e63cbb6bb6ec756d79fab2632fef305 *tests/data/fate/adtstoasc_ticket3715.mov 33324 tests/data/fate/adtstoasc_ticket3715.mov #extradata 0: 2, 0x00340022 #tb 0: 1/44100 From patchwork Tue May 26 16:57:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19878 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 A584B44942B for ; Tue, 26 May 2020 19:57:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86B316882F5; Tue, 26 May 2020 19:57:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D6906891E2 for ; Tue, 26 May 2020 19:57:45 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id nu7so45092pjb.0 for ; Tue, 26 May 2020 09:57:45 -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=id554d/zQhO21WXREaeZy7dcdAU/mC8SVZLkKZ7WLjw=; b=Uq42fuoU66MA97Rs0gxn+H9IChF9JDB0sARcfiaCGdDAWu9KbUnUwfCnCGpb9/1wo5 y51jItnFdjZWY0bb9W4+Ro4rQhCCTJTPsTJ4+5TcQESTqeP22ikBBoxbovCcH5qmAj8t 9sNI4ckS/X0wixTGFRm2sUhL+b807Bfw96z2bFzzNMx714qYaNnp1V4cRF2N1CprWwW5 SbOPIvzBBd/zO4Fg6QSLaHe7j1ZtxVia+4MIQSL7PD19tI/0u08pws4QZfQQxBRHnffD qT0GxCBcTnGjlomNdq0RJXkHMl7zEduuTBbwNY/hfHxeQEh5G8T+f/upWDDOF8fq31b6 ibfA== 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=id554d/zQhO21WXREaeZy7dcdAU/mC8SVZLkKZ7WLjw=; b=QHuhMSIHAu7IswsRv6iNvvUFsFOt1YXprQzv/2yRigPz78lh6wVcoy+ZZkI1vXe95k 4PpDfomeuaZ51PEB04xndfGEe2nuywYE6Vt+noRtrBuCP2Qjh2cDVBC+q+Uw8OpYi1zi VIKqToctznrI8lHP8wQHGmTjcKJEu1TTOKSK0THmHIjN4oTrRXtBUUFo6AWHnCXhwKcn LcCStAMKNqz5ghXgRVL0MDjpEQ8DL0SkiuiURHGBZbxfuV1uS/O0lNKUHpdiO7pr1jQE AKKpWXSq2MDRiQ4eRGZ7FJMjOzUfeb8Wfr6EgRTrgNYuKrN92OEMDURvwQ9Xo+ymwLYy RSSw== X-Gm-Message-State: AOAM530alyiqYJZ3xGo3HnrYAzfttzqoR/IghAmTE97YuIO7IBNWImMM HIW/RgD/wnL/VOUfuHvg2N4VUpCh X-Google-Smtp-Source: ABdhPJyY33Fl3R2NqM5QZrUr8/ceGljcukIMViQtP80nsyVHPh5LxCe52HlQ3FbszVdU/bQEfiqSGA== X-Received: by 2002:a17:902:ee12:: with SMTP id z18mr2057052plb.62.1590512263123; Tue, 26 May 2020 09:57:43 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h21sm57159pjz.6.2020.05.26.09.57.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 09:57:42 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 00:57:08 +0800 Message-Id: <1590512230-26007-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> References: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/4] lavf/utils: fix start_time/duration dump if it is AV_NOPTS_VALUE 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 e,g: the command: ffprobe -show_format -i fate-suite/aac/foo.aac -loglevel 99 will dump the trace message as follow when start_time is AV_NOPTS_VALUE [aac @ 0x55bf8e1f3dc0] stream 0: start_time: -326791809695.818 duration: 2.174 [aac @ 0x55bf8e1f3dc0] format: start_time: -9223372036854.775 duration: 2.174 bitrate=120 kb/s after this fix, will dump the start_time with "NOPTS". Signed-off-by: Jun Zhao --- libavformat/utils.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 2fe58eb..3f38218 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2984,16 +2984,16 @@ static void estimate_timings(AVFormatContext *ic, int64_t old_offset) for (i = 0; i < ic->nb_streams; i++) { st = ic->streams[i]; if (st->time_base.den) - av_log(ic, AV_LOG_TRACE, "stream %d: start_time: %0.3f duration: %0.3f\n", i, - (double) st->start_time * av_q2d(st->time_base), - (double) st->duration * av_q2d(st->time_base)); + av_log(ic, AV_LOG_TRACE, "stream %d: start_time: %s duration: %s\n", i, + av_ts2timestr(st->start_time, &st->time_base), + av_ts2timestr(st->duration, &st->time_base)); } av_log(ic, AV_LOG_TRACE, - "format: start_time: %0.3f duration: %0.3f (estimate from %s) bitrate=%"PRId64" kb/s\n", - (double) ic->start_time / AV_TIME_BASE, - (double) ic->duration / AV_TIME_BASE, - duration_estimate_name(ic->duration_estimation_method), - (int64_t)ic->bit_rate / 1000); + "format: start_time: %s duration: %s (estimate from %s) bitrate=%"PRId64" kb/s\n", + av_ts2timestr(ic->start_time, &AV_TIME_BASE_Q), + av_ts2timestr(ic->duration, &AV_TIME_BASE_Q), + duration_estimate_name(ic->duration_estimation_method), + (int64_t)ic->bit_rate / 1000); } } From patchwork Tue May 26 16:57:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19879 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 9AD0444942B for ; Tue, 26 May 2020 19:57:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87B326899D2; Tue, 26 May 2020 19:57:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 85C716882D8 for ; Tue, 26 May 2020 19:57:48 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id a13so8919181pls.8 for ; Tue, 26 May 2020 09:57: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=Sm71EIz0ui80dUsJvDx5nb9uitCvVJlZQb7uAMXQhDg=; b=D3MclCzZMXZm/oOvYm6fRCGxzZJOUKYRxB9nrG05kIKxMc3DQBqDMUdjrBh5IYKRXf S+JJ5pxF8DaFBMNou5r8h7hCTzAi4hyLQFFNk7uftE84KvJr96MN8WGRdg3/4FYHR8l5 FfrLBBE+vUCjjhmH2gEdRHluIoiSmTgoga6goEeV5X7+ENxgSSOjI+WMD+RoxFNBFjid J38FKNun5cnrjqRYKsT9mqmFH97j5q96IheKp/URc231Bftv2f0QRR7fgwnIQMqbNLOn UGrxeDhbJ95HdCz5Sjr2JvuTRTZLjCKnrR1lQCIu3I4yGkoc0S7me++e/LvJQHrtChjz vDcg== 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=Sm71EIz0ui80dUsJvDx5nb9uitCvVJlZQb7uAMXQhDg=; b=k/V4bxwV1Liep3HrS/IfGHwJSszEHfGPgNj6lL07KTUfyOtMuQ9kh0LsYq5Q1IONoo s/ENvritBzbbZztwnP44l0hSq7bQvZqRtV2sFFDZvKMdVF8LR+Yumlte6bphinnjWTao ex3uGwtbm9wLVCUx0KgKVrW6zEMmPXEKD8l75d/bgB+M9qoXwfiKGhOk3DUrX9N/CEXI lPTjNMU/hSnojMDRYeiJK1s1djHjTg2JXSV8P9/Cemyviwtrvgj5nlJymMNtAl82b1xT DLnTTOfrsLytrHS69qx5al4gvrDXYNzjr6skGglMRX2QCg+vedPtwMTTNKioa7IYjIUu T1Rw== X-Gm-Message-State: AOAM531XXn9OZEVs4VcR0QWfIqvbfZ5gyDk/gs+Q/9uGYrDDV2Z7jWIl tTcG9dHT45PLF//RyIRvh4LqKt+y X-Google-Smtp-Source: ABdhPJzlqdsap6hasc3hP5xil68dwv6ClM2N+0cXN8K3Se2iTnEXku8/AaKC+wWvfc2cDmgqNeg2Xw== X-Received: by 2002:a17:902:6b07:: with SMTP id o7mr1897526plk.74.1590512266128; Tue, 26 May 2020 09:57:46 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h21sm57159pjz.6.2020.05.26.09.57.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 09:57:45 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 00:57:09 +0800 Message-Id: <1590512230-26007-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> References: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] lavc/libx264: 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 commit 4ed3a01d717 missed coding style fix. Signed-off-by: Jun Zhao --- libavcodec/libx264.c | 76 ++++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 4121b28..7579adc 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -195,51 +195,51 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame) AVFrameSideData *side_data; - if (x4->avcintra_class < 0) { - if (x4->params.b_interlaced && x4->params.b_tff != frame->top_field_first) { + if (x4->avcintra_class < 0) { + if (x4->params.b_interlaced && x4->params.b_tff != frame->top_field_first) { - x4->params.b_tff = frame->top_field_first; - x264_encoder_reconfig(x4->enc, &x4->params); - } - if (x4->params.vui.i_sar_height*ctx->sample_aspect_ratio.num != ctx->sample_aspect_ratio.den * x4->params.vui.i_sar_width) { - x4->params.vui.i_sar_height = ctx->sample_aspect_ratio.den; - x4->params.vui.i_sar_width = ctx->sample_aspect_ratio.num; - x264_encoder_reconfig(x4->enc, &x4->params); - } + x4->params.b_tff = frame->top_field_first; + x264_encoder_reconfig(x4->enc, &x4->params); + } + if (x4->params.vui.i_sar_height*ctx->sample_aspect_ratio.num != ctx->sample_aspect_ratio.den * x4->params.vui.i_sar_width) { + x4->params.vui.i_sar_height = ctx->sample_aspect_ratio.den; + x4->params.vui.i_sar_width = ctx->sample_aspect_ratio.num; + x264_encoder_reconfig(x4->enc, &x4->params); + } - if (x4->params.rc.i_vbv_buffer_size != ctx->rc_buffer_size / 1000 || - x4->params.rc.i_vbv_max_bitrate != ctx->rc_max_rate / 1000) { - x4->params.rc.i_vbv_buffer_size = ctx->rc_buffer_size / 1000; - x4->params.rc.i_vbv_max_bitrate = ctx->rc_max_rate / 1000; - x264_encoder_reconfig(x4->enc, &x4->params); - } + if (x4->params.rc.i_vbv_buffer_size != ctx->rc_buffer_size / 1000 || + x4->params.rc.i_vbv_max_bitrate != ctx->rc_max_rate / 1000) { + x4->params.rc.i_vbv_buffer_size = ctx->rc_buffer_size / 1000; + x4->params.rc.i_vbv_max_bitrate = ctx->rc_max_rate / 1000; + x264_encoder_reconfig(x4->enc, &x4->params); + } - if (x4->params.rc.i_rc_method == X264_RC_ABR && - x4->params.rc.i_bitrate != ctx->bit_rate / 1000) { - x4->params.rc.i_bitrate = ctx->bit_rate / 1000; - x264_encoder_reconfig(x4->enc, &x4->params); - } + if (x4->params.rc.i_rc_method == X264_RC_ABR && + x4->params.rc.i_bitrate != ctx->bit_rate / 1000) { + x4->params.rc.i_bitrate = ctx->bit_rate / 1000; + x264_encoder_reconfig(x4->enc, &x4->params); + } - if (x4->crf >= 0 && - x4->params.rc.i_rc_method == X264_RC_CRF && - x4->params.rc.f_rf_constant != x4->crf) { - x4->params.rc.f_rf_constant = x4->crf; - x264_encoder_reconfig(x4->enc, &x4->params); - } + if (x4->crf >= 0 && + x4->params.rc.i_rc_method == X264_RC_CRF && + x4->params.rc.f_rf_constant != x4->crf) { + x4->params.rc.f_rf_constant = x4->crf; + x264_encoder_reconfig(x4->enc, &x4->params); + } - if (x4->params.rc.i_rc_method == X264_RC_CQP && - x4->cqp >= 0 && - x4->params.rc.i_qp_constant != x4->cqp) { - x4->params.rc.i_qp_constant = x4->cqp; - x264_encoder_reconfig(x4->enc, &x4->params); - } + if (x4->params.rc.i_rc_method == X264_RC_CQP && + x4->cqp >= 0 && + x4->params.rc.i_qp_constant != x4->cqp) { + x4->params.rc.i_qp_constant = x4->cqp; + x264_encoder_reconfig(x4->enc, &x4->params); + } - if (x4->crf_max >= 0 && - x4->params.rc.f_rf_constant_max != x4->crf_max) { - x4->params.rc.f_rf_constant_max = x4->crf_max; - x264_encoder_reconfig(x4->enc, &x4->params); + if (x4->crf_max >= 0 && + x4->params.rc.f_rf_constant_max != x4->crf_max) { + x4->params.rc.f_rf_constant_max = x4->crf_max; + x264_encoder_reconfig(x4->enc, &x4->params); + } } - } side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_STEREO3D); if (side_data) { From patchwork Tue May 26 16:57: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: 19880 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 A21F844A094 for ; Tue, 26 May 2020 20:23:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8518B688341; Tue, 26 May 2020 20:23:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF6CA680AE5 for ; Tue, 26 May 2020 20:23:09 +0300 (EEST) Received: by mail-io1-f65.google.com with SMTP id o5so22873177iow.8 for ; Tue, 26 May 2020 10:23:09 -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=q4XOD705AecPTtr5mW/l5WZY6pTHAM8ZqN43osbped8=; b=qNu3pREhGLxtq0TjBLOA5cvQ3qvLoiQs8Hae21sm5GBxyU0l7RnW7KfkAStc/V59go pcBhxCuXc83QvhogeDmCXk0Z83uVmCsGmeH5aXSzF/diFrqFyjinPn8pRHnOf56/UwHN W0tI2jT2MemF+MLojH1IroCO/fLeuKjEDIi8LMePf3ZlXyLOpFqkXNBSUQgQM8oSGbs4 yXP9SM/ntiXEqIMMEbiGjKWE7pmLRFCF88pyR6ezlW3zljfUGpG1naLjT6uJAuh+P+BU dktJz8a+vaUBRdiKTsqj56ThgKwJcsF48XFBBOzUaR86lVBY2dYpBdpigsCPlk9PHCgF kR2w== 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=q4XOD705AecPTtr5mW/l5WZY6pTHAM8ZqN43osbped8=; b=jM++iK319OqnAA2tFIbfu+A8KmRR2cExZNcNZ4X0YxqdRGemQs5zNDMHfEkTm4JQY8 utrzxz9Vov4MarX+t8C+d3bn00ly9EBiC1p9ZCPR88c2N7BCoQ34NQfRx8dBpjjc/gJ+ Me81gqsNxKDHUZlfn3ntkGZNCIbP7qlhxnSBw1/3spWbq8u3zpSnwBgFqpL9I65mF10o wFD8iirrxF/iHXmB0V+hobfu3kKLPGfU9RnxaYdfvwlhJW4Efs+p3hCYpSPCjuQizWOu 3CjtCLiLTxdstoMcOllWgcJQsWcTopRkj6iR+lbiwB5hYIl726fu7YffGlRKuFokoHW6 NTUg== X-Gm-Message-State: AOAM530lnPvLezVznjHaDEKieWeb5DjEgK6NKRlHZpgoY15B7eYYhDgP lzFoUa6nbr+xjwqJeChnp/ynsjze X-Google-Smtp-Source: ABdhPJyIfPrGa40jx3OBhPBK/HtRZmwn3pwwi0iNPNfEiMpSow59hHPRkydV0N7R6QCmjC7AnXPm9A== X-Received: by 2002:a63:9258:: with SMTP id s24mr1965398pgn.362.1590512269108; Tue, 26 May 2020 09:57:49 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id h21sm57159pjz.6.2020.05.26.09.57.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2020 09:57:48 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 May 2020 00:57:10 +0800 Message-Id: <1590512230-26007-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> References: <1590512230-26007-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 4/4] lavf/mpegtsenc: 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 commit 32aeba12755 missed coding style fix. Signed-off-by: Jun Zhao --- libavformat/mpegtsenc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index bf1a7ee..de9819b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1432,10 +1432,10 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, if (ts->m2ts_mode && st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && st->codecpar->codec_id == AV_CODEC_ID_AC3) { - /* set PES_extension_flag */ - pes_extension = 1; - flags |= 0x01; - header_len += 3; + /* set PES_extension_flag */ + pes_extension = 1; + flags |= 0x01; + header_len += 3; } if (is_dvb_teletext) { pes_header_stuffing_bytes = 0x24 - header_len; @@ -1478,14 +1478,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, *q++ = 0x00 | 0x60; } /* For Blu-ray AC3 Audio Setting extended flags */ - if (ts->m2ts_mode && - pes_extension && - st->codecpar->codec_id == AV_CODEC_ID_AC3) { - flags = 0x01; /* set PES_extension_flag_2 */ - *q++ = flags; - *q++ = 0x80 | 0x01; /* marker bit + extension length */ - *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */ - } + if (ts->m2ts_mode && + pes_extension && + st->codecpar->codec_id == AV_CODEC_ID_AC3) { + flags = 0x01; /* set PES_extension_flag_2 */ + *q++ = flags; + *q++ = 0x80 | 0x01; /* marker bit + extension length */ + *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */ + } if (is_dvb_subtitle) {