From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 16EE7461A3 for ; Sat, 8 Jul 2023 19:37:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1632268C531; Sat, 8 Jul 2023 22:37:22 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2040.outbound.protection.outlook.com [40.92.75.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DC2D68C2BC for ; Sat, 8 Jul 2023 22:37:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bpBGYWYpm8aGIWGkZ9AUpuH1xtV6QEdhADOrC2TVy/WulTn+LDeI4cwrcQFllmRLhbFqOfBaXykAFp62YsUj/pVzAM6v7RJXO1vLbn8Zr6Dr8/BYqwzTZ4JH3drEFj7M44ehFzueNONcn2cJeKG56WHsL+VfL+22rYHfaGC0BYpPio2d4j6LGIeSx2B+UEG1YkqaF9h05WYK1yZUi02huVd79QLx7rJsSrV2F194H8k4Lex3qiX6WcH3ofOZ1k0LQ6pKiqb1Jbxm5nckvQQBQNvcINaF5rGcGkJUoNndoTvgWV5Pwu8npEPy/flqBCK1cThKgKw62h+RHIKpCeUGWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=I9AvUj7xLmzUocsYS12j6WTJ3OQpzAXJQd7SM502EFQ=; b=B2dmhXc8/KpoPoEp7f795ee95HrSE8ioWLLN8OJyDICVviQw5izfaRP0BZfmvmASNVXK2eIMi0klW+fB0g+/CYm0frDWQ6oY4vmkJTEIYyne5S7ku42G/g8MBHu4aRVZ9khGRe0A/2ppzy0xcZX1c+0HClAsejLjAkporZ49wvc954HePPIz8+gk4uQKBKULhkecSAOuhq2ez3/6ksYbOZw11SGSyviw4zk82YiUKstASqZGbheHiYxsFkkNUY1sc+hAXdMZA/RN0/DCVtVj1J8IFsA7EuJCk1xJOrMFQ1j041wTu8HGDiTXwS4UW+v3W8XD5roVol5kunEeu1luJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I9AvUj7xLmzUocsYS12j6WTJ3OQpzAXJQd7SM502EFQ=; b=N2/nqcTRJYwu+64RTFGYkjZAW0TfjjeT+6e8MxgppnE/AGldgqjP4LMJibld4tTh/8UfD7EjP6+XlO8vgr8k+bt0PDqRy/yv6il8kRyviwLIpzzJs6pYjHwcMHviV05djDnA5tcewigIPcjw0W48G7ZpYM0LtUxl9o2iOW1H4TSDS0WJKakmQ53ywxVp82Emiwej+elO4mj5TzA2or+UXm9h3w7xXtCGCFlrKuMMqDHpevC1g+9HbEz0VjPKSV++qs4uNWk4DcZhAYxSB8MO/OAhKJ76IriZCP3qLEXJdjvdoIBcfvUSYIJBl2oxGLkeBtfrYk+mkrfcvWmVvZikdg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0297.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6565.26; Sat, 8 Jul 2023 19:37:13 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::8f13:2ef8:4559:907%6]) with mapi id 15.20.6565.026; Sat, 8 Jul 2023 19:37:13 +0000 Message-ID: Date: Sat, 8 Jul 2023 21:38:22 +0200 To: ffmpeg-devel@ffmpeg.org References: <20230708190038.24324-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20230708190038.24324-1-jamrial@gmail.com> X-TMN: [pZxfb7G6rtr/ibLDBgnVMA5tHj1Qhglw] X-ClientProxiedBy: ZR2P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <29438e68-5ffe-5237-a3c9-714fdd072742@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0297:EE_ X-MS-Office365-Filtering-Correlation-Id: 557e3019-cbec-49a4-a9dc-08db7feaba84 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eyE4znQjmv6L/pXcDPN4aidxW0qkaJ06DI+c+TnH4jCoh2Y42lFnc/efP1di66FSrjW6GJoyPosqyFI4U0gNz4B08XZ4gFLXHLv5whqvfOdm2uEAoZlhdHuC8V+skQO8SftevNUax4Vz04AEp5eLX9QEYzoW4vqguLBP1T0OIzGcUe/wwnlVpkFVUEFPxQ/Ou5NChDS0iOKjKrf51TIisA1tN82ldWSsSPNj3YPkaKBX6KQ9w/OAWcyAQrVfCizxXV7cF9AbL//wAXgVmfmvx5XwBZf7PrHOWQ0mS8tKySTBSQDkYXKx0H+nEGq8YwlJVkK8qayYK4FDQekRH99cCC5m8qeaTdZYaCbwpCnWCJUFznXRpwwp5hq0giZeLh9Km/0yZShfhMntneSWiPenhKnICb/vO/aM3JyY+dkm4HgzOqLzVbSLQOsojGxaxq5dikU/jOKaQy+AUh0F0hU3MCB/XGhOgLIR8Ih5huxQAeOeiUyzGmDB8nx52UNhe0KVq32ubai9g4g//a4+SKyrVA1+uHqDaSynNXTrCSkk6XbckxuvZzfzuZ/KEe/3TlXY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TjMzWkVEMVFMdWRjVTJ3cm1pbUlyKy9zbWcrSGNVM2IyN1k2WkdTM3RsallL?= =?utf-8?B?S2pQMVFPNDRJU0NtUGNKb0dQbklHZjd4N0E1UVlFY2lEdTZWQXVGRjAwZTJn?= =?utf-8?B?MjRoMmtxWnZLNGc0K3I2WkoyaDNPUW9WQURDQ2pZL1lEU2JScXNFQys3d05N?= =?utf-8?B?QkV3YVM5Wnl2MFVmNmQvZFZhL0EyOTBuK09adUlSL3BnR3FsQWE3YkYrT0NT?= =?utf-8?B?cXVHWlU0dDIyNkgrWHZxL1lDT3Z2bDVzQWl4SUhnck1YV1pxOGVVZCtCalZv?= =?utf-8?B?dE9yeDA0VkMvNFN1ZXBKeG0xT2w4VXF3N291ektUT1ZKOG9Hb1VNTkhraGhH?= =?utf-8?B?a1M3OXYvVFAzUUVZMUM2V2FOclhvZ053TTFQU3R0dGo5VGJXVVNtUmU5cEh1?= =?utf-8?B?NDdxRjlERFQ1WDMzcmpSSGFmUmxNTldrMEVObnBPMERqSHFYM0wvcDVrWnFo?= =?utf-8?B?cFRTcHpFNlZHKzVubVBLRFJzR0RWemkremIwRUdCRDVKQnlGMjVGcGJGNy8x?= =?utf-8?B?NUE3S3pVOXI5VDIyKzhTKzh6Szd3QkRRQ2ZsQVFINS8zUDRmNDV6dG9PcTFj?= =?utf-8?B?bXM3UjJmSG9yMUJrZFVjakRLMVRWODVEZnRZR05ZeURRTnEwbkh3SXlrTjhT?= =?utf-8?B?N0h0QXc2T0w0ZDgvT05Gb3NTc3crZVp4SkUvMFBwcy9ocjdFTDkxeXpYcjVm?= =?utf-8?B?bVM1VTNrOWZyQXM2UGtJOENtaWxzK0lxeTEySXlFMHJrem1MVUZiWTBmWjNQ?= =?utf-8?B?VlBUOWJwMUxveUZLMkNRRmhtYXpyaHMwcW0zL2xqTE5nQlpMeVBZQzRENThG?= =?utf-8?B?Qzdlb3FNbFQrN1NFSmFYMjRpSGxSTExTSlIraGlLNUpaWVRGRGN1QXU0S20x?= =?utf-8?B?aXgzWFN3MkdiRFE2R1piQWdsYmZZRnZ1S2VweEtJYytzc2ViMGNFUFRqTkdP?= =?utf-8?B?U1FpWFh3UlRHV1pGcmYzSkllWEN5Q2xXM3d6M0xENDJteVB3SVB1S0gyQXRW?= =?utf-8?B?M05VTzlhOHBxMnFZRnE2aTdhSTU5ei91WEZDcEtxNXVwem5NYnoxajNyRTAy?= =?utf-8?B?YzJJOGxNSDBiK05mSFpIdkVqNTBYV01yem1rUnJ5aURIU3Q5d2xyWjg0VC9j?= =?utf-8?B?VEppcEJ2ZnJNRjVLUGc4clFocExxQ2x0Slppb2lVUUFBTy96Yk9ONFpXT2ZG?= =?utf-8?B?WUJNSWNJZms3S3dJTnRmL08rK0xBZEVBdkd4ODZGZTAya0RjL3RaMVJ4bTFX?= =?utf-8?B?cDgvWXk4cHFJeTNPMzRNZlRRZUw0bnhiNkU2VkpBUFRnTWZvN3ZMVnlsQzE2?= =?utf-8?B?dFJqRGYxcWdGSlBFVjFoWDBUVWFqb1pseFlRU2E3Smt3UVZ0SDltMVc0Zmp5?= =?utf-8?B?Z21WcDY2bEtnTnp2VnJ2Y1RoTXFtamp2N2JTVGUvV015M3BHMXR3NytRM3dm?= =?utf-8?B?dmFmRGViVC84S0VRdkpEQTVkaE80STdZTzA5OXM3SUdXSEh6d2dWM2dGa3J3?= =?utf-8?B?bVJsQ0VRa3ViKzhuTXFTRHV3dUd5VU5BOEVjUkNZNWpWbjUvS1VJVkFzeStj?= =?utf-8?B?TEpaajl5aUVvOHh1bTkvUkE3OUczbCtScVZKQ3JjbmR2Z0tRVndXTms0dUFr?= =?utf-8?B?bGtDWkJRUlA0Kyt1Tjlkc3lXbWtIMEM5VjlaTHIrUnNRU0VPZVZMSGZ4UDI0?= =?utf-8?Q?lGxY7K9fN6LKNo2w1amr?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 557e3019-cbec-49a4-a9dc-08db7feaba84 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2023 19:37:13.4616 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0297 Subject: Re: [FFmpeg-devel] [PATCH 1/3] avcodec/decode: move processing discard samples to its own function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: James Almer: > Signed-off-by: James Almer > --- > libavcodec/decode.c | 182 +++++++++++++++++++++++--------------------- > 1 file changed, 94 insertions(+), 88 deletions(-) > > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index 269633ce10..793ab975f6 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -289,69 +289,14 @@ static int64_t guess_correct_pts(AVCodecContext *ctx, > return pts; > } > > -/* > - * The core of the receive_frame_wrapper for the decoders implementing > - * the simple API. Certain decoders might consume partial packets without > - * returning any output, so this function needs to be called in a loop until it > - * returns EAGAIN. > - **/ > -static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, int64_t *discarded_samples) > +static int discard_samples(AVCodecContext *avctx, AVFrame *frame, int64_t *discarded_samples) > { > - AVCodecInternal *avci = avctx->internal; > - AVPacket *const pkt = avci->in_pkt; > - const FFCodec *const codec = ffcodec(avctx->codec); > - int got_frame, actual_got_frame; > - int ret; > - > - if (!pkt->data && !avci->draining) { > - av_packet_unref(pkt); > - ret = ff_decode_get_packet(avctx, pkt); > - if (ret < 0 && ret != AVERROR_EOF) > - return ret; > - } > - > - // Some codecs (at least wma lossless) will crash when feeding drain packets > - // after EOF was signaled. > - if (avci->draining_done) > - return AVERROR_EOF; > - > - if (!pkt->data && > - !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY || > - avctx->active_thread_type & FF_THREAD_FRAME)) > - return AVERROR_EOF; > - > - got_frame = 0; > - > - if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) { > - ret = ff_thread_decode_frame(avctx, frame, &got_frame, pkt); > - } else { > - ret = codec->cb.decode(avctx, frame, &got_frame, pkt); > - > - if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) > - frame->pkt_dts = pkt->dts; > - if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { > -#if FF_API_FRAME_PKT > -FF_DISABLE_DEPRECATION_WARNINGS > - if(!avctx->has_b_frames) > - frame->pkt_pos = pkt->pos; > -FF_ENABLE_DEPRECATION_WARNINGS > -#endif > - //FIXME these should be under if(!avctx->has_b_frames) > - /* get_buffer is supposed to set frame parameters */ > - if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) { > - if (!frame->sample_aspect_ratio.num) frame->sample_aspect_ratio = avctx->sample_aspect_ratio; > - if (!frame->width) frame->width = avctx->width; > - if (!frame->height) frame->height = avctx->height; > - if (frame->format == AV_PIX_FMT_NONE) frame->format = avctx->pix_fmt; > - } > - } > - } > - emms_c(); > - actual_got_frame = got_frame; > + AVCodecInternal *avci = avctx->internal; > + int ret = 0; > > if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { > if (frame->flags & AV_FRAME_FLAG_DISCARD) > - got_frame = 0; > + ret = AVERROR(EAGAIN); > } else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { > uint8_t *side; > size_t side_size; > @@ -359,16 +304,10 @@ FF_ENABLE_DEPRECATION_WARNINGS > uint8_t skip_reason = 0; > uint8_t discard_reason = 0; > > - if (ret >= 0 && got_frame) { > if (frame->format == AV_SAMPLE_FMT_NONE) > frame->format = avctx->sample_fmt; > - if (!frame->ch_layout.nb_channels) { > - int ret2 = av_channel_layout_copy(&frame->ch_layout, &avctx->ch_layout); > - if (ret2 < 0) { > - ret = ret2; > - got_frame = 0; > - } > - } > + if (!frame->ch_layout.nb_channels) > + ret = av_channel_layout_copy(&frame->ch_layout, &avctx->ch_layout); > #if FF_API_OLD_CHANNEL_LAYOUT > FF_DISABLE_DEPRECATION_WARNINGS > if (!frame->channel_layout) > @@ -380,7 +319,6 @@ FF_ENABLE_DEPRECATION_WARNINGS > #endif > if (!frame->sample_rate) > frame->sample_rate = avctx->sample_rate; > - } > > side= av_packet_get_side_data(avci->last_pkt_props, AV_PKT_DATA_SKIP_SAMPLES, &side_size); > if(side && side_size>=10) { > @@ -393,21 +331,21 @@ FF_ENABLE_DEPRECATION_WARNINGS > discard_reason = AV_RL8(side + 9); > } > > - if ((frame->flags & AV_FRAME_FLAG_DISCARD) && got_frame && > + if ((frame->flags & AV_FRAME_FLAG_DISCARD) && !ret && > !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { > avci->skip_samples = FFMAX(0, avci->skip_samples - frame->nb_samples); > - got_frame = 0; > *discarded_samples += frame->nb_samples; > + ret = AVERROR(EAGAIN); > } > > - if (avci->skip_samples > 0 && got_frame && > + if (avci->skip_samples > 0 && !ret && > !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { > if(frame->nb_samples <= avci->skip_samples){ > - got_frame = 0; > *discarded_samples += frame->nb_samples; > avci->skip_samples -= frame->nb_samples; > av_log(avctx, AV_LOG_DEBUG, "skip whole frame, skip left: %d\n", > avci->skip_samples); > + ret = AVERROR(EAGAIN); > } else { > av_samples_copy(frame->extended_data, frame->extended_data, 0, avci->skip_samples, > frame->nb_samples - avci->skip_samples, avctx->ch_layout.nb_channels, frame->format); > @@ -432,11 +370,11 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > - if (discard_padding > 0 && discard_padding <= frame->nb_samples && got_frame && > + if (discard_padding > 0 && discard_padding <= frame->nb_samples && !ret && > !(avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL)) { > if (discard_padding == frame->nb_samples) { > *discarded_samples += frame->nb_samples; > - got_frame = 0; > + ret = AVERROR(EAGAIN); > } else { > if(avctx->pkt_timebase.num && avctx->sample_rate) { > int64_t diff_ts = av_rescale_q(frame->nb_samples - discard_padding, > @@ -452,7 +390,7 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > - if ((avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL) && got_frame) { > + if ((avctx->flags2 & AV_CODEC_FLAG2_SKIP_MANUAL) && !ret) { > AVFrameSideData *fside = av_frame_new_side_data(frame, AV_FRAME_DATA_SKIP_SAMPLES, 10); > if (fside) { > AV_WL32(fside->data, avci->skip_samples); > @@ -464,15 +402,88 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > - if (!got_frame) > + return ret; > +} > + > +/* > + * The core of the receive_frame_wrapper for the decoders implementing > + * the simple API. Certain decoders might consume partial packets without > + * returning any output, so this function needs to be called in a loop until it > + * returns EAGAIN. > + **/ > +static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, int64_t *discarded_samples) > +{ > + AVCodecInternal *avci = avctx->internal; > + AVPacket *const pkt = avci->in_pkt; > + const FFCodec *const codec = ffcodec(avctx->codec); > + int got_frame; > + int consumed, ret; > + > + if (!pkt->data && !avci->draining) { > + av_packet_unref(pkt); > + ret = ff_decode_get_packet(avctx, pkt); > + if (ret < 0 && ret != AVERROR_EOF) > + return ret; > + } > + > + // Some codecs (at least wma lossless) will crash when feeding drain packets > + // after EOF was signaled. > + if (avci->draining_done) > + return AVERROR_EOF; > + > + if (!pkt->data && > + !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY || > + avctx->active_thread_type & FF_THREAD_FRAME)) > + return AVERROR_EOF; > + > + got_frame = 0; > + > + if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) { > + consumed = ff_thread_decode_frame(avctx, frame, &got_frame, pkt); > + } else { > + consumed = codec->cb.decode(avctx, frame, &got_frame, pkt); > + > + if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) > + frame->pkt_dts = pkt->dts; > + if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { > +#if FF_API_FRAME_PKT > +FF_DISABLE_DEPRECATION_WARNINGS > + if(!avctx->has_b_frames) > + frame->pkt_pos = pkt->pos; > +FF_ENABLE_DEPRECATION_WARNINGS > +#endif > + //FIXME these should be under if(!avctx->has_b_frames) > + /* get_buffer is supposed to set frame parameters */ > + if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) { > + if (!frame->sample_aspect_ratio.num) frame->sample_aspect_ratio = avctx->sample_aspect_ratio; > + if (!frame->width) frame->width = avctx->width; > + if (!frame->height) frame->height = avctx->height; > + if (frame->format == AV_PIX_FMT_NONE) frame->format = avctx->pix_fmt; > + } > + } > + } > + emms_c(); > + > + if (got_frame) > + ret = discard_samples(avctx, frame, discarded_samples); > + else > + ret = AVERROR(EAGAIN); > + > + if (consumed < 0) > + ret = consumed; > + if (consumed >= 0 && avctx->codec->type == AVMEDIA_TYPE_VIDEO) > + consumed = pkt->size; > + > + if (!got_frame || ret == AVERROR(EAGAIN)) > av_frame_unref(frame); > > - if (ret >= 0 && avctx->codec->type == AVMEDIA_TYPE_VIDEO) > - ret = pkt->size; > + if (!ret) > + av_assert0(frame->buf[0]); > + if (ret == AVERROR(EAGAIN)) > + ret = 0; > > - /* do not stop draining when actual_got_frame != 0 or ret < 0 */ > - /* got_frame == 0 but actual_got_frame != 0 when frame is discarded */ > - if (avci->draining && !actual_got_frame) { > + /* do not stop draining when got_frame != 0 or ret < 0 */ > + if (avci->draining && !got_frame) { > if (ret < 0) { > /* prevent infinite loop if a decoder wrongly always return error on draining */ > /* reasonable nb_errors_max = maximum b frames + thread count */ > @@ -490,11 +501,9 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > - if (ret >= pkt->size || ret < 0) { > + if (consumed >= pkt->size || ret < 0) { > av_packet_unref(pkt); > } else { > - int consumed = ret; > - > pkt->data += consumed; > pkt->size -= consumed; > pkt->pts = AV_NOPTS_VALUE; > @@ -509,10 +518,7 @@ FF_ENABLE_DEPRECATION_WARNINGS > } > } > > - if (got_frame) > - av_assert0(frame->buf[0]); > - > - return ret < 0 ? ret : 0; > + return ret; > } > > #if CONFIG_LCMS2 Would using --diff-algorithm=minimal (or patience or histogram) produce a more readable diff (i.e. one where the code that ends up in discard_samples() is moved instead of everything except it)? - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".