mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02: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>
202 lines
5.7 KiB
C
202 lines
5.7 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 <string.h>
|
|
|
|
#include "libavutil/common.h"
|
|
#include "libavutil/mem.h"
|
|
|
|
#include "bsf.h"
|
|
#include "cbs.h"
|
|
#include "cbs_h264.h"
|
|
#include "h264.h"
|
|
|
|
|
|
typedef struct H264RedundantPPSContext {
|
|
CodedBitstreamContext *input;
|
|
CodedBitstreamContext *output;
|
|
|
|
CodedBitstreamFragment access_unit;
|
|
|
|
int global_pic_init_qp;
|
|
int current_pic_init_qp;
|
|
int extradata_pic_init_qp;
|
|
} H264RedundantPPSContext;
|
|
|
|
|
|
static int h264_redundant_pps_fixup_pps(H264RedundantPPSContext *ctx,
|
|
H264RawPPS *pps)
|
|
{
|
|
// Record the current value of pic_init_qp in order to fix up
|
|
// following slices, then overwrite with the global value.
|
|
ctx->current_pic_init_qp = pps->pic_init_qp_minus26 + 26;
|
|
pps->pic_init_qp_minus26 = ctx->global_pic_init_qp - 26;
|
|
|
|
// Some PPSs have this set, so it must be set in all of them.
|
|
// (Slices which do not use such a PPS on input will still have
|
|
// *_weight_l*flag as zero and therefore write equivalently.)
|
|
pps->weighted_pred_flag = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx,
|
|
H264RawSliceHeader *slice)
|
|
{
|
|
int qp;
|
|
|
|
qp = ctx->current_pic_init_qp + slice->slice_qp_delta;
|
|
slice->slice_qp_delta = qp - ctx->global_pic_init_qp;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out)
|
|
{
|
|
H264RedundantPPSContext *ctx = bsf->priv_data;
|
|
AVPacket *in;
|
|
CodedBitstreamFragment *au = &ctx->access_unit;
|
|
int au_has_sps;
|
|
int err, i;
|
|
|
|
err = ff_bsf_get_packet(bsf, &in);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
err = ff_cbs_read_packet(ctx->input, au, in);
|
|
if (err < 0)
|
|
goto fail;
|
|
|
|
au_has_sps = 0;
|
|
for (i = 0; i < au->nb_units; i++) {
|
|
CodedBitstreamUnit *nal = &au->units[i];
|
|
|
|
if (nal->type == H264_NAL_SPS)
|
|
au_has_sps = 1;
|
|
if (nal->type == H264_NAL_PPS) {
|
|
err = h264_redundant_pps_fixup_pps(ctx, nal->content);
|
|
if (err < 0)
|
|
goto fail;
|
|
if (!au_has_sps) {
|
|
av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS "
|
|
"at %"PRId64".\n", in->pts);
|
|
err = ff_cbs_delete_unit(ctx->input, au, i);
|
|
if (err < 0)
|
|
goto fail;
|
|
}
|
|
}
|
|
if (nal->type == H264_NAL_SLICE ||
|
|
nal->type == H264_NAL_IDR_SLICE) {
|
|
H264RawSlice *slice = nal->content;
|
|
h264_redundant_pps_fixup_slice(ctx, &slice->header);
|
|
}
|
|
}
|
|
|
|
err = ff_cbs_write_packet(ctx->output, out, au);
|
|
if (err < 0)
|
|
goto fail;
|
|
|
|
|
|
err = av_packet_copy_props(out, in);
|
|
if (err < 0)
|
|
goto fail;
|
|
|
|
err = 0;
|
|
fail:
|
|
ff_cbs_fragment_reset(ctx->output, au);
|
|
av_packet_free(&in);
|
|
if (err < 0)
|
|
av_packet_unref(out);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int h264_redundant_pps_init(AVBSFContext *bsf)
|
|
{
|
|
H264RedundantPPSContext *ctx = bsf->priv_data;
|
|
CodedBitstreamFragment *au = &ctx->access_unit;
|
|
int err, i;
|
|
|
|
err = ff_cbs_init(&ctx->input, AV_CODEC_ID_H264, bsf);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
err = ff_cbs_init(&ctx->output, AV_CODEC_ID_H264, bsf);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
ctx->global_pic_init_qp = 26;
|
|
|
|
if (bsf->par_in->extradata) {
|
|
err = ff_cbs_read_extradata(ctx->input, au, bsf->par_in);
|
|
if (err < 0) {
|
|
av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n");
|
|
goto fail;
|
|
}
|
|
|
|
for (i = 0; i < au->nb_units; i++) {
|
|
if (au->units[i].type == H264_NAL_PPS) {
|
|
err = h264_redundant_pps_fixup_pps(ctx, au->units[i].content);
|
|
if (err < 0)
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
ctx->extradata_pic_init_qp = ctx->current_pic_init_qp;
|
|
err = ff_cbs_write_extradata(ctx->output, bsf->par_out, au);
|
|
if (err < 0) {
|
|
av_log(bsf, AV_LOG_ERROR, "Failed to write extradata.\n");
|
|
goto fail;
|
|
}
|
|
}
|
|
|
|
err = 0;
|
|
fail:
|
|
ff_cbs_fragment_reset(ctx->output, au);
|
|
return err;
|
|
}
|
|
|
|
static void h264_redundant_pps_flush(AVBSFContext *bsf)
|
|
{
|
|
H264RedundantPPSContext *ctx = bsf->priv_data;
|
|
ctx->current_pic_init_qp = ctx->extradata_pic_init_qp;
|
|
}
|
|
|
|
static void h264_redundant_pps_close(AVBSFContext *bsf)
|
|
{
|
|
H264RedundantPPSContext *ctx = bsf->priv_data;
|
|
|
|
ff_cbs_fragment_free(ctx->input, &ctx->access_unit);
|
|
ff_cbs_close(&ctx->input);
|
|
ff_cbs_close(&ctx->output);
|
|
}
|
|
|
|
static const enum AVCodecID h264_redundant_pps_codec_ids[] = {
|
|
AV_CODEC_ID_H264, AV_CODEC_ID_NONE,
|
|
};
|
|
|
|
const AVBitStreamFilter ff_h264_redundant_pps_bsf = {
|
|
.name = "h264_redundant_pps",
|
|
.priv_data_size = sizeof(H264RedundantPPSContext),
|
|
.init = &h264_redundant_pps_init,
|
|
.flush = &h264_redundant_pps_flush,
|
|
.close = &h264_redundant_pps_close,
|
|
.filter = &h264_redundant_pps_filter,
|
|
.codec_ids = h264_redundant_pps_codec_ids,
|
|
};
|