From patchwork Tue Mar 19 17:11:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: swarajhota353@gmail.com X-Patchwork-Id: 12355 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 52C05447642 for ; Tue, 19 Mar 2019 19:13:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22BFD68A4D9; Tue, 19 Mar 2019 19:13:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F06FE68A4D9 for ; Tue, 19 Mar 2019 19:13:25 +0200 (EET) Received: by mail-pf1-f173.google.com with SMTP id n125so14147712pfn.5 for ; Tue, 19 Mar 2019 10:13:25 -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:mime-version :content-transfer-encoding; bh=ec3oCSnObI9bGC3qZLS3FWo9Iz+pATExkPdCMCluzgM=; b=henavJNhLBj95Gz1ezKUxm0/atomxKC0iBaQsx7p2hM/8GMzzPLpT8tt2vacntFiYh Z/nDo/30oNzATFr/YGva8p4UnGFgaxi/WC0WGOCdpZXJxgCc/W/GmK/oE+arTA6cmB6p SQIp2v/YOBTCoA2WvKPIc2w9sY3xRZ5D6hN3RXE/rcsDp+IXTuFyJ7i8RuzYJk5rkCvU 6h47ItyzbtPEfqHIOgW+SXzJZAJKyn2TvUlQrDOYiOv3Id8zSfvZzq11yU1Tf3HS0D6H bCXuPgFLt6PGFGlrN1YoAgRPIFDcKV6H49toC8Tc5nJ4pcMXzGe+xfTF4XrJ1Y+BbDpT 1QNQ== 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:mime-version :content-transfer-encoding; bh=ec3oCSnObI9bGC3qZLS3FWo9Iz+pATExkPdCMCluzgM=; b=WKazmirN5OceLGrSAmERneHReb5DSKQ/QcidkTCQhJltFhZP+ptnqzWS8fwnmb6gPz 6xJli9vvrcWA9OGN3OsiYh6SUhNJiEJGmuDI5Dy6bRvm5Huub2TarvvQPKaHmX9E17ji pkwL/dmbCH8tJqjOAhRIg+f8Yw9GGNWeKFylJItwG8VvA0bxvQS6oQ3mt1RjYRYuv8o2 FrU3ra/oHNPXJ9Xk7gr9pDun/1zRLOR7oHrEFePvTLlyBZ1n6XMgYDOQ9wLHed0nCBJS 8ioBkOCOlmBzf768/Z/zB0WTSQfSmvuWIJmz+e1LmcX81sOIB7UU1jC22Qk6v+6LLh0O F1QA== X-Gm-Message-State: APjAAAUuRP49yrEyOvbf/i3BaSrPCvcbprBCaQ3PfJ7dlVRbLDGz8vf3 G22UuOjrRfD63YnOV9QafZoUjx46 X-Google-Smtp-Source: APXvYqwLL1p23ooJ2CZ5fKXWwY+/KVT0SoM20kBloaFVOWj1nwsatpF1HgIx8Fo+UrCiW9U1eWZrLA== X-Received: by 2002:a17:902:9a02:: with SMTP id v2mr3550323plp.201.1553015603632; Tue, 19 Mar 2019 10:13:23 -0700 (PDT) Received: from exmachina.localdomain ([106.222.186.223]) by smtp.gmail.com with ESMTPSA id n65sm21299541pfb.160.2019.03.19.10.13.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Mar 2019 10:13:22 -0700 (PDT) From: swarajhota353@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Mar 2019 22:41:32 +0530 Message-Id: <20190319171131.15567-1-swarajhota353@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/flvdec: added support for KUX container 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: Swaraj Hota Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Swaraj Hota Fixes ticket #4519. --- This is my qualification task for GSoC 2019. Please suggest any more changes if required. Signed-off-by: Swaraj Hota --- Changelog | 1 + libavformat/allformats.c | 1 + libavformat/flvdec.c | 38 ++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 4 ++-- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 4d80e5b54f..8ec6b88d66 100644 --- a/Changelog +++ b/Changelog @@ -19,6 +19,7 @@ version : - ARBC decoder - libaribb24 based ARIB STD-B24 caption support (profiles A and C) - Support decoding of HEVC 4:4:4 content in nvdec and cuviddec +- KUX demuxer version 4.1: diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 06844986f3..a7bea4efe2 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -210,6 +210,7 @@ extern AVInputFormat ff_ivr_demuxer; extern AVInputFormat ff_jacosub_demuxer; extern AVOutputFormat ff_jacosub_muxer; extern AVInputFormat ff_jv_demuxer; +extern AVInputFormat ff_kux_demuxer; extern AVOutputFormat ff_latm_muxer; extern AVInputFormat ff_lmlm4_demuxer; extern AVInputFormat ff_loas_demuxer; diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 972e333313..090de3db5c 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -106,6 +106,20 @@ static int live_flv_probe(AVProbeData *p) return probe(p, 1); } +static int kux_probe(AVProbeData *p) +{ + const uint8_t *d = p->buf; + + if (d[0] == 'K' && + d[1] == 'D' && + d[2] == 'K' && + d[3] == 0 && + d[4] == 0) { + return AVPROBE_SCORE_MAX; + } + return 0; +} + static void add_keyframes_index(AVFormatContext *s) { FLVContext *flv = s->priv_data; @@ -718,6 +732,10 @@ static int flv_read_header(AVFormatContext *s) int offset; int pre_tag_size = 0; + /* Actual FLV data at 0xe40000 in KUX file */ + if(!strcmp(s->iformat->name, "kux")) + avio_skip(s->pb, 0xe40000); + avio_skip(s->pb, 4); flags = avio_r8(s->pb); @@ -1366,3 +1384,23 @@ AVInputFormat ff_live_flv_demuxer = { .priv_class = &live_flv_class, .flags = AVFMT_TS_DISCONT }; + +static const AVClass kux_class = { + .class_name = "kuxdec", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_kux_demuxer = { + .name = "kux", + .long_name = NULL_IF_CONFIG_SMALL("KUX (YouKu)"), + .priv_data_size = sizeof(FLVContext), + .read_probe = kux_probe, + .read_header = flv_read_header, + .read_packet = flv_read_packet, + .read_seek = flv_read_seek, + .read_close = flv_read_close, + .extensions = "kux", + .priv_class = &kux_class, +}; diff --git a/libavformat/version.h b/libavformat/version.h index 2e83eb4f23..7efc774b7d 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 26 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 27 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \