From patchwork Tue Nov 27 17:24:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 11186 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 A405744D146 for ; Tue, 27 Nov 2018 19:24:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2932568A60C; Tue, 27 Nov 2018 19:24:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f195.google.com (mail-it1-f195.google.com [209.85.166.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE568689F29 for ; Tue, 27 Nov 2018 19:24:12 +0200 (EET) Received: by mail-it1-f195.google.com with SMTP id o19so35394924itg.5 for ; Tue, 27 Nov 2018 09:24:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=nqA80Bjgor5nJ2MYV1aznfw2WrWad52eMXOhxdOcoLI=; b=uMrCI0hliGe2jYfKHq2HFlm9vtb4LoiFkUC8Vt51ZpNpffcdEHnsLHe2Z70iY8ifh/ BwNdgf2Tujt6TDs0ARMe6ixlFELbfoVUOLYB+UkIP6U7nkI28J6xFgg5JYxrA3If/Env 6zhS+26AfA5TSP9Hwd04u+ywFUiOLsVo+DKT+O/MrcoE8210jmFj01eYQJKSISjlst5x TwZAA8HLB04wWfIZ5LOazIkYJ1/vokgixnc8yPaHMdPCe3naH3mJdZ5cujrJuX8n9EYQ beLuq4NmgtK7Ww6mZ0nari5r8wdv4P/DKI2cSu2hPEKtWTLXsqROf8IqC9/zTBAmY+E1 vo1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=nqA80Bjgor5nJ2MYV1aznfw2WrWad52eMXOhxdOcoLI=; b=V3eDeLphunqZyuxVqgN7pTT65s3FoK5+nnjCl7Yr2ox8BAQ2pIVa4S2uEzBni94tb9 4HLpfHmzOvz8lIgr942z1CrzXePT7iDf4wyS2NWy7HCeGiEPiXkSVDoGiZnGkj80a5Cp pMvWv4mGZO0ucb7V7em6rJmXurZ6VqZHpIMvbcz/cQLeTOvBTTxVfzh8fZLMrQJBqoPk Q8Xzz32edVkuok5Tt9/+uAY8kyTzRHDLU8FhUREOzZg85DgFb/zoumRMWYzOF0xWO734 0USNFEqvMwTczSYR9cyyw9LRVkBlQdVSqW5nPgoW6/TSP2Ze78f6hls2yE1a6jiCug/+ W11A== X-Gm-Message-State: AGRZ1gKr2r8srOxu4w3Qy0O0HK755P/9lJcUmHG6BHBCcoL6hkfU8jLB 7aix4zb4J0hTDxdOyCDzA2EYDrZWfkC2ESl0R0Z2KA== X-Google-Smtp-Source: AJdET5e8OWBUDaTHiIHL1bw/L4yOIaP6ebzwsRl5lA3ESJhOmtTu/OBEwgpSz5DjpmODipjo1HoUyR0x9gtzCJUfhlU= X-Received: by 2002:a02:4007:: with SMTP id n7-v6mr27329425jaa.89.1543339456427; Tue, 27 Nov 2018 09:24:16 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a02:5f11:0:0:0:0:0 with HTTP; Tue, 27 Nov 2018 09:24:15 -0800 (PST) From: Carl Eugen Hoyos Date: Tue, 27 Nov 2018 18:24:15 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/rawdec: Do not mark raw subtitle streams as data streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch improves the "ffmpeg -i" output for raw dvbsub files. Please comment, Carl Eugen From 6cddd293354c75a20ae54e0ea62898c128826601 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 27 Nov 2018 18:22:02 +0100 Subject: [PATCH] lavf/rawdec: Do not mark streams from raw subtitle demuxers as data streams. Improves "ffmpeg -i" output for raw dvbsub files. --- libavformat/rawdec.c | 11 +++++++++++ libavformat/rawdec.h | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index b38a4b5..6249352 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -91,6 +91,17 @@ fail: return ret; } +int ff_raw_subtitle_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + st->codecpar->codec_id = s->iformat->raw_codec_id; + st->start_time = 0; + return 0; +} + int ff_raw_data_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL); diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h index a464bbb..3eb416b 100644 --- a/libavformat/rawdec.h +++ b/libavformat/rawdec.h @@ -41,6 +41,8 @@ int ff_raw_audio_read_header(AVFormatContext *s); int ff_raw_video_read_header(AVFormatContext *s); +int ff_raw_subtitle_read_header(AVFormatContext *s); + int ff_raw_data_read_header(AVFormatContext *s); #define FF_RAWVIDEO_DEMUXER_CLASS(name)\ @@ -83,7 +85,7 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\ .name = #shortname,\ .long_name = NULL_IF_CONFIG_SMALL(longname),\ .read_probe = probe,\ - .read_header = ff_raw_data_read_header,\ + .read_header = ff_raw_subtitle_read_header,\ .read_packet = ff_raw_read_partial_packet,\ .extensions = ext,\ .flags = flag,\ -- 1.7.10.4