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 ESMTPS id 164B64CCBA for ; Sat, 25 Jan 2025 20:26:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0276B68BABF; Sat, 25 Jan 2025 22:26:37 +0200 (EET) Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CE2768AF94 for ; Sat, 25 Jan 2025 22:26:30 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id 6a1803df08f44-6d8ece4937fso29178816d6.2 for ; Sat, 25 Jan 2025 12:26:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737836789; x=1738441589; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=foGF6o2De5FY8H8vDxN1/BfNFxqNYMGaILXmShLiDnA=; b=dv2lCaUqpE/yojsIWnKRf6cHacEm+e8mqdgo+4B/9gn28/ZgKaD+em3TKz8+8PMvnG 6bDtmnRmv5hGCgL4rMFw57HSACtZEq0D0tJB6N9sWs6Fgs2SoJmssO9wyrg31FDlc94F WoYFya4RxqNO1gMgrj3qf62jS9hRNvgjSShy5+r3DkT7jLOuhkFWMqPiByCxwHkDe1RY y3lJDmrn4LABJJ0y2BcwuJBUrYodgRkEWPXmYfS1YyxrVJKLsMH6Vck6Fbgey3fU1tft I02K0ZNYXef8GYPa3K7EEKv2EEdkd5US/7UmnC5/AfltAh4R1iWaBtdWOeNgmu6DsEnR Z5Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737836789; x=1738441589; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=foGF6o2De5FY8H8vDxN1/BfNFxqNYMGaILXmShLiDnA=; b=co4ExBPcHIXom9Oqen5MdqqlFO58abmVoYhBiv43NhsFX1KTq99uIIjTSbGF/fiWd2 cH1SfScGr4cK4ErEsmly9UklO8yIqLki7i5ke/ZNekYdC7keVKA4fWx3jsRdedgQ8VkA PJNwCFhYX8VoMjUEP3pp6lw4G6SlJ8oKKAkW73zYKyi9h/Lev48Rg05dQ6WUe+gFOzJw vxd+YoNehFylZFnoOPi0gds8byaTLtQssIJ4B+VWqVSGjW3xjjlACmY3dqNOitDecGLG rSL7cfsTnWFBnIWMzpwB2H1MJk5o4e3Y3bLarOBgzZ3XygZLb5lzuCb8FSqmxiqWTV1j tXJg== X-Gm-Message-State: AOJu0YzMGIGUo3I/S4Q6uK5Z1Kci5pYmYMUbkZVX93oYHjVHCVRWuRQs Oov5o2/HSY7mlgygKPJ2oTmeNsAWyPidK4WLQT3UkVg1WcKkPFhuLO1+tg== X-Gm-Gg: ASbGnctEuGmlElXyDOZWgI8X6Y/sB7epXlGl1niWSh9SaLOof7hUZOu3KhNgrB1fr6+ XaAjfG3UCx89wyVviNYKjvBJwOweVYTKpmm0UzXYkoJktOxJTC79QQsQ1LevpaCvctvRa7TeBMt vKZwcBleRXTIiaeDCQtjtQoL0ltJ0DfzaXhX6zAIj449q79yF3Blh2+yBHGmpf189ea6UUIl/G6 fzaw4C3MwSRhn9c6mxG6vtUEDsfBFwpMfDdFPG03+q1Q/uyF5ob1UR4j4yEcXX1hBRp+u/jDxfN btbIUfeoFa788659v/i7r4DcNuUcUNVobuDgCfKLHnF1vZvFms+jNrBrwRVykg== X-Google-Smtp-Source: AGHT+IGGXH1wAdyETXWJskGADX1WEkO71qAf0E1LW2ZVfrDP5cKJ07hhiNfIFpVk2pLCMeWu6Pw7cg== X-Received: by 2002:a05:6214:3d99:b0:6d8:838f:8b54 with SMTP id 6a1803df08f44-6e1b2263771mr563194026d6.39.1737836789131; Sat, 25 Jan 2025 12:26:29 -0800 (PST) Received: from scott-desktop.. (pool-108-56-160-50.washdc.fios.verizon.net. [108.56.160.50]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6e2057a8b79sm20316096d6.93.2025.01.25.12.26.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jan 2025 12:26:28 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Jan 2025 15:26:11 -0500 Message-ID: <20250125202626.382412-1-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/mpeg12dec.c: rename 0x0502 CC format 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: The format is used by at least one DVB-S provider, but is not defined in any DVB standard, so remove references to DVB. Since I don't have any standard that does define this format, using the magic number as the name seems most appropriate. This is a simple rename, no functional change. ---- This renaming was discussed briefly on the mailing list on 28 December 2024, but I never saw a patch to rename it. --- libavcodec/mpeg12dec.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 9bb995b5be..f28d900cc9 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -67,7 +67,7 @@ enum Mpeg2ClosedCaptionsFormat { CC_FORMAT_A53_PART4, CC_FORMAT_SCTE20, CC_FORMAT_DVD, - CC_FORMAT_DVB_0502 + CC_FORMAT_0x0502 }; typedef struct Mpeg1Context { @@ -2064,39 +2064,39 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, mpeg_set_cc_format(avctx, CC_FORMAT_DVD, "DVD"); } return 1; - } else if ((!s1->cc_format || s1->cc_format == CC_FORMAT_DVB_0502) && + } else if ((!s1->cc_format || s1->cc_format == CC_FORMAT_0x0502) && buf_size >= 12 && p[0] == 0x05 && p[1] == 0x02) { - /* extract DVB 0502 CC data */ + /* extract 0x0502 format CC data */ const uint8_t cc_header = 0xf8 | 0x04 /* valid */ | 0x00 /* line 21 field 1 */; uint8_t cc_data[4] = {0}; int cc_count = 0; - uint8_t dvb_cc_type = p[7]; + uint8_t cc_type = p[7]; p += 8; buf_size -= 8; - if (dvb_cc_type == 0x05 && buf_size >= 7) { - dvb_cc_type = p[6]; + if (cc_type == 0x05 && buf_size >= 7) { + cc_type = p[6]; p += 7; buf_size -= 7; } - if (dvb_cc_type == 0x02 && buf_size >= 4) { /* 2-byte caption, can be repeated */ + if (cc_type == 0x02 && buf_size >= 4) { /* 2-byte caption, can be repeated */ cc_count = 1; cc_data[0] = p[1]; cc_data[1] = p[2]; - dvb_cc_type = p[3]; + cc_type = p[3]; /* Only repeat characters when the next type flag * is 0x04 and the characters are repeatable (i.e., less than * 32 with the parity stripped). */ - if (dvb_cc_type == 0x04 && (cc_data[0] & 0x7f) < 32) { + if (cc_type == 0x04 && (cc_data[0] & 0x7f) < 32) { cc_count = 2; cc_data[2] = cc_data[0]; cc_data[3] = cc_data[1]; } - } else if (dvb_cc_type == 0x04 && buf_size >= 5) { /* 4-byte caption, not repeated */ + } else if (cc_type == 0x04 && buf_size >= 5) { /* 4-byte caption, not repeated */ cc_count = 2; cc_data[0] = p[1]; cc_data[1] = p[2]; @@ -2124,7 +2124,7 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, } } - mpeg_set_cc_format(avctx, CC_FORMAT_DVB_0502, "DVB 0502"); + mpeg_set_cc_format(avctx, CC_FORMAT_0x0502, "0x0502"); } return 1; } @@ -2687,7 +2687,7 @@ const FFCodec ff_mpeg1video_decoder = { static const AVOption mpeg2video_options[] = { { "cc_format", "extract a specific Closed Captions format", M2V_OFFSET(cc_format), AV_OPT_TYPE_INT, { .i64 = CC_FORMAT_AUTO }, - CC_FORMAT_AUTO, CC_FORMAT_DVB_0502, M2V_PARAM, .unit = "cc_format" }, + CC_FORMAT_AUTO, CC_FORMAT_0x0502, M2V_PARAM, .unit = "cc_format" }, { "auto", "pick first seen CC substream", 0, AV_OPT_TYPE_CONST, { .i64 = CC_FORMAT_AUTO }, .flags = M2V_PARAM, .unit = "cc_format" }, @@ -2697,8 +2697,8 @@ static const AVOption mpeg2video_options[] = { { .i64 = CC_FORMAT_SCTE20 }, .flags = M2V_PARAM, .unit = "cc_format" }, { "dvd", "pick DVD CC substream", 0, AV_OPT_TYPE_CONST, { .i64 = CC_FORMAT_DVD }, .flags = M2V_PARAM, .unit = "cc_format" }, - { "dvb_0502", "pick DVB 0502 CC substream", 0, AV_OPT_TYPE_CONST, - { .i64 = CC_FORMAT_DVB_0502 }, .flags = M2V_PARAM, .unit = "cc_format" }, + { "0x0502", "pick 0x0502 format CC substream", 0, AV_OPT_TYPE_CONST, + { .i64 = CC_FORMAT_0x0502 }, .flags = M2V_PARAM, .unit = "cc_format" }, { NULL } }; -- 2.43.0 _______________________________________________ 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".