c581cb4e4f
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
112 lines
3.7 KiB
C
112 lines
3.7 KiB
C
/*
|
|
* Audio Frame Queue
|
|
* Copyright (c) 2012 Justin Ruggles
|
|
*
|
|
* 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 "libavutil/common.h"
|
|
#include "audio_frame_queue.h"
|
|
#include "internal.h"
|
|
#include "libavutil/avassert.h"
|
|
|
|
void ff_af_queue_init(AVCodecContext *avctx, AudioFrameQueue *afq)
|
|
{
|
|
afq->avctx = avctx;
|
|
afq->remaining_delay = avctx->delay;
|
|
afq->remaining_samples = avctx->delay;
|
|
afq->frame_count = 0;
|
|
}
|
|
|
|
void ff_af_queue_close(AudioFrameQueue *afq)
|
|
{
|
|
if(afq->frame_count)
|
|
av_log(afq->avctx, AV_LOG_WARNING, "%d frames left in que on closing\n", afq->frame_count);
|
|
av_freep(&afq->frames);
|
|
memset(afq, 0, sizeof(*afq));
|
|
}
|
|
|
|
int ff_af_queue_add(AudioFrameQueue *afq, const AVFrame *f)
|
|
{
|
|
AudioFrame *new = av_fast_realloc(afq->frames, &afq->frame_alloc, sizeof(*afq->frames)*(afq->frame_count+1));
|
|
if(!new)
|
|
return AVERROR(ENOMEM);
|
|
afq->frames = new;
|
|
new += afq->frame_count;
|
|
|
|
/* get frame parameters */
|
|
new->duration = f->nb_samples;
|
|
new->duration += afq->remaining_delay;
|
|
if (f->pts != AV_NOPTS_VALUE) {
|
|
new->pts = av_rescale_q(f->pts,
|
|
afq->avctx->time_base,
|
|
(AVRational){ 1, afq->avctx->sample_rate });
|
|
new->pts -= afq->remaining_delay;
|
|
if(afq->frame_count && new[-1].pts >= new->pts)
|
|
av_log(afq->avctx, AV_LOG_WARNING, "Que input is backward in time\n");
|
|
} else {
|
|
new->pts = AV_NOPTS_VALUE;
|
|
}
|
|
afq->remaining_delay = 0;
|
|
|
|
/* add frame sample count */
|
|
afq->remaining_samples += f->nb_samples;
|
|
|
|
afq->frame_count++;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void ff_af_queue_remove(AudioFrameQueue *afq, int nb_samples, int64_t *pts,
|
|
int *duration)
|
|
{
|
|
int64_t out_pts = AV_NOPTS_VALUE;
|
|
int removed_samples = 0;
|
|
int i;
|
|
|
|
if (afq->frame_count || afq->frame_alloc) {
|
|
if (afq->frames->pts != AV_NOPTS_VALUE)
|
|
out_pts = afq->frames->pts;
|
|
}
|
|
if(!afq->frame_count)
|
|
av_log(afq->avctx, AV_LOG_WARNING, "Trying to remove %d samples, but que empty\n", nb_samples);
|
|
if (pts)
|
|
*pts = ff_samples_to_time_base(afq->avctx, out_pts);
|
|
|
|
for(i=0; nb_samples && i<afq->frame_count; i++){
|
|
int n= FFMIN(afq->frames[i].duration, nb_samples);
|
|
afq->frames[i].duration -= n;
|
|
nb_samples -= n;
|
|
removed_samples += n;
|
|
if(afq->frames[i].pts != AV_NOPTS_VALUE)
|
|
afq->frames[i].pts += n;
|
|
}
|
|
i -= i && afq->frames[i-1].duration;
|
|
memmove(afq->frames, afq->frames + i, sizeof(*afq->frames) * (afq->frame_count - i));
|
|
afq->frame_count -= i;
|
|
|
|
if(nb_samples){
|
|
av_assert0(!afq->frame_count);
|
|
if(afq->frames && afq->frames[0].pts != AV_NOPTS_VALUE)
|
|
afq->frames[0].pts += nb_samples;
|
|
av_log(afq->avctx, AV_LOG_DEBUG, "Trying to remove %d more samples than are in the que\n", nb_samples);
|
|
}
|
|
if (duration)
|
|
*duration = ff_samples_to_time_base(afq->avctx, removed_samples);
|
|
}
|
|
|