From patchwork Sun Jun 14 16:22:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 20348 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 8178344909B for ; Sun, 14 Jun 2020 19:22:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6107B68B777; Sun, 14 Jun 2020 19:22:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8677268B764 for ; Sun, 14 Jun 2020 19:22:22 +0300 (EEST) Received: by mail-ej1-f66.google.com with SMTP id dr13so14838249ejc.3 for ; Sun, 14 Jun 2020 09:22:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=3QJnko3fMii2FvZ42nZ3qjI6RxZRiET77swf44e+TAg=; b=h5F9wDSuu29bi+MY8ELjcejLuuXrYJUxeSzVld7aTGpj8eqagXsEWQUX6nNK02Lq/+ 2lGkMA697wlIikMkqIlyvO6U5GNijHEQNMtCx/ejxEN0Rlet6NS5v6LotAPs2rngDF1Y /NNOsjDtAQ8yntWe0TH0p6goZuU4p2qFvd0iT+z4uYSEeOvmGByxN61Hadnry4wna4GX MeJTh6CCGe01Rd5xftpNvEgLaBQuS7u3ebjtIKv0BflUL1CyJPseG8LhPR8Wt9h9zoNi A9NrjlApkoGZGpoqtcYtJN1LY4MApRv1KfYVE/d/+lX1Cb+KVgnNbS1bxar4cA2AcXWQ zhMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3QJnko3fMii2FvZ42nZ3qjI6RxZRiET77swf44e+TAg=; b=OL7e5gIHFG/76GaTGIN6bxN/cPc8h/943SE6ZK3gzgQj7q/ta5/aqDt8DHM+1KbbVr IPufk7FfuTD6BwVBIC6CTCMryjACve18qMDS9STPRBy05fhVpFNp3jSHkIoCirraPVKk m3YxdqOJMRnhTv9gkJcdI0R5wuz3XmWrwDhanYTraQJk0nkVnI9iuqfW4PT2LcCS6Xnq OZqp3Rj3zlVbludKKe09GGWQTsBZpIAfk222181cfdalxMI3RVHWRsZSNPdMfltFMNLo wnBpJzCAxWcZcigQzglulXSAmKgytU31zXVDWEgU98p7vzOXjmUQLpRoLkv4IMTfpXap zbrw== X-Gm-Message-State: AOAM533P6PJiAe782L20/P0dUdY7HsyfkCQWsSM9omjZmaKd7w14C1TH ISkifNltvFy8IS5LvS8BSS3NVL9BrnA= X-Google-Smtp-Source: ABdhPJzNB9U8XtT1S6U7unDL3jLaGcPaAJcTpzQsQ8Xs8BZqxNyXUMpWzhNJmnwOqEsiDOKTYIocTQ== X-Received: by 2002:a17:906:2581:: with SMTP id m1mr2359910ejb.89.1592151741680; Sun, 14 Jun 2020 09:22:21 -0700 (PDT) Received: from localhost.localdomain ([37.244.249.74]) by smtp.gmail.com with ESMTPSA id g22sm7271197ejo.1.2020.06.14.09.22.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2020 09:22:21 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Jun 2020 18:22:11 +0200 Message-Id: <20200614162211.30885-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200614162211.30885-1-onemda@gmail.com> References: <20200614162211.30885-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/movenc: fix remuxing eia-608 into mov from other containers 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/movenc.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 5d8dc4fd5d..520aaafb74 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5582,6 +5582,22 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) goto end; avio_write(pb, pkt->data, size); #endif + } else if (par->codec_id == AV_CODEC_ID_EIA_608) { + size = 8; + + for (int i = 0; i < pkt->size; i += 3) { + if (pkt->data[i] == 0xFC) { + size += 2; + } + } + avio_wb32(pb, size); + ffio_wfourcc(pb, "cdat"); + for (int i = 0; i < pkt->size; i += 3) { + if (pkt->data[i] == 0xFC) { + avio_w8(pb, pkt->data[i + 1]); + avio_w8(pb, pkt->data[i + 2]); + } + } } else { if (trk->cenc.aes_ctr) { if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 4) {