From patchwork Sun May 28 20:09:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3753 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1172836vsk; Sun, 28 May 2017 13:10:25 -0700 (PDT) X-Received: by 10.223.129.4 with SMTP id 4mr8239829wrm.153.1496002225432; Sun, 28 May 2017 13:10:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496002225; cv=none; d=google.com; s=arc-20160816; b=fjJRTM91AL6DbOGLrbfwUb9aURsbco6DzH/LCQYQJfRfUZr9yASnM+YW7t2cyq5SoH FvBtd/O06JN8HNKYsREtQ/eJE0fjOpRTs0XKGU+K6DIHgXBKkDQqC/u5aQu239pHYUiG TyubQTvv/+PJQAEuQ46edg253ONfdgERI7pJf8WqKg7hly3/qlDrVLNPJ4wtMdR6hdze 2jhsJqeX69KLrvty4h5wZ+Qe5CRriGUzXbsce6eyOuyHBXZIyIw66qquTWs4UzNZ8pIl XqOJkZ53hJIxjh3uW1L0vRlYEu9obAMoH+mrPxUXxoaiY6cdHHLvlY0VGf/FkPhsqWq1 WZMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=FSYIZs95U7hyW4xqt1LPQRDEAHDDb+rUencgRdkIkGA=; b=r3gW7vM8GuyKYC8QxwPajOzW2gWxCCZgPJKxH4h2Su2ivULRdM8V4gI6ysYIStYmKM BmTUhWKyHuAE2H//bTgJXPLp/WIqcPQILJB+iXjdLNO4rzjWbQ2UYQIFJcLhFMifu8Fp snpt/gmsfRDmP+CpCR8FrsAEjhTVxQrt54hGqf6arPqQr8BeSGT1+tOjViE2fSXSqalf i47QuWDb3DFrmUQoL5s3mvjjcnL23ziCsT3nf4G04PwqzXU4ggbkeTReeZ2itEhPfkV5 5zaAdSulHydVn8dx1x9HNecJtBB6LENioeFjX/vc+H+LhJEoBWoVO1lTGHaIBpQcLCv3 LLYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; 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 i16si7746458wrb.162.2017.05.28.13.10.23; Sun, 28 May 2017 13:10:25 -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; 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 BB41D680481; Sun, 28 May 2017 23:10:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDA6D680164 for ; Sun, 28 May 2017 23:10:09 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id o85so6777639qkh.0 for ; Sun, 28 May 2017 13:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=o2Q0gHyVO+OK/ecGeNym2F1YdJwzGaFqvNa2hMctCVg=; b=E1eMffITU0k+MtZ7sdsDK9qj4HC+Z0p6MuawxFzc3ObYi/jq5Rt9n+RaTWmD8uckKu pcZ2nKTkP5uywHKeGDMOMSM1sWH88IKvr/nH3jVZEwEP8WqVOeaXHjywrFvLI2F6dUml Dt2ILuDV1EYcccw0CivQrhdi6VftUwntK1DcE7m+BiRH5ynIDmlqLbsh3/Zz0VgaTlNO Zbh0hWYBr6vo1Fud5obbjUjrA3uDg0cqxAtcMHWg1HzlI/jZaG06pWp9rEVNJrHj4kNL c9rWK68kQISM8OOXSCtWrNK5dQYeI6hTvgR7/4d1gVz4cWTSK+RxKshQE9DqElXSDOxr A2cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=o2Q0gHyVO+OK/ecGeNym2F1YdJwzGaFqvNa2hMctCVg=; b=FDWK7AFisTmNkKr1F/JfM66gByqKq7aWvitBS91SLZ7U51tu85Dd1ZqN30536NT3v0 SYoBY6HmMUcStEQ1ossDn88PD7V0AXlFI8R2kN/JlnUL0hc8xpza7LKR8wQEwZUBv8wy IlTzPD1oaHSAukLBAHVxOXmjHJzZBXT/RULxKbQrPN2TbDRPf59ozU9SbPBlBFapjRHD 1c0UVoPWX7U9qTTX4VSJDryhbZiqUFXN8V7VTbKWGRQcRo/3/0hYdtg8WRyxQ6vf+C3m 9yKckxVXOuIMp636vnlfnjy+hXlJrNJQu5hdy7U5Z8VCW6E921bLUTGUnXT6joSNmKaN QrTg== X-Gm-Message-State: AODbwcAU1KLTWDyRW2qMXNXUYTUdo49AzOeExbLTNqm7EYW6HXmfI6Wc vF/oAi3wMZe4zcFA X-Received: by 10.55.64.65 with SMTP id n62mr13989985qka.83.1496002212240; Sun, 28 May 2017 13:10:12 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id t66sm4788793qkt.42.2017.05.28.13.10.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 May 2017 13:10:11 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 May 2017 17:09:44 -0300 Message-Id: <20170528200944.6852-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH] avformat/oggenc: add ogg_init() and ogg_free() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/oggenc.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 0713a13a70..7c1115afd6 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -483,7 +483,7 @@ static void ogg_write_pages(AVFormatContext *s, int flush) ogg->page_list = p; } -static int ogg_write_header(AVFormatContext *s) +static int ogg_init(AVFormatContext *s) { OGGContext *ogg = s->priv_data; OGGStreamContext *oggstream = NULL; @@ -617,8 +617,16 @@ static int ogg_write_header(AVFormatContext *s) } } + return 0; +} + +static int ogg_write_header(AVFormatContext *s) +{ + OGGStreamContext *oggstream = NULL; + int i, j; + for (j = 0; j < s->nb_streams; j++) { - OGGStreamContext *oggstream = s->streams[j]->priv_data; + oggstream = s->streams[j]->priv_data; ogg_buffer_data(s, s->streams[j], oggstream->header[0], oggstream->header_len[0], 0, 1); oggstream->page.flags |= 2; // bos @@ -626,7 +634,7 @@ static int ogg_write_header(AVFormatContext *s) } for (j = 0; j < s->nb_streams; j++) { AVStream *st = s->streams[j]; - OGGStreamContext *oggstream = st->priv_data; + oggstream = st->priv_data; for (i = 1; i < 3; i++) { if (oggstream->header_len[i]) ogg_buffer_data(s, st, oggstream->header[i], @@ -725,6 +733,13 @@ static int ogg_write_trailer(AVFormatContext *s) ogg_write_pages(s, 1); + return 0; +} + +static void ogg_free(AVFormatContext *s) +{ + int i; + for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; OGGStreamContext *oggstream = st->priv_data; @@ -737,7 +752,6 @@ static int ogg_write_trailer(AVFormatContext *s) av_freep(&oggstream->header[1]); av_freep(&st->priv_data); } - return 0; } #if CONFIG_OGG_MUXER @@ -761,9 +775,11 @@ AVOutputFormat ff_ogg_muxer = { .audio_codec = CONFIG_LIBVORBIS_ENCODER ? AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC, .video_codec = AV_CODEC_ID_THEORA, + .init = ogg_init, .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, + .deinit = ogg_free, .flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .priv_class = &ogg_muxer_class, }; @@ -778,9 +794,11 @@ AVOutputFormat ff_oga_muxer = { .extensions = "oga", .priv_data_size = sizeof(OGGContext), .audio_codec = AV_CODEC_ID_FLAC, + .init = ogg_init, .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, + .deinit = ogg_free, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .priv_class = &oga_muxer_class, }; @@ -798,9 +816,11 @@ AVOutputFormat ff_ogv_muxer = { AV_CODEC_ID_VORBIS : AV_CODEC_ID_FLAC, .video_codec = CONFIG_LIBTHEORA_ENCODER ? AV_CODEC_ID_THEORA : AV_CODEC_ID_VP8, + .init = ogg_init, .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, + .deinit = ogg_free, .flags = AVFMT_TS_NEGATIVE | AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .priv_class = &ogv_muxer_class, }; @@ -815,9 +835,11 @@ AVOutputFormat ff_spx_muxer = { .extensions = "spx", .priv_data_size = sizeof(OGGContext), .audio_codec = AV_CODEC_ID_SPEEX, + .init = ogg_init, .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, + .deinit = ogg_free, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .priv_class = &spx_muxer_class, }; @@ -832,9 +854,11 @@ AVOutputFormat ff_opus_muxer = { .extensions = "opus", .priv_data_size = sizeof(OGGContext), .audio_codec = AV_CODEC_ID_OPUS, + .init = ogg_init, .write_header = ogg_write_header, .write_packet = ogg_write_packet, .write_trailer = ogg_write_trailer, + .deinit = ogg_free, .flags = AVFMT_TS_NEGATIVE | AVFMT_ALLOW_FLUSH, .priv_class = &opus_muxer_class, };