generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/showspectrum: add sliding mode.

Browse Source
This commit is contained in:
Clément Bœsch 2012-10-21 21:01:18 +02:00
parent b19bfd6c9f
commit 13d26716fb
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/filters.texi
View File

@ -4704,6 +4704,9 @@ The filter accepts the following named parameters:
@table @option @table @option
@item size, s @item size, s
Specify the video size for the output. Default value is @code{640x480}. Specify the video size for the output. Default value is @code{640x480}.
@item slide
Specify if the spectrum should slide along the window. Default value is
@code{0}.
@end table @end table
The usage is very similar to the showwaves filter; see the examples in that The usage is very similar to the showwaves filter; see the examples in that

17
libavfilter/avf_showspectrum.c
View File

@ -37,6 +37,7 @@ typedef struct {
int w, h; int w, h;
AVFilterBufferRef *outpicref; AVFilterBufferRef *outpicref;
int req_fullfilled; int req_fullfilled;
int sliding; ///< 1 if sliding mode, 0 otherwise
int xpos; ///< x position (current column) int xpos; ///< x position (current column)
RDFTContext *rdft; ///< Real Discrete Fourier Transform context RDFTContext *rdft; ///< Real Discrete Fourier Transform context
int rdft_bits; ///< number of bits (RDFT window size = 1<<rdft_bits) int rdft_bits; ///< number of bits (RDFT window size = 1<<rdft_bits)
@ -52,6 +53,7 @@ typedef struct {
static const AVOption showspectrum_options[] = { static const AVOption showspectrum_options[] = {
{ "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, FLAGS }, { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, FLAGS },
{ "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, FLAGS }, { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "640x480"}, 0, 0, FLAGS },
{ "slide", "set sliding mode", OFFSET(sliding), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, FLAGS },
{ NULL }, { NULL },
}; };
@ -247,16 +249,23 @@ static int plot_spectrum_column(AVFilterLink *inlink, AVFilterBufferRef *insampl
for (y = 0; y < outlink->h; y++) { for (y = 0; y < outlink->h; y++) {
// FIXME: bin[0] contains first and last bins // FIXME: bin[0] contains first and last bins
const int pos = showspectrum->xpos * 3 + (outlink->h - y - 1) * outpicref->linesize[0]; uint8_t *p = outpicref->data[0] + (outlink->h - y - 1) * outpicref->linesize[0];
const double w = 1. / sqrt(nb_freq); const double w = 1. / sqrt(nb_freq);
int a = sqrt(w * MAGNITUDE(RE(0), IM(0))); int a = sqrt(w * MAGNITUDE(RE(0), IM(0)));
int b = nb_display_channels > 1 ? sqrt(w * MAGNITUDE(RE(1), IM(1))) : a; int b = nb_display_channels > 1 ? sqrt(w * MAGNITUDE(RE(1), IM(1))) : a;
if (showspectrum->sliding) {
memmove(p, p + 3, (outlink->w - 1) * 3);
p += (outlink->w - 1) * 3;
} else {
p += showspectrum->xpos * 3;
}
a = FFMIN(a, 255); a = FFMIN(a, 255);
b = FFMIN(b, 255); b = FFMIN(b, 255);
outpicref->data[0][pos] = a; p[0] = a;
outpicref->data[0][pos+1] = b; p[1] = b;
outpicref->data[0][pos+2] = (a + b) / 2; p[2] = (a + b) / 2;
} }
outpicref->pts = insamples->pts + outpicref->pts = insamples->pts +
av_rescale_q(showspectrum->consumed, av_rescale_q(showspectrum->consumed,

2
libavfilter/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3 #define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 20 #define LIBAVFILTER_VERSION_MINOR 20
#define LIBAVFILTER_VERSION_MICRO 105 #define LIBAVFILTER_VERSION_MICRO 106
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \