From patchwork Wed Nov 15 02:14:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin NG X-Patchwork-Id: 6073 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4034981jah; Tue, 14 Nov 2017 18:14:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMYFl3NL3PlN9UOHyrNicW7SAlTWqePmOu6jRUEoRdIQFCUx0ezEoHyX9s/oYE6Dp6VVxTv8 X-Received: by 10.223.161.158 with SMTP id u30mr10917285wru.199.1510712062191; Tue, 14 Nov 2017 18:14:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510712062; cv=none; d=google.com; s=arc-20160816; b=dzsfQDOMKt+Lobgf99+9BgwYjQC9QCLS7K8p1HxlPJ/QfYs3br7TUFDy5p9yyxEtrg J8rAXepQV0G3CFci+cMQtY95bVb70Je1mHFVWVrS9E74YRrFc0ngbvedZtdz+xkQ9a8K XcqgYdD+/EKcEBRTcNJMYYiLipDmzRDbbrvFCD+B6ttYBpOpBMMzv8lTaEbILB4cAH8W D4CvaXmXUUMXJOuJ2RPiAhdJi3MLudX4mYB/J0mSsCnIWuM8SkSyodX3rbzHE3dbwx93 4EVBUjdv+8RLMM4v8DRM+yLNsE4K/E9tTh2QVzOzDqviykoo9l+nmt5uNHeHrmYmzIz2 +66A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=MZm0oWpymQhlPskNFJMOjR6vtqHWWVPrMan1Ziv77Oc=; b=jK3nCULXT0gV5mrU1BoBsPTfeePaLS3rdo6PW5iYelTi/gAh3tBp65Iz1DQUwrgYST UIItKKhzoui8srWUwdt09L11B6LhLDliMptnz3ovm2dJN/CoZA7L48R2pFhQ7NjMqK+Y ApLUauFNKC/pkOYW3LVsb7xkkzDkn8NZR8gcTyHppGl2x3Oe5lbxVE+zKG+Q/olCgrnR wt/PRk3WtOiX9qldMEI3Ev9gQ95C8Q3KeDQe+3/gVghklMzTyMpUVN8U6qsFsliG4ssP WoUbHjnLflC9XzmdI2FkIzCjFUmyQcozNgOouWgiV21ceDsYpd67rIYq2cMxYocrqeP/ F6vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=iKFE5rAE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=hotmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 30si11077109wrv.154.2017.11.14.18.14.21; Tue, 14 Nov 2017 18:14:22 -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; dkim=neutral (body hash did not verify) header.i=@hotmail.com header.s=selector1 header.b=iKFE5rAE; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=hotmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F300689E9C; Wed, 15 Nov 2017 04:14:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-oln040092007014.outbound.protection.outlook.com [40.92.7.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E12D689E75 for ; Wed, 15 Nov 2017 04:13:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=N2Q+c0zNvm8tClT4pyGpWtRYY3yX7J48Cp7GWig75sQ=; b=iKFE5rAEx8hYSIsxWwrKlo0gV7NolcK6x74d5yzYIq3dMC0nDoOVsFyLE6ZbiitAVQgoUMeR/leEIegvBVoByvpipx7NDQB7qpL1H29UAOzThX59bprplr4GjZrwXZ/pyviHLoyVAcRAAacBrK3OTxGvX1IByCO978gksctN+3I7M7mQt1RPJwFVpWePBoL+0Egfurk/9hV7ebwYhi/dHhA6dQwNujElYyHmVAzYaUZf9h1DoV26oqxKsb0ooA36F7booZA/KdW+t6W7veLyEz2QDU6rC0/K2rS4Y5yqefYNs6zt3IF0qqzyWNhDOa+Oo3b2dOqkeagO3igRUQ9WFA== Received: from DM3NAM03FT059.eop-NAM03.prod.protection.outlook.com (10.152.82.56) by DM3NAM03HT042.eop-NAM03.prod.protection.outlook.com (10.152.83.3) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.218.12; Wed, 15 Nov 2017 02:14:11 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com (10.152.82.55) by DM3NAM03FT059.mail.protection.outlook.com (10.152.82.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.218.12 via Frontend Transport; Wed, 15 Nov 2017 02:14:11 +0000 Received: from DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) by DM5PR22MB0681.namprd22.prod.outlook.com ([10.172.189.151]) with mapi id 15.20.0218.015; Wed, 15 Nov 2017 02:14:11 +0000 From: Colin NG To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [Patch] Download dash content with byte range info Thread-Index: AQHTXbdslP9MB74WdkeDSNicGCWd+Q== Date: Wed, 15 Nov 2017 02:14:10 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-CA, en-US Content-Language: en-CA X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:A166821717D5693853939ACEE953E1DCDE106BC4E4427F4461F2D2C673C490B0; UpperCasedChecksum:C4B839A14CC518B7B22EDBDD53911BCA549A202D75E4D2CE9E4F4A58F57B3F98; SizeAsReceived:7051; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [fJb9Jkkg5Wg92YM2UXCs7wfqg57AMuGQ] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM3NAM03HT042; 7:6ULdSNIrmrKwNfC7387YItsHKcUD2O2lMF3emMfijOjUt1nMQ4RNumpuQObp+WTrumwQqsYhjH3yl5mp7mCoz4psdwt2AEXKIQvAC4tzkSsvQ3PNSyvzouFqCxj7urr4b103G2/LWbdZ9tNlP6jv2ZNALrzHDFgaBs+8YdFj1YXsq/oPnAUcr0C+WlXMyeiZRCNNwrhruiQkAKiOYg1vXiQAWEFX7wnZM43QzkhNZj5WAGrIQaUHmREcUqU8Z0GX x-incomingheadercount: 46 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: eb5b0acf-6dbc-46fe-52d5-08d52bce8f4b x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1603101448)(1601125374)(1701031045); SRVR:DM3NAM03HT042; x-ms-traffictypediagnostic: DM3NAM03HT042: authentication-results: outbound.protection.outlook.com; spf=skipped (originating message); dkim=none (message not signed) header.d=none; dmarc=none action=none header.from=hotmail.com; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(444000031); SRVR:DM3NAM03HT042; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM3NAM03HT042; x-forefront-prvs: 0492FD61DD x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:DM3NAM03HT042; H:DM5PR22MB0681.namprd22.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb5b0acf-6dbc-46fe-52d5-08d52bce8f4b X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2017 02:14:10.9816 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3NAM03HT042 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [Patch] Download dash content with byte range info 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" diff --git a/doc/examples/Makefile b/doc/examples/Makefile index 58afd71..bff4af6 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -1,3 +1,16 @@ +# use pkg-config for getting CFLAGS and LDLIBS +FFMPEG_LIBS= libavdevice \ + libavformat \ + libavfilter \ + libavcodec \ + libswresample \ + libswscale \ + libavutil \ + +CFLAGS += -Wall -g +CFLAGS := $(shell pkg-config --cflags $(FFMPEG_LIBS)) $(CFLAGS) +LDLIBS := $(shell pkg-config --libs $(FFMPEG_LIBS)) $(LDLIBS) + EXAMPLES-$(CONFIG_AVIO_DIR_CMD_EXAMPLE) += avio_dir_cmd EXAMPLES-$(CONFIG_AVIO_READING_EXAMPLE) += avio_reading EXAMPLES-$(CONFIG_DECODE_AUDIO_EXAMPLE) += decode_audio @@ -19,6 +32,7 @@ EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE) += resampling_audio EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE) += scaling_video EXAMPLES-$(CONFIG_TRANSCODE_AAC_EXAMPLE) += transcode_aac EXAMPLES-$(CONFIG_TRANSCODING_EXAMPLE) += transcoding +EXAMPLES-$(CONFIG_SAMPLE_EXAMPLE) += sample EXAMPLES := $(EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)$(EXESUF)) EXAMPLES_G := $(EXAMPLES-yes:%=doc/examples/%$(PROGSSUF)_g$(EXESUF)) diff --git a/doc/examples/avio_reading.c b/doc/examples/avio_reading.c index 7860fd5..c77b8f9 100644 --- a/doc/examples/avio_reading.c +++ b/doc/examples/avio_reading.c @@ -39,6 +39,15 @@ struct buffer_data { size_t size; ///< size left in the buffer }; +static int isLocal(char *url) +{ + if (av_strstart(url, "http://", NULL) || av_strstart(url, "https://", NULL)) + { + return FALSE; + } + return TRUE; +} + static int read_packet(void *opaque, uint8_t *buf, int buf_size) { struct buffer_data *bd = (struct buffer_data *)opaque; @@ -78,7 +87,28 @@ int main(int argc, char *argv[]) av_register_all(); /* slurp file content into buffer */ - ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL); + + if (isLocal(input_filename) == TRUE) + { + ret = av_file_map(input_filename, &buffer, &buffer_size, 0, NULL); + } + else + { + AVIOContext *in = NULL; + + ret = avio_open2(&in, input_filename, AVIO_FLAG_READ, NULL, NULL); + + buffer_size = avio_size(in); + + if (buffer_size <= 0) { + buffer_size = 8 * 1024; + } + + if (buffer = av_mallocz(buffer_size) == NULL) { + return AVERROR(ENOMEM); + } + buffer_size = avio_read(in, buffer, buffer_size); + } if (ret < 0) goto end; diff --git a/libavcodec/dsd.c b/libavcodec/dsd.c index 9104f38..6742f53 100644 --- a/libavcodec/dsd.c +++ b/libavcodec/dsd.c @@ -21,7 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + #include "libavcodec/internal.h" +#include "libavutil/reverse.h" #include "libavcodec/mathops.h" #include "avcodec.h" #include "dsd_tablegen.h" diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 1b332a7..2d77088 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -24,6 +24,8 @@ * @author Konstantin Shishkov */ +#include "libavutil/reverse.h" + #include "config.h" #if CONFIG_ZLIB #include diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 93fd0f4..2cfe24b 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -21,6 +21,8 @@ #include "libavutil/mathematics.h" #include "libavutil/imgutils.h" +#include "libavutil/intmath.h" + #include "avcodec.h" #include "get_bits.h" #include "bytestream.h" diff --git a/libavdevice/v4l2-common.c b/libavdevice/v4l2-common.c index 196c09b..80cd524 100644 --- a/libavdevice/v4l2-common.c +++ b/libavdevice/v4l2-common.c @@ -43,9 +43,9 @@ const struct fmt_map ff_fmt_conversion_table[] = { { AV_PIX_FMT_NV12, AV_CODEC_ID_RAWVIDEO, V4L2_PIX_FMT_NV12 }, { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_MJPEG }, { AV_PIX_FMT_NONE, AV_CODEC_ID_MJPEG, V4L2_PIX_FMT_JPEG }, -#ifdef V4L2_PIX_FMT_H264 +//#ifdef V4L2_PIX_FMT_H264 { AV_PIX_FMT_NONE, AV_CODEC_ID_H264, V4L2_PIX_FMT_H264 }, -#endif +//#endif #ifdef V4L2_PIX_FMT_MPEG4 { AV_PIX_FMT_NONE, AV_CODEC_ID_MPEG4, V4L2_PIX_FMT_MPEG4 }, #endif diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0e3afd2..68196e9 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -522,6 +522,22 @@ static enum AVMediaType get_content_type(xmlNodePtr node) return type; } +static struct fragment * getFragment(char *range) +{ + struct fragment * seg = av_mallocz(sizeof(struct fragment)); + + memset(seg, 0, sizeof(struct fragment)); + seg->size = -1; + if (range) { + char *str_end_offset; + char *str_offset = av_strtok(range, "-", &str_end_offset); + seg->url_offset = strtoll(str_offset, NULL, 10); + seg->size = strtoll(str_end_offset, NULL, 10) -seg->url_offset; + } + + return seg; +} + static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representation *rep, xmlNodePtr fragmenturl_node, xmlNodePtr *baseurl_nodes, @@ -530,11 +546,13 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati { char *initialization_val = NULL; char *media_val = NULL; + char *range_val = NULL; if (!av_strcasecmp(fragmenturl_node->name, (const char *)"Initialization")) { initialization_val = xmlGetProp(fragmenturl_node, "sourceURL"); - if (initialization_val) { - rep->init_section = av_mallocz(sizeof(struct fragment)); + range_val = xmlGetProp(fragmenturl_node, "range"); + if (initialization_val || range_val) { + rep->init_section = getFragment(range_val);// byte range on if (!rep->init_section) { xmlFree(initialization_val); return AVERROR(ENOMEM); @@ -550,11 +568,13 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati } rep->init_section->size = -1; xmlFree(initialization_val); + xmlFree(range_val); } } else if (!av_strcasecmp(fragmenturl_node->name, (const char *)"SegmentURL")) { media_val = xmlGetProp(fragmenturl_node, "media"); - if (media_val) { - struct fragment *seg = av_mallocz(sizeof(struct fragment)); + range_val = xmlGetProp(fragmenturl_node, "mediaRange"); + if (media_val || range_val) { + struct fragment *seg = getFragment(range_val);// byte range on if (!seg) { xmlFree(media_val); return AVERROR(ENOMEM); @@ -571,12 +591,12 @@ static int parse_manifest_segmenturlnode(AVFormatContext *s, struct representati seg->size = -1; dynarray_add(&rep->fragments, &rep->n_fragments, seg); xmlFree(media_val); + xmlFree(range_val); } } return 0; } - static int parse_manifest_segmenttimeline(AVFormatContext *s, struct representation *rep, xmlNodePtr fragment_timeline_node) {