From patchwork Fri Jun 30 22:05:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 4168 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp6274330vsb; Fri, 30 Jun 2017 15:06:03 -0700 (PDT) X-Received: by 10.28.10.76 with SMTP id 73mr7764854wmk.93.1498860363298; Fri, 30 Jun 2017 15:06:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498860363; cv=none; d=google.com; s=arc-20160816; b=OcBalC/igqEtGKISVAHQwpWO2wVaSXSaWfg2RR6liBvtp9cYLiDoaMae0sQzPfwnV2 84PuwNTKQopfI8Zm5Ex3NPRQoUS7Y0y11KW5EDsL5E9/khtvT8+UNnh8w8A2fposmedp CoOMQawqqjUFly0oRuRZl3mBmV8ip0EFEiCctDrroHujuHHamIY2Vtpxc2CEhpfukf40 x59VKFMFoGEV5Cpcrh6XkKrCQt2aMOijVp0E1WQgKSJoCPhjlzVmEXWQn+7es0E9DqFj UN2PoUqW/cA3zsceToHl4jpDZfaPmzsNZSLU3EuxmCQXh2AFm+1Jgw0XDN4bH5s6rebJ tZDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=ivQa2CH8lQS4c//Xre3cP9LHh95DP8hzD5GFZLVI4Ms=; b=PlVCTG1HhYjYSGSEFR54pfCvYtz7YXXdGlb567yoRZ8dDTj4jM2p79sgY5HVFScTaP vD1H/OH/4uFXFWljVPSR3g+f3PNCEpgr0SGlXDt62gFaPBUzupfp5+X8fT84hKABjCKa f6T/tm2hDkq9gik6BRmMvoXTf2YI8jVIBMxTSK35Rgn4vbByTJacmjxkbgG+ML0/y/Pl KO++CDhf30iTGqtuyccyXoizUJYBgOAfcVn4ODMA5z3ZyxoZQz+fPeoeeNAbckq3bEm3 yL6BxYmaakycxv85+Nt6pk4tCTcWsBrAP92KhkZy2O/jU/hNUr0xlOAQZuKS37/7KSOH gGIw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d8si6759354wrc.28.2017.06.30.15.06.02; Fri, 30 Jun 2017 15:06:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A8C7689FB7; Sat, 1 Jul 2017 01:06:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9814E689D74 for ; Sat, 1 Jul 2017 01:05:53 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id D008110315A; Sat, 1 Jul 2017 00:05:53 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xZ8F3QHCpn20; Sat, 1 Jul 2017 00:05:52 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 2544E100C90; Sat, 1 Jul 2017 00:05:52 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jul 2017 00:05:35 +0200 Message-Id: <20170630220536.19396-1-cus@passwd.hu> X-Mailer: git-send-email 2.12.3 Subject: [FFmpeg-devel] [PATCH 1/2] avdevice/decklink_dec: add support for decoding teletext from 10bit ancillary data 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This also add supports for 4K DeckLink cards because they always output the ancillary data in 10-bit. Signed-off-by: Marton Balint --- doc/indevs.texi | 4 ++-- libavdevice/decklink_dec.cpp | 56 +++++++++++++++++++++++++++++++------------- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 51c304f3ec..330617a7c9 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -250,8 +250,8 @@ specifically lines 6 to 22, and lines 318 to 335. Line 6 is the LSB in the mask. Selected lines which do not contain teletext information will be ignored. You can use the special @option{all} constant to select all possible lines, or @option{standard} to skip lines 6, 318 and 319, which are not compatible with all -receivers. Capturing teletext only works for SD PAL sources in 8 bit mode. -To use this option, ffmpeg needs to be compiled with @code{--enable-libzvbi}. +receivers. Capturing teletext only works for SD PAL sources. To use this +option, ffmpeg needs to be compiled with @code{--enable-libzvbi}. @item channels Defines number of audio channels to capture. Must be @samp{2}, @samp{8} or @samp{16}. diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 39974e3ff4..88af01be70 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -54,21 +54,40 @@ static uint8_t calc_parity_and_line_offset(int line) return ret; } -int teletext_data_unit_from_vbi_data(int line, uint8_t *src, uint8_t *tgt) +static void fill_data_unit_head(int line, uint8_t *tgt) +{ + tgt[0] = 0x02; // data_unit_id + tgt[1] = 0x2c; // data_unit_length + tgt[2] = calc_parity_and_line_offset(line); // field_parity, line_offset + tgt[3] = 0xe4; // framing code +} + +static uint8_t* teletext_data_unit_from_vbi_data(int line, uint8_t *src, uint8_t *tgt, vbi_pixfmt fmt) { vbi_bit_slicer slicer; - vbi_bit_slicer_init(&slicer, 720, 13500000, 6937500, 6937500, 0x00aaaae4, 0xffff, 18, 6, 42 * 8, VBI_MODULATION_NRZ_MSB, VBI_PIXFMT_UYVY); + vbi_bit_slicer_init(&slicer, 720, 13500000, 6937500, 6937500, 0x00aaaae4, 0xffff, 18, 6, 42 * 8, VBI_MODULATION_NRZ_MSB, fmt); if (vbi_bit_slice(&slicer, src, tgt + 4) == FALSE) - return -1; + return tgt; - tgt[0] = 0x02; // data_unit_id - tgt[1] = 0x2c; // data_unit_length - tgt[2] = calc_parity_and_line_offset(line); // field_parity, line_offset - tgt[3] = 0xe4; // framing code + fill_data_unit_head(line, tgt); - return 0; + return tgt + 46; +} + +static uint8_t* teletext_data_unit_from_vbi_data_10bit(int line, uint8_t *src, uint8_t *tgt) +{ + uint8_t y[720]; + uint8_t *py = y; + uint8_t *pend = y + 720; + while (py < pend) { + *py++ = (src[1] >> 4) + ((src[2] & 15) << 4); + *py++ = (src[4] >> 2) + ((src[5] & 3 ) << 6); + *py++ = (src[6] >> 6) + ((src[7] & 63) << 2); + src += 8; + } + return teletext_data_unit_from_vbi_data(line, y, tgt, VBI_PIXFMT_YUV420); } #endif @@ -359,7 +378,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( //fprintf(stderr,"Video Frame size %d ts %d\n", pkt.size, pkt.pts); #if CONFIG_LIBZVBI - if (!no_video && ctx->teletext_lines && videoFrame->GetPixelFormat() == bmdFormat8BitYUV && videoFrame->GetWidth() == 720) { + if (!no_video && ctx->teletext_lines) { IDeckLinkVideoFrameAncillary *vanc; AVPacket txt_pkt; uint8_t txt_buf0[1611]; // max 35 * 46 bytes decoded teletext lines + 1 byte data_identifier @@ -368,16 +387,21 @@ HRESULT decklink_input_callback::VideoInputFrameArrived( if (videoFrame->GetAncillaryData(&vanc) == S_OK) { int i; int64_t line_mask = 1; + BMDPixelFormat vanc_format = vanc->GetPixelFormat(); txt_buf[0] = 0x10; // data_identifier - EBU_data txt_buf++; - for (i = 6; i < 336; i++, line_mask <<= 1) { - uint8_t *buf; - if ((ctx->teletext_lines & line_mask) && vanc->GetBufferForVerticalBlankingLine(i, (void**)&buf) == S_OK) { - if (teletext_data_unit_from_vbi_data(i, buf, txt_buf) >= 0) - txt_buf += 46; + if (videoFrame->GetWidth() == 720 && (vanc_format == bmdFormat8BitYUV || vanc_format == bmdFormat10BitYUV)) { + for (i = 6; i < 336; i++, line_mask <<= 1) { + uint8_t *buf; + if ((ctx->teletext_lines & line_mask) && vanc->GetBufferForVerticalBlankingLine(i, (void**)&buf) == S_OK) { + if (vanc_format == bmdFormat8BitYUV) + txt_buf = teletext_data_unit_from_vbi_data(i, buf, txt_buf, VBI_PIXFMT_UYVY); + else + txt_buf = teletext_data_unit_from_vbi_data_10bit(i, buf, txt_buf); + } + if (i == 22) + i = 317; } - if (i == 22) - i = 317; } vanc->Release(); if (txt_buf - txt_buf0 > 1) {