apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-07 17:51:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: make OutputFile.ch_layout private

Browse Source 
It is not used outside of the filtering code.
This commit is contained in:
Anton Khirnov
2023-07-06 17:09:59 +02:00
parent 42f3f54cf4
commit c19aa9c28f
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fftools/ffmpeg.h
View File

@@ -296,7 +296,6 @@ typedef struct OutputFilter {
/* desired output stream properties */ /* desired output stream properties */
int width, height; int width, height;
AVChannelLayout ch_layout;
// those are only set if no format is specified and the encoder gives us multiple options // those are only set if no format is specified and the encoder gives us multiple options
// They point directly to the relevant lists of the encoder. // They point directly to the relevant lists of the encoder.

17
fftools/ffmpeg_filter.c
View File

@@ -139,6 +139,7 @@ typedef struct OutputFilterPriv {
/* desired output stream properties */ /* desired output stream properties */
int format; int format;
int sample_rate; int sample_rate;
AVChannelLayout ch_layout;
} OutputFilterPriv; } OutputFilterPriv;
static OutputFilterPriv *ofp_from_ofilter(OutputFilter *ofilter) static OutputFilterPriv *ofp_from_ofilter(OutputFilter *ofilter)
@@ -375,9 +376,10 @@ DEF_CHOOSE_FORMAT(sample_rates, int, sample_rate, sample_rates, 0,
static void choose_channel_layouts(OutputFilter *ofilter, AVBPrint *bprint) static void choose_channel_layouts(OutputFilter *ofilter, AVBPrint *bprint)
{ {
if (av_channel_layout_check(&ofilter->ch_layout)) { OutputFilterPriv *ofp = ofp_from_ofilter(ofilter);
if (av_channel_layout_check(&ofp->ch_layout)) {
av_bprintf(bprint, "channel_layouts="); av_bprintf(bprint, "channel_layouts=");
av_channel_layout_describe_bprint(&ofilter->ch_layout, bprint); av_channel_layout_describe_bprint(&ofp->ch_layout, bprint);
} else if (ofilter->ch_layouts) { } else if (ofilter->ch_layouts) {
const AVChannelLayout *p; const AVChannelLayout *p;
@@ -630,7 +632,7 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist)
return 0; return 0;
} }
static void set_channel_layout(OutputFilter *f, OutputStream *ost) static void set_channel_layout(OutputFilterPriv *f, OutputStream *ost)
{ {
const AVCodec *c = ost->enc_ctx->codec; const AVCodec *c = ost->enc_ctx->codec;
int i, err; int i, err;
@@ -701,7 +703,7 @@ void ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost)
ofilter->sample_rates = c->supported_samplerates; ofilter->sample_rates = c->supported_samplerates;
} }
if (ost->enc_ctx->ch_layout.nb_channels) { if (ost->enc_ctx->ch_layout.nb_channels) {
set_channel_layout(ofilter, ost); set_channel_layout(ofp, ost);
} else if (c->ch_layouts) { } else if (c->ch_layouts) {
ofilter->ch_layouts = c->ch_layouts; ofilter->ch_layouts = c->ch_layouts;
} }
@@ -782,10 +784,11 @@ void fg_free(FilterGraph **pfg)
av_freep(&fg->inputs); av_freep(&fg->inputs);
for (int j = 0; j < fg->nb_outputs; j++) { for (int j = 0; j < fg->nb_outputs; j++) {
OutputFilter *ofilter = fg->outputs[j]; OutputFilter *ofilter = fg->outputs[j];
OutputFilterPriv *ofp = ofp_from_ofilter(ofilter);
av_freep(&ofilter->linklabel); av_freep(&ofilter->linklabel);
av_freep(&ofilter->name); av_freep(&ofilter->name);
av_channel_layout_uninit(&ofilter->ch_layout); av_channel_layout_uninit(&ofp->ch_layout);
av_freep(&fg->outputs[j]); av_freep(&fg->outputs[j]);
} }
av_freep(&fg->outputs); av_freep(&fg->outputs);
@@ -1597,8 +1600,8 @@ static int configure_filtergraph(FilterGraph *fg)
ofilter->height = av_buffersink_get_h(sink); ofilter->height = av_buffersink_get_h(sink);
ofp->sample_rate = av_buffersink_get_sample_rate(sink); ofp->sample_rate = av_buffersink_get_sample_rate(sink);
av_channel_layout_uninit(&ofilter->ch_layout); av_channel_layout_uninit(&ofp->ch_layout);
ret = av_buffersink_get_ch_layout(sink, &ofilter->ch_layout); ret = av_buffersink_get_ch_layout(sink, &ofp->ch_layout);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} }