mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 05:16:38 +00:00
b8c45bbcbc
Currently, a fragment's unit array is constantly reallocated during splitting of a packet. This commit changes this: One can keep the units array by distinguishing between the number of allocated and the number of valid units in the units array. The more units a packet is split into, the bigger the benefit. So MPEG-2 benefits the most; for a video coming from an NTSC-DVD (usually 32 units per frame) the average cost of cbs_insert_unit (for a single unit) went down from 6717 decicycles to 450 decicycles (based upon 10 runs with 4194304 runs each); if each packet consists of only one unit, it went down from 2425 to 448; for a H.264 video where most packets contain nine units, it went from 4431 to 450. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@googlemail.com>
114 lines
3.2 KiB
C
114 lines
3.2 KiB
C
/*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "libavutil/avstring.h"
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/log.h"
|
|
|
|
#include "bsf.h"
|
|
#include "cbs.h"
|
|
|
|
|
|
typedef struct TraceHeadersContext {
|
|
CodedBitstreamContext *cbc;
|
|
CodedBitstreamFragment fragment;
|
|
} TraceHeadersContext;
|
|
|
|
|
|
static int trace_headers_init(AVBSFContext *bsf)
|
|
{
|
|
TraceHeadersContext *ctx = bsf->priv_data;
|
|
int err;
|
|
|
|
err = ff_cbs_init(&ctx->cbc, bsf->par_in->codec_id, bsf);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
ctx->cbc->trace_enable = 1;
|
|
ctx->cbc->trace_level = AV_LOG_INFO;
|
|
|
|
if (bsf->par_in->extradata) {
|
|
CodedBitstreamFragment *frag = &ctx->fragment;
|
|
|
|
av_log(bsf, AV_LOG_INFO, "Extradata\n");
|
|
|
|
err = ff_cbs_read_extradata(ctx->cbc, frag, bsf->par_in);
|
|
|
|
ff_cbs_fragment_reset(ctx->cbc, frag);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
|
|
static void trace_headers_close(AVBSFContext *bsf)
|
|
{
|
|
TraceHeadersContext *ctx = bsf->priv_data;
|
|
|
|
ff_cbs_fragment_free(ctx->cbc, &ctx->fragment);
|
|
ff_cbs_close(&ctx->cbc);
|
|
}
|
|
|
|
static int trace_headers(AVBSFContext *bsf, AVPacket *pkt)
|
|
{
|
|
TraceHeadersContext *ctx = bsf->priv_data;
|
|
CodedBitstreamFragment *frag = &ctx->fragment;
|
|
char tmp[256] = { 0 };
|
|
int err;
|
|
|
|
err = ff_bsf_get_packet_ref(bsf, pkt);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (pkt->flags & AV_PKT_FLAG_KEY)
|
|
av_strlcat(tmp, ", key frame", sizeof(tmp));
|
|
if (pkt->flags & AV_PKT_FLAG_CORRUPT)
|
|
av_strlcat(tmp, ", corrupt", sizeof(tmp));
|
|
|
|
if (pkt->pts != AV_NOPTS_VALUE)
|
|
av_strlcatf(tmp, sizeof(tmp), ", pts %"PRId64, pkt->pts);
|
|
else
|
|
av_strlcat(tmp, ", no pts", sizeof(tmp));
|
|
if (pkt->dts != AV_NOPTS_VALUE)
|
|
av_strlcatf(tmp, sizeof(tmp), ", dts %"PRId64, pkt->dts);
|
|
else
|
|
av_strlcat(tmp, ", no dts", sizeof(tmp));
|
|
if (pkt->duration > 0)
|
|
av_strlcatf(tmp, sizeof(tmp), ", duration %"PRId64, pkt->duration);
|
|
|
|
av_log(bsf, AV_LOG_INFO, "Packet: %d bytes%s.\n", pkt->size, tmp);
|
|
|
|
err = ff_cbs_read_packet(ctx->cbc, frag, pkt);
|
|
|
|
ff_cbs_fragment_reset(ctx->cbc, frag);
|
|
|
|
if (err < 0)
|
|
av_packet_unref(pkt);
|
|
return err;
|
|
}
|
|
|
|
const AVBitStreamFilter ff_trace_headers_bsf = {
|
|
.name = "trace_headers",
|
|
.priv_data_size = sizeof(TraceHeadersContext),
|
|
.init = &trace_headers_init,
|
|
.close = &trace_headers_close,
|
|
.filter = &trace_headers,
|
|
.codec_ids = ff_cbs_all_codec_ids,
|
|
};
|