From patchwork Wed Sep 27 16:08:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5311 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp5201645jaa; Wed, 27 Sep 2017 09:08:50 -0700 (PDT) X-Received: by 10.223.165.75 with SMTP id j11mr1846758wrb.234.1506528529929; Wed, 27 Sep 2017 09:08:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506528529; cv=none; d=google.com; s=arc-20160816; b=d2hVyJ1L6wd3g94+Szrbjnk77ORssE7eCYd9ohdtH7BFQFzAQQya/WCLeyqccNErpa n0H0fG3SpO3hrWXqIb+Hyko2FvZER9QSFefoEVdbCkOXMoGEARGxf/M1cJToye41eOKs gKJ1xLPt7cBI6J870CGkIiN5dG/OQtM/WRZ3GURjPy9jxy1RyenOHyYyC3XjrkeYE2Hw YMt2A4sq14ZMOSoq/dv6mSC4qlvgj3rAmZ/+xWI5QMhvEbQanfXzIttSuvLKYKxjAfu7 a6hl6m3nMNSaGWlVW8C3mgTksBCpXqfZimG1qQHcPxS7UXvaZKzSPTv0cW2eWvlXqyok aA0Q== 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:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=HBGnYjGg5cW2RjWwWK+lwExjRNckmx0HAkpTbd8R83E=; b=alGS1FHD4TJtI3J7KPp+wOENSS7lwShXwjvDJSBX427415/ThhHIMhtH8DjoPaeY3e GAa0I4eLsC9lpR2SJHaxAQPJXqaFO7sxLTNGkhpUOWS+jFbR64ERk5H0FDr31EIXv4V4 DGKz0dAaGnFTdmKvPMws8x3P2dcvScgojIllR28+OaAPJYZow09dkKLOw2m6wAv8Y7cl SDC2XL6eovZXpV6qHPZFPSSywQsxLnTRtL3Qc1EwqXq2nVlv1Z6hzGbvGTk6pxHORBNt vemspfTSHS7RrDQsUwmdY24cq30K7qTCJ9Efuh1D/xjdPwtAZLjAxq56Nal9cUEtIvab m4Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=A6N/md54; 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=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r67si3802019wma.222.2017.09.27.09.08.49; Wed, 27 Sep 2017 09:08:49 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=A6N/md54; 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=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7BB3A689B37; Wed, 27 Sep 2017 19:08:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f175.google.com (mail-io0-f175.google.com [209.85.223.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C4E4689B03 for ; Wed, 27 Sep 2017 19:08:30 +0300 (EEST) Received: by mail-io0-f175.google.com with SMTP id l15so16106572iol.8 for ; Wed, 27 Sep 2017 09:08:42 -0700 (PDT) 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=84zoDmazl6ni9NgjYlLWca7HF76b7G7/k8RSL5oiSjo=; b=A6N/md54/lKiMY3rkigCqH9XrigH3ytqI/jEx9cr6IN25Ep5+ReE81TljwRjGAZtvW VCSQ9GEkSnkJosnL5yt6Idau0MmrFgaVD8pNb9PnyhVZL5BqlFZH76tvO5mmsyICI9Ih p6cB/nexI90uxUmdZpzEAanlnI59p+/hrQusBhj/8DQ0Ii6tepsIRs9BYSdPokv8a8yv kqOE/+iZ1BYaIgSitzjQehlbV/3kHZQV4UxFsCzbdH7HUvUBw2TiNXhnspcfspzjmBFe maPSsqXhIAIuh1v3a6vNajRQY3WdTi1FXb6r9++U18T7QIJLzXEFkSNAyUOOC8vqUAbl KAJQ== 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=84zoDmazl6ni9NgjYlLWca7HF76b7G7/k8RSL5oiSjo=; b=RK7IBtV8hAleNxLWcVLFup4SSFIIeg+W3twwa5GD+Mec5YYsgYSZkmLQf1tU9joKTB XeyI2F05OXZYHNkF2qVn+MGaV9rLASyydAyF4AUZRA6pS22kifh5hCXp9PTeIsvrn5tf Stbr8gB0iK4/YXsGD1lu5sfgLjAV5ga7/yfSkNHij6FYMLFNnlhhFx5yDv517I8eSBJ1 +IcwtIR3ktWDeSsYe0i3tY1HdSa6xD5M2eMHyWNygJjmxJ70hTNFDQrhJ35WqxsErHtK HS7Vtu4IWwPURuAB22/ycYC8VnJ5N4gQmPkacwXAGNlNz1JHuANo87pmU+KlWAvqR0N3 cExA== X-Gm-Message-State: AMCzsaU2/7xKmJJGQ2HsOXBJrK2fjfXIErNSfPdDHT3HG5KXdeOhT4KL eYr8ZW2VO7n0x62h1/TvA3zFWSjDItNdkqIoELg= X-Google-Smtp-Source: AOwi7QBNJhM0Kd1Mr5sS9Hx68Ei9txWAIz4m1r1BTTyKbpeFi26ayHmHuXvKzxiyS1zlKKs84gi/Lq0m9yaJsYFiy6s= X-Received: by 10.107.128.79 with SMTP id b76mr3015149iod.109.1506528520844; Wed, 27 Sep 2017 09:08:40 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.139.4 with HTTP; Wed, 27 Sep 2017 09:08:19 -0700 (PDT) From: Carl Eugen Hoyos Date: Wed, 27 Sep 2017 18:08:19 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/amr: Add amrnb and amrwb demuxers 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! The existing amr demuxer does not allow reading streams, it requires the 3GPP-conforming file header. Attached patch allows reading amrnb and amrwb from (live) streams, fixes ticket #6678. Please comment, Carl Eugen From 1b548fbd47f521d0c2a7b443ac2b1f2925e8bb41 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 27 Sep 2017 18:04:39 +0200 Subject: [PATCH] lavf/amr: Add amrnb and amrwb demuxers. Fixes ticket #6678. --- libavformat/Makefile | 2 ++ libavformat/allformats.c | 2 ++ libavformat/amr.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 4 ++-- 4 files changed, 60 insertions(+), 2 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index df709c29..c4c8713 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -87,6 +87,8 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o OBJS-$(CONFIG_AMR_MUXER) += amr.o +OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o +OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 405ddb5..dc8984e 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -63,6 +63,8 @@ static void register_all(void) REGISTER_MUXDEMUX(AIFF, aiff); REGISTER_DEMUXER (AIX, aix); REGISTER_MUXDEMUX(AMR, amr); + REGISTER_DEMUXER (AMRNB, amrnb); + REGISTER_DEMUXER (AMRWB, amrwb); REGISTER_DEMUXER (ANM, anm); REGISTER_DEMUXER (APC, apc); REGISTER_DEMUXER (APE, ape); diff --git a/libavformat/amr.c b/libavformat/amr.c index b5194a2..07f2315 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -176,6 +176,60 @@ AVInputFormat ff_amr_demuxer = { }; #endif +#if CONFIG_AMRNB_DEMUXER +static int amrnb_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_tag = MKTAG('s', 'a', 'm', 'r'); + st->codecpar->codec_id = AV_CODEC_ID_AMR_NB; + st->codecpar->sample_rate = 8000; + st->codecpar->channels = 1; + st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + avpriv_set_pts_info(st, 64, 1, 8000); + + return 0; +} + +AVInputFormat ff_amrnb_demuxer = { + .name = "amrnb", + .long_name = NULL_IF_CONFIG_SMALL("raw AMR-NB"), + .priv_data_size = sizeof(AMRContext), + .read_header = amrnb_read_header, + .read_packet = amr_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; +#endif + +#if CONFIG_AMRWB_DEMUXER +static int amrwb_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_tag = MKTAG('s', 'a', 'w', 'b'); + st->codecpar->codec_id = AV_CODEC_ID_AMR_WB; + st->codecpar->sample_rate = 16000; + st->codecpar->channels = 1; + st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + avpriv_set_pts_info(st, 64, 1, 16000); + + return 0; +} + +AVInputFormat ff_amrwb_demuxer = { + .name = "amrwb", + .long_name = NULL_IF_CONFIG_SMALL("raw AMR-WB"), + .priv_data_size = sizeof(AMRContext), + .read_header = amrwb_read_header, + .read_packet = amr_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; +#endif + #if CONFIG_AMR_MUXER AVOutputFormat ff_amr_muxer = { .name = "amr", diff --git a/libavformat/version.h b/libavformat/version.h index ac6edf7..878917d 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 57 -#define LIBAVFORMAT_VERSION_MINOR 82 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 83 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- 1.7.10.4