Skip to content

F
ffmpeg.wasm-core
Commit 057c5d2e authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '72e228b2' 

* commit '72e228b2':
  nut: K&R formatting cosmetics

Conflicts:
	libavformat/nut.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 86c9cf64 72e228b2
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 136 deletions
libavformat/nut.c
View file @ 057c5d2e
......@@ -26,125 +26,125 @@
#include "internal.h"
const AVCodecTag ff_nut_subtitle_tags[] = {
{ AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
{ AV_CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) },
{ AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
{ AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
{ AV_CODEC_ID_DVB_TELETEXT, MKTAG('D', 'V', 'B', 'T') },
{ AV_CODEC_ID_NONE , 0 }
{ AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') },
{ AV_CODEC_ID_SSA, MKTAG('S', 'S', 'A', 0 ) },
{ AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') },
{ AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') },
{ AV_CODEC_ID_DVB_TELETEXT, MKTAG('D', 'V', 'B', 'T') },
{ AV_CODEC_ID_NONE, 0 }
};
const AVCodecTag ff_nut_data_tags[] = {
{ AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') },
{ AV_CODEC_ID_NONE , 0 }
{ AV_CODEC_ID_TEXT, MKTAG('U', 'T', 'F', '8') },
{ AV_CODEC_ID_NONE, 0 }
};
const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 0 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 0 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'B', 'A', 64 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'R', 'B', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 14 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 14 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 14 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) },
{ AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 0 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 0 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 0 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'B', 'A', 64 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(64 , 'R', 'B', 'A') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 12 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 14 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 14 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 14 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(14 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 9 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 0 , '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 9 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 11 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 9 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 10 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 9 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG( 9 , 0 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 9) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(9, 0, '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 9) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(9, 11, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 9) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(9, 10, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 9) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(9, 0, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 10 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 10) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 10) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10, 11, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 10) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10, 10, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 10) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0 , 16 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 16) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 16) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16, 11, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 10, 16) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16, 10, '4', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 16) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '4', 'Y') },
{ AV_CODEC_ID_NONE , 0 }
{ AV_CODEC_ID_NONE, 0 }
};
static const AVCodecTag nut_audio_extra_tags[] = {
......@@ -186,42 +186,46 @@ const AVCodecTag * const ff_nut_codec_tags[] = {
ff_codec_bmp_tags, ff_codec_wav_tags, nut_audio_extra_tags, ff_nut_data_tags, 0
};
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val)
{
int i;
for(i=0; i<nut->avf->nb_streams; i++){
nut->stream[i].last_pts= av_rescale_rnd(
val,
time_base.num * (int64_t)nut->stream[i].time_base->den,
time_base.den * (int64_t)nut->stream[i].time_base->num,
AV_ROUND_DOWN);
}
for (i = 0; i < nut->avf->nb_streams; i++)
nut->stream[i].last_pts =
av_rescale_rnd(val,
time_base.num * (int64_t)nut->stream[i].time_base->den,
time_base.den * (int64_t)nut->stream[i].time_base->num,
AV_ROUND_DOWN);
}
int64_t ff_lsb2full(StreamContext *stream, int64_t lsb){
int64_t mask = (1ULL<<stream->msb_pts_shift)-1;
int64_t delta= stream->last_pts - mask/2;
return ((lsb - delta)&mask) + delta;
int64_t ff_lsb2full(StreamContext *stream, int64_t lsb)
{
int64_t mask = (1ULL << stream->msb_pts_shift) - 1;
int64_t delta = stream->last_pts - mask / 2;
return ((lsb - delta) & mask) + delta;
}
int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b){
int ff_nut_sp_pos_cmp(const Syncpoint *a, const Syncpoint *b)
{
return ((a->pos - b->pos) >> 32) - ((b->pos - a->pos) >> 32);
}
int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b){
int ff_nut_sp_pts_cmp(const Syncpoint *a, const Syncpoint *b)
{
return ((a->ts - b->ts) >> 32) - ((b->ts - a->ts) >> 32);
}
void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts){
Syncpoint *sp= av_mallocz(sizeof(Syncpoint));
void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts)
{
Syncpoint *sp = av_mallocz(sizeof(Syncpoint));
struct AVTreeNode *node = av_tree_node_alloc();
nut->sp_count++;
sp->pos= pos;
sp->back_ptr= back_ptr;
sp->ts= ts;
sp->pos = pos;
sp->back_ptr = back_ptr;
sp->ts = ts;
av_tree_insert(&nut->syncpoints, sp, (void *) ff_nut_sp_pos_cmp, &node);
if(node){
if (node) {
av_free(sp);
av_free(node);
}
......@@ -240,13 +244,13 @@ void ff_nut_free_sp(NUTContext *nut)
}
const Dispositions ff_nut_dispositions[] = {
{"default" , AV_DISPOSITION_DEFAULT},
{"dub" , AV_DISPOSITION_DUB},
{"original" , AV_DISPOSITION_ORIGINAL},
{"comment" , AV_DISPOSITION_COMMENT},
{"lyrics" , AV_DISPOSITION_LYRICS},
{"karaoke" , AV_DISPOSITION_KARAOKE},
{"" , 0}
{ "default", AV_DISPOSITION_DEFAULT },
{ "dub", AV_DISPOSITION_DUB },
{ "original", AV_DISPOSITION_ORIGINAL },
{ "comment", AV_DISPOSITION_COMMENT },
{ "lyrics", AV_DISPOSITION_LYRICS },
{ "karaoke", AV_DISPOSITION_KARAOKE },
{ "", 0 }
};
const AVMetadataConv ff_nut_metadata_conv[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment