From 0a69ca656b7178c260f68d50d07b2e16a073050c Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 15 Jan 2023 13:03:47 +0100 Subject: examples: rename remuxing to remux --- configure | 4 +- doc/examples/Makefile | 2 +- doc/examples/Makefile.example | 2 +- doc/examples/remux.c | 198 ++++++++++++++++++++++++++++++++++++++++++ doc/examples/remuxing.c | 198 ------------------------------------------ 5 files changed, 202 insertions(+), 202 deletions(-) create mode 100644 doc/examples/remux.c delete mode 100644 doc/examples/remuxing.c diff --git a/configure b/configure index e72d253e64..229880f635 100755 --- a/configure +++ b/configure @@ -1725,7 +1725,7 @@ EXAMPLE_LIST=" hw_decode_example mux_example qsv_decode_example - remuxing_example + remux_example resampling_audio_example scaling_video_example show_metadata_example @@ -3789,7 +3789,7 @@ filter_audio_example_deps="avfilter avutil" hw_decode_example_deps="avcodec avformat avutil" mux_example_deps="avcodec avformat avutil swscale" qsv_decode_example_deps="avcodec avutil libmfx h264_qsv_decoder" -remuxing_example_deps="avcodec avformat avutil" +remux_example_deps="avcodec avformat avutil" resampling_audio_example_deps="avutil swresample" scaling_video_example_deps="avutil swscale" show_metadata_example_deps="avformat avutil" diff --git a/doc/examples/Makefile b/doc/examples/Makefile index 9342fae744..8cc9d4e80e 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -13,7 +13,7 @@ EXAMPLES-$(CONFIG_FILTER_AUDIO_EXAMPLE) += filter_audio EXAMPLES-$(CONFIG_HW_DECODE_EXAMPLE) += hw_decode EXAMPLES-$(CONFIG_MUX_EXAMPLE) += mux EXAMPLES-$(CONFIG_QSV_DECODE_EXAMPLE) += qsv_decode -EXAMPLES-$(CONFIG_REMUXING_EXAMPLE) += remuxing +EXAMPLES-$(CONFIG_REMUX_EXAMPLE) += remux EXAMPLES-$(CONFIG_RESAMPLING_AUDIO_EXAMPLE) += resampling_audio EXAMPLES-$(CONFIG_SCALING_VIDEO_EXAMPLE) += scaling_video EXAMPLES-$(CONFIG_SHOW_METADATA_EXAMPLE) += show_metadata diff --git a/doc/examples/Makefile.example b/doc/examples/Makefile.example index 920c7a2362..ff30f9a3da 100644 --- a/doc/examples/Makefile.example +++ b/doc/examples/Makefile.example @@ -25,7 +25,7 @@ EXAMPLES=\ extract_mvs \ hw_decode \ mux \ - remuxing \ + remux \ resampling_audio \ scaling_video \ show_metadata \ diff --git a/doc/examples/remux.c b/doc/examples/remux.c new file mode 100644 index 0000000000..8855199c60 --- /dev/null +++ b/doc/examples/remux.c @@ -0,0 +1,198 @@ +/* + * Copyright (c) 2013 Stefano Sabatini + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * @file + * libavformat/libavcodec demuxing and muxing API example. + * + * Remux streams from one container format to another. + * @example remux.c + */ + +#include +#include + +static void log_packet(const AVFormatContext *fmt_ctx, const AVPacket *pkt, const char *tag) +{ + AVRational *time_base = &fmt_ctx->streams[pkt->stream_index]->time_base; + + printf("%s: pts:%s pts_time:%s dts:%s dts_time:%s duration:%s duration_time:%s stream_index:%d\n", + tag, + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, time_base), + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, time_base), + av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, time_base), + pkt->stream_index); +} + +int main(int argc, char **argv) +{ + const AVOutputFormat *ofmt = NULL; + AVFormatContext *ifmt_ctx = NULL, *ofmt_ctx = NULL; + AVPacket *pkt = NULL; + const char *in_filename, *out_filename; + int ret, i; + int stream_index = 0; + int *stream_mapping = NULL; + int stream_mapping_size = 0; + + if (argc < 3) { + printf("usage: %s input output\n" + "API example program to remux a media file with libavformat and libavcodec.\n" + "The output format is guessed according to the file extension.\n" + "\n", argv[0]); + return 1; + } + + in_filename = argv[1]; + out_filename = argv[2]; + + pkt = av_packet_alloc(); + if (!pkt) { + fprintf(stderr, "Could not allocate AVPacket\n"); + return 1; + } + + if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { + fprintf(stderr, "Could not open input file '%s'", in_filename); + goto end; + } + + if ((ret = avformat_find_stream_info(ifmt_ctx, 0)) < 0) { + fprintf(stderr, "Failed to retrieve input stream information"); + goto end; + } + + av_dump_format(ifmt_ctx, 0, in_filename, 0); + + avformat_alloc_output_context2(&ofmt_ctx, NULL, NULL, out_filename); + if (!ofmt_ctx) { + fprintf(stderr, "Could not create output context\n"); + ret = AVERROR_UNKNOWN; + goto end; + } + + stream_mapping_size = ifmt_ctx->nb_streams; + stream_mapping = av_calloc(stream_mapping_size, sizeof(*stream_mapping)); + if (!stream_mapping) { + ret = AVERROR(ENOMEM); + goto end; + } + + ofmt = ofmt_ctx->oformat; + + for (i = 0; i < ifmt_ctx->nb_streams; i++) { + AVStream *out_stream; + AVStream *in_stream = ifmt_ctx->streams[i]; + AVCodecParameters *in_codecpar = in_stream->codecpar; + + if (in_codecpar->codec_type != AVMEDIA_TYPE_AUDIO && + in_codecpar->codec_type != AVMEDIA_TYPE_VIDEO && + in_codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { + stream_mapping[i] = -1; + continue; + } + + stream_mapping[i] = stream_index++; + + out_stream = avformat_new_stream(ofmt_ctx, NULL); + if (!out_stream) { + fprintf(stderr, "Failed allocating output stream\n"); + ret = AVERROR_UNKNOWN; + goto end; + } + + ret = avcodec_parameters_copy(out_stream->codecpar, in_codecpar); + if (ret < 0) { + fprintf(stderr, "Failed to copy codec parameters\n"); + goto end; + } + out_stream->codecpar->codec_tag = 0; + } + av_dump_format(ofmt_ctx, 0, out_filename, 1); + + if (!(ofmt->flags & AVFMT_NOFILE)) { + ret = avio_open(&ofmt_ctx->pb, out_filename, AVIO_FLAG_WRITE); + if (ret < 0) { + fprintf(stderr, "Could not open output file '%s'", out_filename); + goto end; + } + } + + ret = avformat_write_header(ofmt_ctx, NULL); + if (ret < 0) { + fprintf(stderr, "Error occurred when opening output file\n"); + goto end; + } + + while (1) { + AVStream *in_stream, *out_stream; + + ret = av_read_frame(ifmt_ctx, pkt); + if (ret < 0) + break; + + in_stream = ifmt_ctx->streams[pkt->stream_index]; + if (pkt->stream_index >= stream_mapping_size || + stream_mapping[pkt->stream_index] < 0) { + av_packet_unref(pkt); + continue; + } + + pkt->stream_index = stream_mapping[pkt->stream_index]; + out_stream = ofmt_ctx->streams[pkt->stream_index]; + log_packet(ifmt_ctx, pkt, "in"); + + /* copy packet */ + av_packet_rescale_ts(pkt, in_stream->time_base, out_stream->time_base); + pkt->pos = -1; + log_packet(ofmt_ctx, pkt, "out"); + + ret = av_interleaved_write_frame(ofmt_ctx, pkt); + /* pkt is now blank (av_interleaved_write_frame() takes ownership of + * its contents and resets pkt), so that no unreferencing is necessary. + * This would be different if one used av_write_frame(). */ + if (ret < 0) { + fprintf(stderr, "Error muxing packet\n"); + break; + } + } + + av_write_trailer(ofmt_ctx); +end: + av_packet_free(&pkt); + + avformat_close_input(&ifmt_ctx); + + /* close output */ + if (ofmt_ctx && !(ofmt->flags & AVFMT_NOFILE)) + avio_closep(&ofmt_ctx->pb); + avformat_free_context(ofmt_ctx); + + av_freep(&stream_mapping); + + if (ret < 0 && ret != AVERROR_EOF) { + fprintf(stderr, "Error occurred: %s\n", av_err2str(ret)); + return 1; + } + + return 0; +} diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c deleted file mode 100644 index 2657f9dc66..0000000000 --- a/doc/examples/remuxing.c +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright (c) 2013 Stefano Sabatini - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -/** - * @file - * libavformat/libavcodec demuxing and muxing API example. - * - * Remux streams from one container format to another. - * @example remuxing.c - */ - -#include -#include - -static void log_packet(const AVFormatContext *fmt_ctx, const AVPacket *pkt, const char *tag) -{ - AVRational *time_base = &fmt_ctx->streams[pkt->stream_index]->time_base; - - printf("%s: pts:%s pts_time:%s dts:%s dts_time:%s duration:%s duration_time:%s stream_index:%d\n", - tag, - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, time_base), - av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, time_base), - pkt->stream_index); -} - -int main(int argc, char **argv) -{ - const AVOutputFormat *ofmt = NULL; - AVFormatContext *ifmt_ctx = NULL, *ofmt_ctx = NULL; - AVPacket *pkt = NULL; - const char *in_filename, *out_filename; - int ret, i; - int stream_index = 0; - int *stream_mapping = NULL; - int stream_mapping_size = 0; - - if (argc < 3) { - printf("usage: %s input output\n" - "API example program to remux a media file with libavformat and libavcodec.\n" - "The output format is guessed according to the file extension.\n" - "\n", argv[0]); - return 1; - } - - in_filename = argv[1]; - out_filename = argv[2]; - - pkt = av_packet_alloc(); - if (!pkt) { - fprintf(stderr, "Could not allocate AVPacket\n"); - return 1; - } - - if ((ret = avformat_open_input(&ifmt_ctx, in_filename, 0, 0)) < 0) { - fprintf(stderr, "Could not open input file '%s'", in_filename); - goto end; - } - - if ((ret = avformat_find_stream_info(ifmt_ctx, 0)) < 0) { - fprintf(stderr, "Failed to retrieve input stream information"); - goto end; - } - - av_dump_format(ifmt_ctx, 0, in_filename, 0); - - avformat_alloc_output_context2(&ofmt_ctx, NULL, NULL, out_filename); - if (!ofmt_ctx) { - fprintf(stderr, "Could not create output context\n"); - ret = AVERROR_UNKNOWN; - goto end; - } - - stream_mapping_size = ifmt_ctx->nb_streams; - stream_mapping = av_calloc(stream_mapping_size, sizeof(*stream_mapping)); - if (!stream_mapping) { - ret = AVERROR(ENOMEM); - goto end; - } - - ofmt = ofmt_ctx->oformat; - - for (i = 0; i < ifmt_ctx->nb_streams; i++) { - AVStream *out_stream; - AVStream *in_stream = ifmt_ctx->streams[i]; - AVCodecParameters *in_codecpar = in_stream->codecpar; - - if (in_codecpar->codec_type != AVMEDIA_TYPE_AUDIO && - in_codecpar->codec_type != AVMEDIA_TYPE_VIDEO && - in_codecpar->codec_type != AVMEDIA_TYPE_SUBTITLE) { - stream_mapping[i] = -1; - continue; - } - - stream_mapping[i] = stream_index++; - - out_stream = avformat_new_stream(ofmt_ctx, NULL); - if (!out_stream) { - fprintf(stderr, "Failed allocating output stream\n"); - ret = AVERROR_UNKNOWN; - goto end; - } - - ret = avcodec_parameters_copy(out_stream->codecpar, in_codecpar); - if (ret < 0) { - fprintf(stderr, "Failed to copy codec parameters\n"); - goto end; - } - out_stream->codecpar->codec_tag = 0; - } - av_dump_format(ofmt_ctx, 0, out_filename, 1); - - if (!(ofmt->flags & AVFMT_NOFILE)) { - ret = avio_open(&ofmt_ctx->pb, out_filename, AVIO_FLAG_WRITE); - if (ret < 0) { - fprintf(stderr, "Could not open output file '%s'", out_filename); - goto end; - } - } - - ret = avformat_write_header(ofmt_ctx, NULL); - if (ret < 0) { - fprintf(stderr, "Error occurred when opening output file\n"); - goto end; - } - - while (1) { - AVStream *in_stream, *out_stream; - - ret = av_read_frame(ifmt_ctx, pkt); - if (ret < 0) - break; - - in_stream = ifmt_ctx->streams[pkt->stream_index]; - if (pkt->stream_index >= stream_mapping_size || - stream_mapping[pkt->stream_index] < 0) { - av_packet_unref(pkt); - continue; - } - - pkt->stream_index = stream_mapping[pkt->stream_index]; - out_stream = ofmt_ctx->streams[pkt->stream_index]; - log_packet(ifmt_ctx, pkt, "in"); - - /* copy packet */ - av_packet_rescale_ts(pkt, in_stream->time_base, out_stream->time_base); - pkt->pos = -1; - log_packet(ofmt_ctx, pkt, "out"); - - ret = av_interleaved_write_frame(ofmt_ctx, pkt); - /* pkt is now blank (av_interleaved_write_frame() takes ownership of - * its contents and resets pkt), so that no unreferencing is necessary. - * This would be different if one used av_write_frame(). */ - if (ret < 0) { - fprintf(stderr, "Error muxing packet\n"); - break; - } - } - - av_write_trailer(ofmt_ctx); -end: - av_packet_free(&pkt); - - avformat_close_input(&ifmt_ctx); - - /* close output */ - if (ofmt_ctx && !(ofmt->flags & AVFMT_NOFILE)) - avio_closep(&ofmt_ctx->pb); - avformat_free_context(ofmt_ctx); - - av_freep(&stream_mapping); - - if (ret < 0 && ret != AVERROR_EOF) { - fprintf(stderr, "Error occurred: %s\n", av_err2str(ret)); - return 1; - } - - return 0; -} -- cgit v1.2.1