From patchwork Tue Nov 8 11:25:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 1338 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1630566vsb; Tue, 8 Nov 2016 03:25:11 -0800 (PST) X-Received: by 10.194.32.100 with SMTP id h4mr9534156wji.116.1478604311703; Tue, 08 Nov 2016 03:25:11 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 7si16009154wmr.108.2016.11.08.03.25.11; Tue, 08 Nov 2016 03:25:11 -0800 (PST) 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 555B9689C87; Tue, 8 Nov 2016 13:25:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D95968075F for ; Tue, 8 Nov 2016 13:24:59 +0200 (EET) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1c44WT-0001GA-VJ for ffmpeg-devel@ffmpeg.org; Tue, 08 Nov 2016 12:25:01 +0100 Received: from [192.168.1.3] ([80.110.105.157]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id 5PR01u02A3PmYLY01PR1Fl; Tue, 08 Nov 2016 12:25:01 +0100 X-SourceIP: 80.110.105.157 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 8 Nov 2016 12:25:00 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201611081225.00692.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavf/mpegtsenc: Automatically insert dump_extra for asp muxing 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 allows automatic insertion of dump_extra when remuxing mpeg4 asp. Please comment, Carl Eugen From 8ff75d4fa9127f3f02dde9408795f27c8d0e9c2c Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 8 Nov 2016 12:22:26 +0100 Subject: [PATCH] lavf/mpegtsenc: Automatically insert dump_extra for asp muxing. --- libavformat/mpegtsenc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 71a6642..9e98fd2 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -28,6 +28,7 @@ #include "libavutil/opt.h" #include "libavcodec/internal.h" +#include "libavcodec/mpeg4video.h" #include "avformat.h" #include "avio_internal.h" @@ -1823,8 +1824,12 @@ static int mpegts_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt (st->codecpar->extradata_size > 0 && st->codecpar->extradata[0] == 1))) ret = ff_stream_add_bitstream_filter(st, "hevc_mp4toannexb", NULL); + } else if (st->codecpar->codec_id == AV_CODEC_ID_MPEG4) { + if (pkt->size >= 5 && AV_RB32(pkt->data) != VOS_STARTCODE && + st->codecpar->extradata_size >= 5 && + AV_RB32(st->codecpar->extradata) == VOS_STARTCODE) + ret = ff_stream_add_bitstream_filter(st, "dump_extra", NULL); } - return ret; }