relayout global variable

dev
xufuji456 3 years ago
parent ec0bd00d67
commit 5de596bb0f
  1. 2
      app/CMakeLists.txt
  2. 23
      app/src/main/cpp/ffmpeg/ffmpeg.cpp
  3. 2
      app/src/main/cpp/ffmpeg/ffmpeg.h

@ -19,7 +19,7 @@ add_library( # Sets the name of the library.
# Provides a relative path to your source file(s). # Provides a relative path to your source file(s).
src/main/cpp/ffmpeg/cmdutils.c src/main/cpp/ffmpeg/cmdutils.c
src/main/cpp/ffmpeg/ffmpeg.cpp src/main/cpp/ffmpeg/ffmpeg.cpp
src/main/cpp/ffmpeg/ffmpeg_filter.c src/main/cpp/ffmpeg/ffmpeg_filter.c
src/main/cpp/ffmpeg/ffmpeg_opt.c src/main/cpp/ffmpeg/ffmpeg_opt.c
src/main/cpp/ffmpeg_cmd.c src/main/cpp/ffmpeg_cmd.c

@ -113,13 +113,9 @@ extern "C" {
#include <time.h> #include <time.h>
#include <setjmp.h> #include <setjmp.h>
jmp_buf jump_buf;
const char program_name[] = "ffmpeg"; const char program_name[] = "ffmpeg";
const int program_birth_year = 2000; const int program_birth_year = 2000;
static FILE *vstats_file;
const char *const forced_keyframes_const_names[] = { const char *const forced_keyframes_const_names[] = {
"n", "n",
"n_forced", "n_forced",
@ -147,12 +143,17 @@ static int nb_frames_drop = 0;
static int64_t decode_error_stat[2]; static int64_t decode_error_stat[2];
static int want_sdp = 1; static int want_sdp = 1;
static BenchmarkTimeStamps current_time; static BenchmarkTimeStamps current_time;
AVIOContext *progress_avio = NULL;
static uint8_t *subtitle_out; static uint8_t *subtitle_out;
static volatile int received_sigterm = 0;
static volatile int received_nb_signals = 0;
static atomic_int transcode_init_done = ATOMIC_VAR_INIT(0);
static volatile int ffmpeg_exited = 0;
static int main_return_code = 0;
static FILE *vstats_file;
AVIOContext *progress_avio = NULL;
InputStream **input_streams = NULL; InputStream **input_streams = NULL;
int nb_input_streams = 0; int nb_input_streams = 0;
InputFile **input_files = NULL; InputFile **input_files = NULL;
@ -167,6 +168,8 @@ FilterGraph **filtergraphs;
int nb_filtergraphs; int nb_filtergraphs;
int cancel_execute = 0; int cancel_execute = 0;
jmp_buf jump_buf;
#if HAVE_TERMIOS_H #if HAVE_TERMIOS_H
/* init terminal so that we can grab keys */ /* init terminal so that we can grab keys */
@ -341,12 +344,6 @@ void term_exit(void)
term_exit_sigsafe(); term_exit_sigsafe();
} }
static volatile int received_sigterm = 0;
static volatile int received_nb_signals = 0;
static atomic_int transcode_init_done = ATOMIC_VAR_INIT(0);
static volatile int ffmpeg_exited = 0;
static int main_return_code = 0;
static void static void
sigterm_handler(int sig) sigterm_handler(int sig)
{ {

@ -578,6 +578,7 @@ extern OutputStream **output_streams;
extern int nb_output_streams; extern int nb_output_streams;
extern OutputFile **output_files; extern OutputFile **output_files;
extern int nb_output_files; extern int nb_output_files;
extern AVIOContext *progress_avio;
extern FilterGraph **filtergraphs; extern FilterGraph **filtergraphs;
extern int nb_filtergraphs; extern int nb_filtergraphs;
@ -608,7 +609,6 @@ extern int print_stats;
extern int qp_hist; extern int qp_hist;
extern int stdin_interaction; extern int stdin_interaction;
extern int frame_bits_per_raw_sample; extern int frame_bits_per_raw_sample;
extern AVIOContext *progress_avio;
extern float max_error_rate; extern float max_error_rate;
extern char *videotoolbox_pixfmt; extern char *videotoolbox_pixfmt;

Loading…
Cancel
Save