From patchwork Fri Jul 12 22:24:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mikrohard@gmail.com X-Patchwork-Id: 13920 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 1C409447B01 for ; Sat, 13 Jul 2019 01:24:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F2D4268AC46; Sat, 13 Jul 2019 01:24:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53CD068ABB0 for ; Sat, 13 Jul 2019 01:24:32 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id f17so10187702wme.2 for ; Fri, 12 Jul 2019 15:24:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xVznXvzvyOYXwb+KAMTlUTXzIfDdXk5k9vV50uVeEvY=; b=YlmCpM8LWj4yA462mFK6rHqP7Yo0lZD3vvi2O5RylH4L7rIsK8OoQ9i8lSd2pXdJQi 9xxVRrPN9z9Be7KCuAhwpRd4RFRGGj4HfWpvuw/Qnv+XkkRg4q7cPmwM///+7Xd0fZYO tHiu6zQ+OPFsZ275+kGOAcwnOVl50irQEH0oVP4qGMA3wXhQ/6xwpQUnkweeS91flZfz NE/DAhIJbvESBJaTONIiP0tpf8v85SNJtVy12ROyYzu3BeIMTGXJ7LNR5Ij9B7i1vw/b KC9QCLtM6SbyOCajNr5OMKRP31sivPG8hlhbRZGk7jz7ZbyScFjSg95XHWBUSljAOXmS JXlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xVznXvzvyOYXwb+KAMTlUTXzIfDdXk5k9vV50uVeEvY=; b=KhPY8d1vw40BdDM9xWVwIaRIVkA76KzM+75quLSMehkswbpHDjAeBODqsTNrSlUlyq RIkNoXEx8ISsj04JhiPC2yGBJhmyntBrbouX3ZUSSlGK1w6pVWE3pokh1Wx8WdMiuwiT XmjLac4+VJzzyzDSM0NyRioY5ABoGsDHFtIGpMbwQnWBnlHErg9gkZoXZtYb0mkGUN3I 2Ma1gQjP/bEaTJUvPUzDJ8SNCv84egFObwqWIDPopPBsMoU4qQrnfc+MbAL1e7x4ltiA Phwhg3WVyREQxmR4ycOYKpz9QJ7xdhjjuP+hdOG240PrsO5G6G28u5PNkNlSf45eG1Np ZRqw== X-Gm-Message-State: APjAAAU6yUbCXh68rqrWw6bK2fU/IcEZ89fiJcBg/Tuuv6pwsbqO8mRN 2VaeqIpKTBxKqVcVgEzfArbYLTc= X-Google-Smtp-Source: APXvYqzecnfEVIw/0aR4H0K0xR85MlSq2Kj7W49c1fnSoSZAxUvudIsiCA93v3+N5K5EuXftZ0Fuzw== X-Received: by 2002:a7b:cf32:: with SMTP id m18mr11370678wmg.27.1562970271568; Fri, 12 Jul 2019 15:24:31 -0700 (PDT) Received: from localhost.localdomain (89-212-97-97.dynamic.t-2.net. [89.212.97.97]) by smtp.gmail.com with ESMTPSA id h1sm6121742wrt.20.2019.07.12.15.24.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jul 2019 15:24:30 -0700 (PDT) From: mikrohard@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jul 2019 00:24:29 +0200 Message-Id: <20190712222429.58912-1-mikrohard@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20190711190653.56289-1-mikrohard@gmail.com> References: <20190711190653.56289-1-mikrohard@gmail.com> Subject: [FFmpeg-devel] [PATCH] Add support for Display Definition Segment to DVB Subtitle 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: Jernej MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jernej Patch with requested changes. --- libavcodec/dvbsub.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index 8cce702..a8d43d8 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -247,9 +247,10 @@ static void dvb_encode_rle8(uint8_t **pq, *pq = q; } -static int encode_dvb_subtitles(DVBSubtitleContext *s, +static int encode_dvb_subtitles(AVCodecContext *avctx, uint8_t *outbuf, const AVSubtitle *h) { + DVBSubtitleContext *s = avctx->priv_data; uint8_t *q, *pseg_len; int page_id, region_id, clut_id, object_id, i, bpp_index, page_state; @@ -261,6 +262,19 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, if (h->num_rects && !h->rects) return -1; + if (avctx->width > 0 && avctx->height > 0) { + /* display definition segment */ + *q++ = 0x0f; /* sync_byte */ + *q++ = 0x14; /* segment_type */ + bytestream_put_be16(&q, page_id); + pseg_len = q; + q += 2; /* segment length */ + *q++ = 0x00; /* dds version number & display window flag */ + bytestream_put_be16(&q, avctx->width - 1); /* display width */ + bytestream_put_be16(&q, avctx->height - 1); /* display height */ + bytestream_put_be16(&pseg_len, q - pseg_len - 2); + } + /* page composition segment */ *q++ = 0x0f; /* sync_byte */ @@ -446,10 +460,9 @@ static int dvbsub_encode(AVCodecContext *avctx, unsigned char *buf, int buf_size, const AVSubtitle *sub) { - DVBSubtitleContext *s = avctx->priv_data; int ret; - ret = encode_dvb_subtitles(s, buf, sub); + ret = encode_dvb_subtitles(avctx, buf, sub); return ret; }