|
|
|
@ -191,6 +191,7 @@ static const char unit_hertz_str[] = "Hz" ; |
|
|
|
|
static const char unit_byte_str[] = "byte" ; |
|
|
|
|
static const char unit_bit_per_second_str[] = "bit/s"; |
|
|
|
|
|
|
|
|
|
static int nb_streams; |
|
|
|
|
static uint64_t *nb_streams_packets; |
|
|
|
|
static uint64_t *nb_streams_frames; |
|
|
|
|
static int *selected_streams; |
|
|
|
@ -1632,6 +1633,14 @@ static void writer_register_all(void) |
|
|
|
|
#define print_section_header(s) writer_print_section_header(w, s) |
|
|
|
|
#define print_section_footer(s) writer_print_section_footer(w, s) |
|
|
|
|
|
|
|
|
|
#define REALLOCZ_ARRAY_STREAM(ptr, cur_n, new_n) \ |
|
|
|
|
{ \
|
|
|
|
|
ret = av_reallocp_array(&(ptr), (new_n), sizeof(*(ptr))); \
|
|
|
|
|
if (ret < 0) \
|
|
|
|
|
goto end; \
|
|
|
|
|
memset( (ptr) + (cur_n), 0, ((new_n) - (cur_n)) * sizeof(*(ptr)) ); \
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
static inline int show_tags(WriterContext *w, AVDictionary *tags, int section_id) |
|
|
|
|
{ |
|
|
|
|
AVDictionaryEntry *tag = NULL; |
|
|
|
@ -1893,6 +1902,12 @@ static int read_interval_packets(WriterContext *w, AVFormatContext *fmt_ctx, |
|
|
|
|
goto end; |
|
|
|
|
} |
|
|
|
|
while (!av_read_frame(fmt_ctx, &pkt)) { |
|
|
|
|
if (fmt_ctx->nb_streams > nb_streams) { |
|
|
|
|
REALLOCZ_ARRAY_STREAM(nb_streams_frames, nb_streams, fmt_ctx->nb_streams); |
|
|
|
|
REALLOCZ_ARRAY_STREAM(nb_streams_packets, nb_streams, fmt_ctx->nb_streams); |
|
|
|
|
REALLOCZ_ARRAY_STREAM(selected_streams, nb_streams, fmt_ctx->nb_streams); |
|
|
|
|
nb_streams = fmt_ctx->nb_streams; |
|
|
|
|
} |
|
|
|
|
if (selected_streams[pkt.stream_index]) { |
|
|
|
|
AVRational tb = fmt_ctx->streams[pkt.stream_index]->time_base; |
|
|
|
|
|
|
|
|
@ -2374,9 +2389,10 @@ static int probe_file(WriterContext *wctx, const char *filename) |
|
|
|
|
|
|
|
|
|
#define CHECK_END if (ret < 0) goto end |
|
|
|
|
|
|
|
|
|
nb_streams_frames = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_frames)); |
|
|
|
|
nb_streams_packets = av_calloc(fmt_ctx->nb_streams, sizeof(*nb_streams_packets)); |
|
|
|
|
selected_streams = av_calloc(fmt_ctx->nb_streams, sizeof(*selected_streams)); |
|
|
|
|
nb_streams = fmt_ctx->nb_streams; |
|
|
|
|
REALLOCZ_ARRAY_STREAM(nb_streams_frames,0,fmt_ctx->nb_streams); |
|
|
|
|
REALLOCZ_ARRAY_STREAM(nb_streams_packets,0,fmt_ctx->nb_streams); |
|
|
|
|
REALLOCZ_ARRAY_STREAM(selected_streams,0,fmt_ctx->nb_streams); |
|
|
|
|
|
|
|
|
|
for (i = 0; i < fmt_ctx->nb_streams; i++) { |
|
|
|
|
if (stream_specifier) { |
|
|
|
|