mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-17 23:05:05 +02:00
fftools/ffmpeg: move guess_input_channel_layout() to ffmpeg_opt.c
That is the only place where it is used. Also make it static.
This commit is contained in:
parent
6353b28042
commit
4f91782fcd
@ -1934,25 +1934,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
|
|||||||
ost->streamcopy_started = 1;
|
ost->streamcopy_started = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int guess_input_channel_layout(InputStream *ist)
|
|
||||||
{
|
|
||||||
AVCodecContext *dec = ist->dec_ctx;
|
|
||||||
|
|
||||||
if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
|
|
||||||
char layout_name[256];
|
|
||||||
|
|
||||||
if (dec->ch_layout.nb_channels > ist->guess_layout_max)
|
|
||||||
return 0;
|
|
||||||
av_channel_layout_default(&dec->ch_layout, dec->ch_layout.nb_channels);
|
|
||||||
if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
|
|
||||||
return 0;
|
|
||||||
av_channel_layout_describe(&dec->ch_layout, layout_name, sizeof(layout_name));
|
|
||||||
av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Input Stream "
|
|
||||||
"#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name);
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void check_decode_result(InputStream *ist, int *got_output, int ret)
|
static void check_decode_result(InputStream *ist, int *got_output, int ret)
|
||||||
{
|
{
|
||||||
if (*got_output || ret<0)
|
if (*got_output || ret<0)
|
||||||
|
@ -668,8 +668,6 @@ void show_usage(void);
|
|||||||
void remove_avoptions(AVDictionary **a, AVDictionary *b);
|
void remove_avoptions(AVDictionary **a, AVDictionary *b);
|
||||||
void assert_avoptions(AVDictionary *m);
|
void assert_avoptions(AVDictionary *m);
|
||||||
|
|
||||||
int guess_input_channel_layout(InputStream *ist);
|
|
||||||
|
|
||||||
int configure_filtergraph(FilterGraph *fg);
|
int configure_filtergraph(FilterGraph *fg);
|
||||||
void check_filter_outputs(void);
|
void check_filter_outputs(void);
|
||||||
int filtergraph_is_simple(FilterGraph *fg);
|
int filtergraph_is_simple(FilterGraph *fg);
|
||||||
|
@ -862,6 +862,25 @@ static const AVCodec *choose_decoder(OptionsContext *o, AVFormatContext *s, AVSt
|
|||||||
return avcodec_find_decoder(st->codecpar->codec_id);
|
return avcodec_find_decoder(st->codecpar->codec_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int guess_input_channel_layout(InputStream *ist)
|
||||||
|
{
|
||||||
|
AVCodecContext *dec = ist->dec_ctx;
|
||||||
|
|
||||||
|
if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
|
||||||
|
char layout_name[256];
|
||||||
|
|
||||||
|
if (dec->ch_layout.nb_channels > ist->guess_layout_max)
|
||||||
|
return 0;
|
||||||
|
av_channel_layout_default(&dec->ch_layout, dec->ch_layout.nb_channels);
|
||||||
|
if (dec->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
|
||||||
|
return 0;
|
||||||
|
av_channel_layout_describe(&dec->ch_layout, layout_name, sizeof(layout_name));
|
||||||
|
av_log(NULL, AV_LOG_WARNING, "Guessed Channel Layout for Input Stream "
|
||||||
|
"#%d.%d : %s\n", ist->file_index, ist->st->index, layout_name);
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* Add all the streams from the given input file to the global
|
/* Add all the streams from the given input file to the global
|
||||||
* list of input streams. */
|
* list of input streams. */
|
||||||
static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
|
static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
|
||||||
|
Loading…
Reference in New Issue
Block a user