The vsrc_buffer.h is not installed since commit 0b3b95813576, so there is no point into keeping it around. The buffersrc.h API, which is more powerful, should be used instead.
Unified · Split
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | 30 | ||
| 31 | #include "libavcodec/avcodec.h" // AVFrame | 31 | #include "libavcodec/avcodec.h" // AVFrame |
| 32 | #include "avfilter.h" | 32 | #include "avfilter.h" |
| 33 | #include "vsrc_buffer.h" | ||
| 34 | 33 | ||
| 35 | /** | 34 | /** |
| 36 | * Copy the frame properties of src to dst, without copying the actual | 35 | * Copy the frame properties of src to dst, without copying the actual |
| @@ -119,15 +118,4 @@ int avfilter_fill_frame_from_buffer_ref(AVFrame *frame, · 82 unmodified lines | |||
| 119 | int av_buffersrc_add_frame(AVFilterContext *buffer_src, | 118 | int av_buffersrc_add_frame(AVFilterContext *buffer_src, |
| 120 | const AVFrame *frame, int flags); | 119 | const AVFrame *frame, int flags); |
| 121 | 120 | ||
| 122 | /** | ||
| 123 | * Add frame data to buffer_src. | ||
| 124 | * | ||
| 125 | * @param buffer_src pointer to a buffer source context | ||
| 126 | * @param flags a combination of AV_VSRC_BUF_FLAG_* flags | ||
| 127 | * @return >= 0 in case of success, a negative AVERROR code in case of | ||
| 128 | * failure | ||
| 129 | */ | ||
| 130 | int av_vsrc_buffer_add_frame(AVFilterContext *buffer_src, | ||
| 131 | const AVFrame *frame, int flags); | ||
| 132 | |||
| 133 | #endif /* AVFILTER_AVCODEC_H */ | 121 | #endif /* AVFILTER_AVCODEC_H */ |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | #include "audio.h" | 30 | #include "audio.h" |
| 31 | #include "avcodec.h" | 31 | #include "avcodec.h" |
| 32 | #include "buffersrc.h" | 32 | #include "buffersrc.h" |
| 33 | #include "vsrc_buffer.h" | ||
| 34 | #include "asrc_abuffer.h" | 33 | #include "asrc_abuffer.h" |
| 35 | #include "libavutil/audioconvert.h" | 34 | #include "libavutil/audioconvert.h" |
| 36 | #include "libavutil/avstring.h" | 35 | #include "libavutil/avstring.h" |
| @@ -67,27 +66,6 @@ static void buf_free(AVFilterBuffer *ptr) · 30 unmodified lines | |||
| 67 | return; | 66 | return; |
| 68 | } | 67 | } |
| 69 | 68 | ||
| 70 | int av_vsrc_buffer_add_video_buffer_ref(AVFilterContext *buffer_filter, | ||
| 71 | AVFilterBufferRef *picref, int flags) | ||
| 72 | { | ||
| 73 | return av_buffersrc_add_ref(buffer_filter, picref, 0); | ||
| 74 | } | ||
| 75 | |||
| 76 | #if CONFIG_AVCODEC | ||
| 77 | #include "avcodec.h" | ||
| 78 | |||
| 79 | int av_vsrc_buffer_add_frame(AVFilterContext *buffer_src, | ||
| 80 | const AVFrame *frame, int flags) | ||
| 81 | { | ||
| 82 | return av_buffersrc_add_frame(buffer_src, frame, 0); | ||
| 83 | } | ||
| 84 | #endif | ||
| 85 | |||
| 86 | unsigned av_vsrc_buffer_get_nb_failed_requests(AVFilterContext *buffer_src) | ||
| 87 | { | ||
| 88 | return ((BufferSourceContext *)buffer_src->priv)->nb_failed_requests; | ||
| 89 | } | ||
| 90 | |||
| 91 | int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *ctx, | 69 | int av_asrc_buffer_add_audio_buffer_ref(AVFilterContext *ctx, |
| 92 | AVFilterBufferRef *samplesref, | 70 | AVFilterBufferRef *samplesref, |
| 93 | int av_unused flags) | 71 | int av_unused flags) |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | |||
| 30 | 30 | ||
| 31 | #define LIBAVFILTER_VERSION_MAJOR 3 | 31 | #define LIBAVFILTER_VERSION_MAJOR 3 |
| 32 | #define LIBAVFILTER_VERSION_MINOR 0 | 32 | #define LIBAVFILTER_VERSION_MINOR 0 |
| 33 | #define LIBAVFILTER_VERSION_MICRO 100 | 33 | #define LIBAVFILTER_VERSION_MICRO 101 |
| 34 | 34 | ||
| 35 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | 35 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| 36 | LIBAVFILTER_VERSION_MINOR, \ | 36 | LIBAVFILTER_VERSION_MINOR, \ |
| @@ -1,66 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2008 Vitor Sessak | ||
| 3 | * | ||
| 4 | * This file is part of FFmpeg. | ||
| 5 | * | ||
| 6 | * FFmpeg is free software; you can redistribute it and/or | ||
| 7 | * modify it under the terms of the GNU Lesser General Public | ||
| 8 | * License as published by the Free Software Foundation; either | ||
| 9 | * version 2.1 of the License, or (at your option) any later version. | ||
| 10 | * | ||
| 11 | * FFmpeg is distributed in the hope that it will be useful, | ||
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 14 | * Lesser General Public License for more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU Lesser General Public | ||
| 17 | * License along with FFmpeg; if not, write to the Free Software | ||
| 18 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 19 | */ | ||
| 20 | |||
| 21 | #ifndef AVFILTER_VSRC_BUFFER_H | ||
| 22 | #define AVFILTER_VSRC_BUFFER_H | ||
| 23 | |||
| 24 | /** | ||
| 25 | * @file | ||
| 26 | * memory buffer source API for video | ||
| 27 | * | ||
| 28 | * @deprecated use buffersrc.h instead. | ||
| 29 | */ | ||
| 30 | |||
| 31 | #include "avfilter.h" | ||
| 32 | |||
| 33 | /** | ||
| 34 | * Tell av_vsrc_buffer_add_video_buffer_ref() to overwrite the already | ||
| 35 | * cached video buffer with the new added one, otherwise the function | ||
| 36 | * will complain and exit. | ||
| 37 | */ | ||
| 38 | #define AV_VSRC_BUF_FLAG_OVERWRITE 1 | ||
| 39 | |||
| 40 | /** | ||
| 41 | * Add video buffer data in picref to buffer_src. | ||
| 42 | * | ||
| 43 | * @param buffer_src pointer to a buffer source context | ||
| 44 | * @param flags a combination of AV_VSRC_BUF_FLAG_* flags | ||
| 45 | * @return >= 0 in case of success, a negative AVERROR code in case of | ||
| 46 | * failure | ||
| 47 | * | ||
| 48 | * @deprecated use av_buffersrc_add_ref() instead. | ||
| 49 | */ | ||
| 50 | attribute_deprecated | ||
| 51 | int av_vsrc_buffer_add_video_buffer_ref(AVFilterContext *buffer_src, | ||
| 52 | AVFilterBufferRef *picref, int flags); | ||
| 53 | |||
| 54 | /** | ||
| 55 | * Get the number of failed requests. | ||
| 56 | * | ||
| 57 | * A failed request is when the request_frame method is called while no | ||
| 58 | * frame is present in the buffer. | ||
| 59 | * The number is reset when a frame is added. | ||
| 60 | * | ||
| 61 | * @deprecated use av_buffersrc_get_nb_failed_requests() instead. | ||
| 62 | */ | ||
| 63 | attribute_deprecated | ||
| 64 | unsigned av_vsrc_buffer_get_nb_failed_requests(AVFilterContext *buffer_src); | ||
| 65 | |||
| 66 | #endif /* AVFILTER_VSRC_BUFFER_H */ | ||