Decoding Sintel.2010.1080p.mkv with 4 threads on an i7 2600K goes from
260s to 244s.
---
avconv.c | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/avconv.c b/avconv.c
index b47c91f..c4cf32f 100644
--- a/avconv.c
+++ b/avconv.c
@@ -50,6 +50,7 @@
#if CONFIG_AVFILTER
# include "libavfilter/avfilter.h"
# include "libavfilter/avfiltergraph.h"
+# include "libavfilter/buffersrc.h"
# include "libavfilter/vsrc_buffer.h"
#endif
@@ -524,6 +525,13 @@ static void codec_release_buffer(AVCodecContext *s,
AVFrame *frame)
unref_buffer(ist, buf);
}
+static void filter_release_buffer(AVFilterBuffer *fb)
+{
+ FrameBuffer *buf = fb->priv;
+ av_free(fb);
+ unref_buffer(buf->ist, buf);
+}
+
#if CONFIG_AVFILTER
static int configure_video_filters(InputStream *ist, OutputStream *ost)
@@ -1865,6 +1873,7 @@ static int transcode_video(InputStream *ist, AVPacket
*pkt, int *got_output, int
float quality;
#if CONFIG_AVFILTER
int frame_available = 1;
+ AVRational pixel_aspect;
#endif
if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame()))
@@ -1910,21 +1919,37 @@ static int transcode_video(InputStream *ist, AVPacket
*pkt, int *got_output, int
continue;
#if CONFIG_AVFILTER
- if (ost->input_video_filter) {
- AVRational sar;
- if (ist->st->sample_aspect_ratio.num)
- sar = ist->st->sample_aspect_ratio;
- else
- sar = ist->st->codec->sample_aspect_ratio;
- av_vsrc_buffer_add_frame(ost->input_video_filter, decoded_frame,
ist->pts, sar);
- if (!ist->filtered_frame && !(ist->filtered_frame =
avcodec_alloc_frame())) {
- av_free(buffer_to_free);
- return AVERROR(ENOMEM);
- } else
- avcodec_get_frame_defaults(ist->filtered_frame);
- filtered_frame = ist->filtered_frame;
- frame_available =
avfilter_poll_frame(ost->output_video_filter->inputs[0]);
- }
+ if (ist->st->sample_aspect_ratio.num)
+ pixel_aspect = ist->st->sample_aspect_ratio;
+ else
+ pixel_aspect = ist->st->codec->sample_aspect_ratio;
+ if (ist->st->codec->codec->capabilities & CODEC_CAP_DR1) {
+ FrameBuffer *buf = decoded_frame->opaque;
+ AVFilterBufferRef *fb = avfilter_get_video_buffer_ref_from_arrays(
+ decoded_frame->data,
decoded_frame->linesize,
+ AV_PERM_READ | AV_PERM_PRESERVE,
+ ist->st->codec->width,
ist->st->codec->height,
+ ist->st->codec->pix_fmt);
+
+ avfilter_copy_frame_props(fb, decoded_frame);
+ fb->pts = ist->pts;
+ fb->video->pixel_aspect = pixel_aspect;
+ fb->buf->priv = buf;
+ fb->buf->free = filter_release_buffer;
+
+ buf->refcount++;
+ av_buffersrc_buffer(ost->input_video_filter, fb);
+ } else
+ av_vsrc_buffer_add_frame(ost->input_video_filter, decoded_frame,
+ ist->pts, pixel_aspect);
+
+ frame_available =
avfilter_poll_frame(ost->output_video_filter->inputs[0]);
+ if (!ist->filtered_frame && !(ist->filtered_frame =
avcodec_alloc_frame())) {
+ av_free(buffer_to_free);
+ return AVERROR(ENOMEM);
+ } else
+ avcodec_get_frame_defaults(ist->filtered_frame);
+ filtered_frame = ist->filtered_frame;
while (frame_available) {
AVRational ist_pts_tb;
if (ost->output_video_filter)
--
1.7.7.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
