From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id ED4434BFE4 for ; Wed, 5 Nov 2025 12:03:45 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'PRppJSNH9RwJ5NJrZlYBEcjWYFM9FofrGyw/XzQok3g=', expected b'wPr3C16X506Ug7i6z4E7gcwi3gzsUqa+SgeNvLsKYQQ=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762344214; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=PRppJSNH9RwJ5NJrZlYBEcjWYFM9FofrGyw/XzQok3g=; b=vxewugytNguwshj8jDN/lW9nBQvnM+wr5D6hgnZy1bZAqvIADLXmdx6lGsUZP9rhQ2Wos huTIo7K42Po5Un/YTWSWzosbnpmJY3baE1+eJ6jszk1Ehz5eTHA0h9+Y4Ks1yvrIMnXb80q kJ+E3VW1hQ5/o+OatOFVBjPMmXSrBf9dshSOY/cW7t6oqyR+nV2I6bWEPFWodOxPgZIuyHC TgrhAYNuTnnJbLq4hzZ/WdLGmG0ZDNhQGbwo7E9xQB3Tp/+znPSUXfw5JLXkRkLgWZAE03d qpt6CWNcDqG6sFjrYQvaeCXUpPaOHu7Ykx9HpCat3lzwdoSK4nGVirT4P2hg== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id E732068FB88; Wed, 5 Nov 2025 14:03:34 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762344196; b=bfE+Tg5ZxK5+ibmYHqI1ZAwG4YRs1RE2QDi7YXzgbYO2O6uk3rczYlO0xH+CgoxrqU1Y8 kRQd0rfgiwMbiRj078vf2/s3W5YUiVDwj3/L3CvSbV9/XDtviLOmgPLA/ne1GjDAqvE/vYr 20lK1leez4vazp4qFNSwEWJxUTO22lBi3HvGlcQyGRRpRUS3gtzwF1lVBSndfigTrl5L4Zf Qo7Y1Hs4/MUjj81nKQSfxSc57HZUWfe5RHXugo+7BiJ9BoQSDvZfCBGlckxE0IfmFzd8pXi da6eGa11yAFyZPBH3EkxdKXVzuTnjUtZQXE6L6TZod03WpEZeUEsmNlAtggQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762344196; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=DsScD8qvJ4zRgRG8ZMyIdyZACbSv48ld4sQvd/SUWds=; b=txr01qkXkZcfN2Na5oBUO6gxdkuz51ILbaiEY3PBthn7cmtvBqmLyMVn5t+SL6d3IJFo0 wmZbu38ws6/ioph0M8wWaZNV407YMpdQop3+rpJyJhj5JmNYIcjpS5ijllTy7sP33F24GD4 eZmhtWGU3uj4C8kAUxooKkFd/OILBN7H3n2ik40j1QpHBHvmdwfIt1kV7AeG920rD9JIQqh BNwskDYgWGGey6P4C8TtG+6+cdG8OPzv+b9GdlDLBEMS8JGsICnxLUkli+OHWukRZIWvNTy pEUBZTKlTmrf/sMKwATTVsMvneDfnKYQXxDbwu5rbCBNrSBm9snatIOZJq1g== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762344188; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=wPr3C16X506Ug7i6z4E7gcwi3gzsUqa+SgeNvLsKYQQ=; b=uley7BAYLL/A1AfmTu2hmlJ9y1ymN+2M34Y14yapuY24I5sFlRGJhyJ1PlCve0y6hxSV9 IlYc4o9jVimUdMLrQ/qcxRBEBokkkrneanvDDYtCgGHCLgh7aL7eOAifQSczhJwkfkk4iti hTjeH+9/FQ22WLENh7lNBhFTWAsPQH4ug04TmfWokRahjrTZdj2EazsC1f8yxlfKit1SCJQ V4QXIT1f5+BUDb6/QQu2Qb8LL0sFibfxUNsFDb8gfje+nabpARpdALFYVOd2PbO1cnQh9kg apDqIVkCmYRR2b1r/VfHUEDjnDzsTJC2J+Y5dQov+30baMj5lFR+3mHaDnEQ== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CC8CA68F8F2 for ; Wed, 5 Nov 2025 14:03:08 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 05 Nov 2025 12:03:08 -0000 Message-ID: <176234418894.25.13038790773404706814@2cb04c0e5124> Message-ID-Hash: HAXPFZUR7G5EZ345I4P2XCU4FEAP7DFN X-Message-ID-Hash: HAXPFZUR7G5EZ345I4P2XCU4FEAP7DFN X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] lavc/mpeg12enc: Allow timecode to be overwritten (PR #20839) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: jnightingale-hei via ffmpeg-devel Cc: jnightingale-hei Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20839 opened by jnightingale-hei URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20839 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20839.patch If a custom timecode is specified in the frame side data using `AV_FRAME_DATA_GOP_TIMECODE` this timecode is then written into the encoded frame data. >>From fd61bde14156b43b88d3daf6577e4a40f48f8a04 Mon Sep 17 00:00:00 2001 From: Jonny Nightingale Date: Thu, 31 Jul 2025 12:16:26 +0100 Subject: [PATCH] lavc/mpeg12enc: Allow timecode to be overwritten If a custom timecode is specified in the frame side data using AV_FRAME_DATA_GOP_TIMECODE this timecode is then written into the encoded frame data. Signed-off-by: Jonny Nightingale --- libavcodec/mpeg12enc.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index fb480d0eec..c391e726fa 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -144,6 +144,15 @@ static void put_header(MPVEncContext *const s, uint32_t header) put_bits32(&s->pb, header); } +static unsigned bcd2uint(uint8_t bcd) +{ + unsigned low = bcd & 0xf; + unsigned high = bcd >> 4; + if (low > 9 || high > 9) + return 0; + return low + 10*high; +} + /* put sequence header if needed */ static void mpeg1_encode_sequence_header(MPEG12EncContext *mpeg12) { @@ -155,6 +164,7 @@ static void mpeg1_encode_sequence_header(MPEG12EncContext *mpeg12) int64_t best_aspect_error = INT64_MAX; AVRational aspect_ratio = s->c.avctx->sample_aspect_ratio; int aspect_ratio_info; + const AVFrameSideData *timecode_side_data; put_bits_assume_flushed(&s->pb); @@ -283,12 +293,26 @@ static void mpeg1_encode_sequence_header(MPEG12EncContext *mpeg12) } put_header(s, GOP_START_CODE); - put_bits(&s->pb, 1, mpeg12->drop_frame_timecode); // drop frame flag - /* time code: we must convert from the real frame rate to a - * fake MPEG frame rate in case of low frame rate */ - fps = (framerate.num + framerate.den / 2) / framerate.den; - time_code = s->c.cur_pic.ptr->coded_picture_number + - mpeg12->timecode_frame_start; + + timecode_side_data = av_frame_get_side_data(s->c.cur_pic.ptr->f, AV_FRAME_DATA_GOP_TIMECODE); + if (timecode_side_data && timecode_side_data->data && timecode_side_data->size >= 8) { + int64_t tc25bit = *(int64_t *)timecode_side_data->data; + unsigned hh = tc25bit>>19 & 0x1f; // 5-bit hours + unsigned mm = tc25bit>>13 & 0x3f; // 6-bit minutes + unsigned ss = tc25bit>>6 & 0x3f; // 6-bit seconds + unsigned ff = tc25bit & 0x3f; // 6-bit frames + mpeg12->drop_frame_timecode = !!(tc25bit & 1<<24); // 1-bit drop + fps = (framerate.num + framerate.den / 2) / framerate.den; + time_code = (hh*3600 + mm*60 + ss) * fps + ff; + put_bits(&s->pb, 1, mpeg12->drop_frame_timecode); // drop frame flag + } else { + put_bits(&s->pb, 1, mpeg12->drop_frame_timecode); // drop frame flag + /* time code: we must convert from the real frame rate to a + * fake MPEG frame rate in case of low frame rate */ + fps = (framerate.num + framerate.den / 2) / framerate.den; + time_code = s->c.cur_pic.ptr->coded_picture_number + + mpeg12->timecode_frame_start; + } mpeg12->gop_picture_number = s->c.cur_pic.ptr->coded_picture_number; -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org