diff --git a/configure b/configure
index 7f9fe4f0b7ccc632ded2cbad0eaef8ae9d3e7b08..b1280f98659e5e29608cc0625fb7ce14e3060993 100755
--- a/configure
+++ b/configure
@@ -2745,9 +2745,8 @@ case "$arch" in
sh4|sh)
arch="sh4"
;;
- sun4u|sparc64)
+ sun4u|sparc*)
arch="sparc"
- subarch="sparc64"
;;
tilegx|tile-gx)
arch="tilegx"
@@ -2965,7 +2964,7 @@ check_64bit(){
}
case "$arch" in
- alpha|ia64|sparc)
+ alpha|ia64)
spic=$shared
;;
mips)
@@ -2979,6 +2978,10 @@ case "$arch" in
ppc)
check_64bit ppc ppc64 'sizeof(void *) > 4'
;;
+ sparc)
+ check_64bit sparc sparc64 'sizeof(void *) > 4'
+ spic=$shared
+ ;;
x86)
check_64bit x86_32 x86_64 'sizeof(void *) > 4'
if test "$subarch" = "x86_64"; then
diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 7e45f4255492dc9e3c03b4749c091f47e4b0acaf..eaaf66bf0048179ddf973e89bc09a5bab61f13ad 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -918,10 +918,9 @@ static float auto_correlation(float *diff_isf, float mean, int lag)
static void extrapolate_isf(float isf[LP_ORDER_16k])
{
float diff_isf[LP_ORDER - 2], diff_mean;
- float *diff_hi = diff_isf - LP_ORDER + 1; // diff array for extrapolated indexes
float corr_lag[3];
float est, scale;
- int i, i_max_corr;
+ int i, j, i_max_corr;
isf[LP_ORDER_16k - 1] = isf[LP_ORDER - 1];
@@ -952,20 +951,20 @@ static void extrapolate_isf(float isf[LP_ORDER_16k])
scale = 0.5 * (FFMIN(est, 7600) - isf[LP_ORDER - 2]) /
(isf[LP_ORDER_16k - 2] - isf[LP_ORDER - 2]);
- for (i = LP_ORDER - 1; i < LP_ORDER_16k - 1; i++)
- diff_hi[i] = scale * (isf[i] - isf[i - 1]);
+ for (i = LP_ORDER - 1, j = 0; i < LP_ORDER_16k - 1; i++, j++)
+ diff_isf[j] = scale * (isf[i] - isf[i - 1]);
/* Stability insurance */
- for (i = LP_ORDER; i < LP_ORDER_16k - 1; i++)
- if (diff_hi[i] + diff_hi[i - 1] < 5.0) {
- if (diff_hi[i] > diff_hi[i - 1]) {
- diff_hi[i - 1] = 5.0 - diff_hi[i];
+ for (i = 1; i < LP_ORDER_16k - LP_ORDER; i++)
+ if (diff_isf[i] + diff_isf[i - 1] < 5.0) {
+ if (diff_isf[i] > diff_isf[i - 1]) {
+ diff_isf[i - 1] = 5.0 - diff_isf[i];
} else
- diff_hi[i] = 5.0 - diff_hi[i - 1];
+ diff_isf[i] = 5.0 - diff_isf[i - 1];
}
- for (i = LP_ORDER - 1; i < LP_ORDER_16k - 1; i++)
- isf[i] = isf[i - 1] + diff_hi[i] * (1.0f / (1 << 15));
+ for (i = LP_ORDER - 1, j = 0; i < LP_ORDER_16k - 1; i++, j++)
+ isf[i] = isf[i - 1] + diff_isf[j] * (1.0f / (1 << 15));
/* Scale the ISF vector for 16000 Hz */
for (i = 0; i < LP_ORDER_16k - 1; i++)
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 0bb5495b2c447b05ad5b9306a343d098524fba31..9424c458af0c59a57b1015e34f56ae5f226c780b 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -1965,7 +1965,8 @@ static int vp8_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
// top edge of 127 for intra prediction
if (!(avctx->flags & CODEC_FLAG_EMU_EDGE)) {
s->top_border[0][15] = s->top_border[0][23] = 127;
- memset(s->top_border[1]-1, 127, s->mb_width*sizeof(*s->top_border)+1);
+ s->top_border[0][31] = 127;
+ memset(s->top_border[1], 127, s->mb_width*sizeof(*s->top_border));
}
memset(s->ref_count, 0, sizeof(s->ref_count));
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 835fd8a55d66e5256d553b268290788679ac9b20..d7a29bfdc6fa0e67a3f49f0e2e0f6686f4901492 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -68,8 +68,9 @@ static int64_t get_pts(const uint8_t *p)
return sec*100+hsec;
}
-static int event_cmp(uint8_t **a, uint8_t **b)
+static int event_cmp(const void *_a, const void *_b)
{
+ const uint8_t *const *a = _a, *const *b = _b;
return get_pts(*a) - get_pts(*b);
}
@@ -131,7 +132,7 @@ static int read_header(AVFormatContext *s)
p++;
}
- qsort(ass->event, ass->event_count, sizeof(*ass->event), (void*)event_cmp);
+ qsort(ass->event, ass->event_count, sizeof(*ass->event), event_cmp);
return 0;
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 53ebd74c3cae31f20306541ebdce3e41aaed7e26..08c049ab34227c0f5ac6b0d849ca7949c3601bb3 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -29,59 +29,65 @@
#include "internal.h"
#include "avio_internal.h"
-static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint8_t out[64]){
- int sample_rate= c->sample_rate;
+static int find_expected_header(AVCodecContext *c, int size, int key_frame,
+ uint8_t out[64])
+{
+ int sample_rate = c->sample_rate;
- if(size>4096)
+ if (size > 4096)
return 0;
AV_WB24(out, 1);
- if(c->codec_id == AV_CODEC_ID_MPEG4){
- if(key_frame){
+ if (c->codec_id == AV_CODEC_ID_MPEG4) {
+ if (key_frame) {
return 3;
- }else{
- out[3]= 0xB6;
+ } else {
+ out[3] = 0xB6;
return 4;
}
- }else if(c->codec_id == AV_CODEC_ID_MPEG1VIDEO || c->codec_id == AV_CODEC_ID_MPEG2VIDEO){
+ } else if (c->codec_id == AV_CODEC_ID_MPEG1VIDEO ||
+ c->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
return 3;
- }else if(c->codec_id == AV_CODEC_ID_H264){
+ } else if (c->codec_id == AV_CODEC_ID_H264) {
return 3;
- }else if(c->codec_id == AV_CODEC_ID_MP3 || c->codec_id == AV_CODEC_ID_MP2){
+ } else if (c->codec_id == AV_CODEC_ID_MP3 ||
+ c->codec_id == AV_CODEC_ID_MP2) {
int lsf, mpeg25, sample_rate_index, bitrate_index, frame_size;
- int layer= c->codec_id == AV_CODEC_ID_MP3 ? 3 : 2;
- unsigned int header= 0xFFF00000;
+ int layer = c->codec_id == AV_CODEC_ID_MP3 ? 3 : 2;
+ unsigned int header = 0xFFF00000;
- lsf = sample_rate < (24000+32000)/2;
- mpeg25 = sample_rate < (12000+16000)/2;
+ lsf = sample_rate < (24000 + 32000) / 2;
+ mpeg25 = sample_rate < (12000 + 16000) / 2;
sample_rate <<= lsf + mpeg25;
- if (sample_rate < (32000 + 44100)/2) sample_rate_index=2;
- else if(sample_rate < (44100 + 48000)/2) sample_rate_index=0;
- else sample_rate_index=1;
+ if (sample_rate < (32000 + 44100) / 2) sample_rate_index = 2;
+ else if (sample_rate < (44100 + 48000) / 2) sample_rate_index = 0;
+ else sample_rate_index = 1;
- sample_rate= avpriv_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25);
+ sample_rate = avpriv_mpa_freq_tab[sample_rate_index] >> (lsf + mpeg25);
- for(bitrate_index=2; bitrate_index<30; bitrate_index++){
- frame_size = avpriv_mpa_bitrate_tab[lsf][layer-1][bitrate_index>>1];
- frame_size = (frame_size * 144000) / (sample_rate << lsf) + (bitrate_index&1);
+ for (bitrate_index = 2; bitrate_index < 30; bitrate_index++) {
+ frame_size =
+ avpriv_mpa_bitrate_tab[lsf][layer - 1][bitrate_index >> 1];
+ frame_size = (frame_size * 144000) / (sample_rate << lsf) +
+ (bitrate_index & 1);
- if(frame_size == size)
+ if (frame_size == size)
break;
}
- header |= (!lsf)<<19;
- header |= (4-layer)<<17;
- header |= 1<<16; //no crc
+ header |= (!lsf) << 19;
+ header |= (4 - layer) << 17;
+ header |= 1 << 16; //no crc
AV_WB32(out, header);
- if(size <= 0)
- return 2; //we guess there is no crc, if there is one the user clearly does not care about overhead
- if(bitrate_index == 30)
- return -1; //something is wrong ...
+ if (size <= 0)
+ return 2; //we guess there is no crc, if there is one the user clearly does not care about overhead
+ if (bitrate_index == 30)
+ return -1; //something is wrong ...
- header |= (bitrate_index>>1)<<12;
- header |= sample_rate_index<<10;
- header |= (bitrate_index&1)<<9;
+ header |= (bitrate_index >> 1) << 12;
+ header |= sample_rate_index << 10;
+ header |= (bitrate_index & 1) << 9;
return 2; //FIXME actually put the needed ones in build_elision_headers()
return 3; //we guess that the private bit is not set
@@ -90,71 +96,74 @@ static int find_expected_header(AVCodecContext *c, int size, int key_frame, uint
return 0;
}
-static int find_header_idx(AVFormatContext *s, AVCodecContext *c, int size, int frame_type){
+static int find_header_idx(AVFormatContext *s, AVCodecContext *c, int size, int frame_type)
+{
NUTContext *nut = s->priv_data;
uint8_t out[64];
int i;
- int len= find_expected_header(c, size, frame_type, out);
+ int len = find_expected_header(c, size, frame_type, out);
- for(i=1; i<nut->header_count; i++){
- if( len == nut->header_len[i]
- && !memcmp(out, nut->header[i], len)){
+ for (i = 1; i < nut->header_count; i++) {
+ if (len == nut->header_len[i] && !memcmp(out, nut->header[i], len)) {
return i;
}
}
+
return 0;
}
-static void build_elision_headers(AVFormatContext *s){
+static void build_elision_headers(AVFormatContext *s)
+{
NUTContext *nut = s->priv_data;
int i;
//FIXME this is lame
//FIXME write a 2pass mode to find the maximal headers
- static const uint8_t headers[][5]={
- {3, 0x00, 0x00, 0x01},
- {4, 0x00, 0x00, 0x01, 0xB6},
- {2, 0xFF, 0xFA}, //mp3+crc
- {2, 0xFF, 0xFB}, //mp3
- {2, 0xFF, 0xFC}, //mp2+crc
- {2, 0xFF, 0xFD}, //mp2
+ static const uint8_t headers[][5] = {
+ { 3, 0x00, 0x00, 0x01 },
+ { 4, 0x00, 0x00, 0x01, 0xB6},
+ { 2, 0xFF, 0xFA }, //mp3+crc
+ { 2, 0xFF, 0xFB }, //mp3
+ { 2, 0xFF, 0xFC }, //mp2+crc
+ { 2, 0xFF, 0xFD }, //mp2
};
- nut->header_count= 7;
- for(i=1; i<nut->header_count; i++){
- nut->header_len[i]= headers[i-1][0];
- nut->header [i]= &headers[i-1][1];
+ nut->header_count = 7;
+ for (i = 1; i < nut->header_count; i++) {
+ nut->header_len[i] = headers[i - 1][0];
+ nut->header[i] = &headers[i - 1][1];
}
}
-static void build_frame_code(AVFormatContext *s){
+static void build_frame_code(AVFormatContext *s)
+{
NUTContext *nut = s->priv_data;
int key_frame, index, pred, stream_id;
- int start=1;
- int end= 254;
- int keyframe_0_esc= s->nb_streams > 2;
+ int start = 1;
+ int end = 254;
+ int keyframe_0_esc = s->nb_streams > 2;
int pred_table[10];
FrameCode *ft;
- ft= &nut->frame_code[start];
- ft->flags= FLAG_CODED;
- ft->size_mul=1;
- ft->pts_delta=1;
+ ft = &nut->frame_code[start];
+ ft->flags = FLAG_CODED;
+ ft->size_mul = 1;
+ ft->pts_delta = 1;
start++;
- if(keyframe_0_esc){
+ if (keyframe_0_esc) {
/* keyframe = 0 escape */
- FrameCode *ft= &nut->frame_code[start];
- ft->flags= FLAG_STREAM_ID | FLAG_SIZE_MSB | FLAG_CODED_PTS;
- ft->size_mul=1;
+ FrameCode *ft = &nut->frame_code[start];
+ ft->flags = FLAG_STREAM_ID | FLAG_SIZE_MSB | FLAG_CODED_PTS;
+ ft->size_mul = 1;
start++;
}
- for(stream_id= 0; stream_id<s->nb_streams; stream_id++){
- int start2= start + (end-start)*stream_id / s->nb_streams;
- int end2 = start + (end-start)*(stream_id+1) / s->nb_streams;
+ for (stream_id = 0; stream_id < s->nb_streams; stream_id++) {
+ int start2 = start + (end - start) * stream_id / s->nb_streams;
+ int end2 = start + (end - start) * (stream_id + 1) / s->nb_streams;
AVCodecContext *codec = s->streams[stream_id]->codec;
- int is_audio= codec->codec_type == AVMEDIA_TYPE_AUDIO;
- int intra_only= /*codec->intra_only || */is_audio;
+ int is_audio = codec->codec_type == AVMEDIA_TYPE_AUDIO;
+ int intra_only = /*codec->intra_only || */ is_audio;
int pred_count;
int frame_size = 0;
@@ -164,116 +173,116 @@ static void build_frame_code(AVFormatContext *s){
frame_size = 64;
} else {
AVRational f = av_div_q(codec->time_base, *nut->stream[stream_id].time_base);
- if(f.den == 1 && f.num>0)
+ if (f.den == 1 && f.num>0)
frame_size = f.num;
}
- if(!frame_size)
+ if (!frame_size)
frame_size = 1;
- for(key_frame=0; key_frame<2; key_frame++){
- if(intra_only && keyframe_0_esc && key_frame==0)
- continue;
-
- {
- FrameCode *ft= &nut->frame_code[start2];
- ft->flags= FLAG_KEY*key_frame;
- ft->flags|= FLAG_SIZE_MSB | FLAG_CODED_PTS;
- ft->stream_id= stream_id;
- ft->size_mul=1;
- if(is_audio)
- ft->header_idx= find_header_idx(s, codec, -1, key_frame);
+ for (key_frame = 0; key_frame < 2; key_frame++) {
+ if (!intra_only || !keyframe_0_esc || key_frame != 0) {
+ FrameCode *ft = &nut->frame_code[start2];
+ ft->flags = FLAG_KEY * key_frame;
+ ft->flags |= FLAG_SIZE_MSB | FLAG_CODED_PTS;
+ ft->stream_id = stream_id;
+ ft->size_mul = 1;
+ if (is_audio)
+ ft->header_idx = find_header_idx(s, codec, -1, key_frame);
start2++;
}
}
- key_frame= intra_only;
+ key_frame = intra_only;
#if 1
- if(is_audio){
- int frame_bytes= codec->frame_size*(int64_t)codec->bit_rate / (8*codec->sample_rate);
+ if (is_audio) {
+ int frame_bytes = codec->frame_size * (int64_t)codec->bit_rate /
+ (8 * codec->sample_rate);
int pts;
- for(pts=0; pts<2; pts++){
- for(pred=0; pred<2; pred++){
- FrameCode *ft= &nut->frame_code[start2];
- ft->flags= FLAG_KEY*key_frame;
- ft->stream_id= stream_id;
- ft->size_mul=frame_bytes + 2;
- ft->size_lsb=frame_bytes + pred;
- ft->pts_delta=pts * frame_size;
- ft->header_idx= find_header_idx(s, codec, frame_bytes + pred, key_frame);
+ for (pts = 0; pts < 2; pts++) {
+ for (pred = 0; pred < 2; pred++) {
+ FrameCode *ft = &nut->frame_code[start2];
+ ft->flags = FLAG_KEY * key_frame;
+ ft->stream_id = stream_id;
+ ft->size_mul = frame_bytes + 2;
+ ft->size_lsb = frame_bytes + pred;
+ ft->pts_delta = pts * frame_size;
+ ft->header_idx = find_header_idx(s, codec, frame_bytes + pred, key_frame);
start2++;
}
}
- }else{
- FrameCode *ft= &nut->frame_code[start2];
- ft->flags= FLAG_KEY | FLAG_SIZE_MSB;
- ft->stream_id= stream_id;
- ft->size_mul=1;
- ft->pts_delta=frame_size;
+ } else {
+ FrameCode *ft = &nut->frame_code[start2];
+ ft->flags = FLAG_KEY | FLAG_SIZE_MSB;
+ ft->stream_id = stream_id;
+ ft->size_mul = 1;
+ ft->pts_delta = frame_size;
start2++;
}
#endif
- if(codec->has_b_frames){
- pred_count=5;
- pred_table[0]=-2;
- pred_table[1]=-1;
- pred_table[2]=1;
- pred_table[3]=3;
- pred_table[4]=4;
- }else if(codec->codec_id == AV_CODEC_ID_VORBIS){
- pred_count=3;
- pred_table[0]=2;
- pred_table[1]=9;
- pred_table[2]=16;
- }else{
- pred_count=1;
- pred_table[0]=1;
+ if (codec->has_b_frames) {
+ pred_count = 5;
+ pred_table[0] = -2;
+ pred_table[1] = -1;
+ pred_table[2] = 1;
+ pred_table[3] = 3;
+ pred_table[4] = 4;
+ } else if (codec->codec_id == AV_CODEC_ID_VORBIS) {
+ pred_count = 3;
+ pred_table[0] = 2;
+ pred_table[1] = 9;
+ pred_table[2] = 16;
+ } else {
+ pred_count = 1;
+ pred_table[0] = 1;
}
- for(pred=0; pred<pred_count; pred++){
- int start3= start2 + (end2-start2)*pred / pred_count;
- int end3 = start2 + (end2-start2)*(pred+1) / pred_count;
+ for (pred = 0; pred < pred_count; pred++) {
+ int start3 = start2 + (end2 - start2) * pred / pred_count;
+ int end3 = start2 + (end2 - start2) * (pred + 1) / pred_count;
pred_table[pred] *= frame_size;
- for(index=start3; index<end3; index++){
- FrameCode *ft= &nut->frame_code[index];
- ft->flags= FLAG_KEY*key_frame;
- ft->flags|= FLAG_SIZE_MSB;
- ft->stream_id= stream_id;
+ for (index = start3; index < end3; index++) {
+ FrameCode *ft = &nut->frame_code[index];
+ ft->flags = FLAG_KEY * key_frame;
+ ft->flags |= FLAG_SIZE_MSB;
+ ft->stream_id = stream_id;
//FIXME use single byte size and pred from last
- ft->size_mul= end3-start3;
- ft->size_lsb= index - start3;
- ft->pts_delta= pred_table[pred];
- if(is_audio)
- ft->header_idx= find_header_idx(s, codec, -1, key_frame);
+ ft->size_mul = end3 - start3;
+ ft->size_lsb = index - start3;
+ ft->pts_delta = pred_table[pred];
+ if (is_audio)
+ ft->header_idx = find_header_idx(s, codec, -1, key_frame);
}
}
}
- memmove(&nut->frame_code['N'+1], &nut->frame_code['N'], sizeof(FrameCode)*(255-'N'));
- nut->frame_code[ 0].flags=
- nut->frame_code[255].flags=
- nut->frame_code['N'].flags= FLAG_INVALID;
+ memmove(&nut->frame_code['N' + 1], &nut->frame_code['N'], sizeof(FrameCode) * (255 - 'N'));
+ nut->frame_code[0].flags =
+ nut->frame_code[255].flags =
+ nut->frame_code['N'].flags = FLAG_INVALID;
}
-static void put_tt(NUTContext *nut, AVRational *time_base, AVIOContext *bc, uint64_t val){
+static void put_tt(NUTContext *nut, AVRational *time_base, AVIOContext *bc, uint64_t val)
+{
val *= nut->time_base_count;
val += time_base - nut->time_base;
ff_put_v(bc, val);
}
-
/**
* Store a string as vb.
*/
-static void put_str(AVIOContext *bc, const char *string){
- int len= strlen(string);
+static void put_str(AVIOContext *bc, const char *string)
+{
+ int len = strlen(string);
ff_put_v(bc, len);
avio_write(bc, string, len);
}
-static void put_s(AVIOContext *bc, int64_t val){
- ff_put_v(bc, 2*FFABS(val) - (val>0));
+static void put_s(AVIOContext *bc, int64_t val)
+{
+ ff_put_v(bc, 2 * FFABS(val) - (val > 0));
}
#ifdef TRACE
@@ -285,8 +294,7 @@ static inline void ff_put_v_trace(AVIOContext *bc, uint64_t v, const char *file,
ff_put_v(bc, v);
}
-static inline void put_s_trace(AVIOContext *bc, int64_t v, const char *file,
- const char *func, int line)
+static inline void put_s_trace(AVIOContext *bc, int64_t v, const char *file, const char *func, int line)
{
av_log(NULL, AV_LOG_DEBUG, "put_s %5"PRId64" / %"PRIX64" in %s %s:%d\n", v, v, file, func, line);
@@ -297,29 +305,33 @@ static inline void put_s_trace(AVIOContext *bc, int64_t v, const char *file,
#endif
//FIXME remove calculate_checksum
-static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc, int calculate_checksum, uint64_t startcode){
- uint8_t *dyn_buf=NULL;
- int dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf);
- int forw_ptr= dyn_size + 4*calculate_checksum;
+static void put_packet(NUTContext *nut, AVIOContext *bc, AVIOContext *dyn_bc,
+ int calculate_checksum, uint64_t startcode)
+{
+ uint8_t *dyn_buf = NULL;
+ int dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
+ int forw_ptr = dyn_size + 4 * calculate_checksum;
- if(forw_ptr > 4096)
+ if (forw_ptr > 4096)
ffio_init_checksum(bc, ff_crc04C11DB7_update, 0);
avio_wb64(bc, startcode);
ff_put_v(bc, forw_ptr);
- if(forw_ptr > 4096)
+ if (forw_ptr > 4096)
avio_wl32(bc, ffio_get_checksum(bc));
- if(calculate_checksum)
+ if (calculate_checksum)
ffio_init_checksum(bc, ff_crc04C11DB7_update, 0);
avio_write(bc, dyn_buf, dyn_size);
- if(calculate_checksum)
+ if (calculate_checksum)
avio_wl32(bc, ffio_get_checksum(bc));
av_free(dyn_buf);
}
-static void write_mainheader(NUTContext *nut, AVIOContext *bc){
- int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields, tmp_head_idx;
+static void write_mainheader(NUTContext *nut, AVIOContext *bc)
+{
+ int i, j, tmp_pts, tmp_flags, tmp_stream, tmp_mul, tmp_size, tmp_fields,
+ tmp_head_idx;
int64_t tmp_match;
ff_put_v(bc, 3); /* version */
@@ -327,80 +339,85 @@ static void write_mainheader(NUTContext *nut, AVIOContext *bc){
ff_put_v(bc, nut->max_distance);
ff_put_v(bc, nut->time_base_count);
- for(i=0; i<nut->time_base_count; i++){
+ for (i = 0; i < nut->time_base_count; i++) {
ff_put_v(bc, nut->time_base[i].num);
ff_put_v(bc, nut->time_base[i].den);
}
- tmp_pts=0;
- tmp_mul=1;
- tmp_stream=0;
- tmp_match= 1-(1LL<<62);
- tmp_head_idx= 0;
- for(i=0; i<256;){
- tmp_fields=0;
- tmp_size=0;
+ tmp_pts = 0;
+ tmp_mul = 1;
+ tmp_stream = 0;
+ tmp_match = 1 - (1LL << 62);
+ tmp_head_idx = 0;
+ for (i = 0; i < 256; ) {
+ tmp_fields = 0;
+ tmp_size = 0;
// tmp_res=0;
- if(tmp_pts != nut->frame_code[i].pts_delta) tmp_fields=1;
- if(tmp_mul != nut->frame_code[i].size_mul ) tmp_fields=2;
- if(tmp_stream != nut->frame_code[i].stream_id) tmp_fields=3;
- if(tmp_size != nut->frame_code[i].size_lsb ) tmp_fields=4;
-// if(tmp_res != nut->frame_code[i].res ) tmp_fields=5;
- if(tmp_head_idx!=nut->frame_code[i].header_idx)tmp_fields=8;
-
- tmp_pts = nut->frame_code[i].pts_delta;
- tmp_flags = nut->frame_code[i].flags;
- tmp_stream= nut->frame_code[i].stream_id;
- tmp_mul = nut->frame_code[i].size_mul;
- tmp_size = nut->frame_code[i].size_lsb;
+ if (tmp_pts != nut->frame_code[i].pts_delta ) tmp_fields = 1;
+ if (tmp_mul != nut->frame_code[i].size_mul ) tmp_fields = 2;
+ if (tmp_stream != nut->frame_code[i].stream_id ) tmp_fields = 3;
+ if (tmp_size != nut->frame_code[i].size_lsb ) tmp_fields = 4;
+// if (tmp_res != nut->frame_code[i].res ) tmp_fields=5;
+ if (tmp_head_idx != nut->frame_code[i].header_idx) tmp_fields = 8;
+
+ tmp_pts = nut->frame_code[i].pts_delta;
+ tmp_flags = nut->frame_code[i].flags;
+ tmp_stream = nut->frame_code[i].stream_id;
+ tmp_mul = nut->frame_code[i].size_mul;
+ tmp_size = nut->frame_code[i].size_lsb;
// tmp_res = nut->frame_code[i].res;
- tmp_head_idx= nut->frame_code[i].header_idx;
+ tmp_head_idx = nut->frame_code[i].header_idx;
- for(j=0; i<256; j++,i++){
- if(i == 'N'){
+ for (j = 0; i < 256; j++, i++) {
+ if (i == 'N') {
j--;
continue;
}
- if(nut->frame_code[i].pts_delta != tmp_pts ) break;
- if(nut->frame_code[i].flags != tmp_flags ) break;
- if(nut->frame_code[i].stream_id != tmp_stream) break;
- if(nut->frame_code[i].size_mul != tmp_mul ) break;
- if(nut->frame_code[i].size_lsb != tmp_size+j) break;
-// if(nut->frame_code[i].res != tmp_res ) break;
- if(nut->frame_code[i].header_idx!= tmp_head_idx) break;
+ if (nut->frame_code[i].pts_delta != tmp_pts ||
+ nut->frame_code[i].flags != tmp_flags ||
+ nut->frame_code[i].stream_id != tmp_stream ||
+ nut->frame_code[i].size_mul != tmp_mul ||
+ nut->frame_code[i].size_lsb != tmp_size + j ||
+// nut->frame_code[i].res != tmp_res ||
+ nut->frame_code[i].header_idx != tmp_head_idx)
+ break;
}
- if(j != tmp_mul - tmp_size) tmp_fields=6;
+ if (j != tmp_mul - tmp_size)
+ tmp_fields = 6;
ff_put_v(bc, tmp_flags);
ff_put_v(bc, tmp_fields);
- if(tmp_fields>0) put_s(bc, tmp_pts);
- if(tmp_fields>1) ff_put_v(bc, tmp_mul);
- if(tmp_fields>2) ff_put_v(bc, tmp_stream);
- if(tmp_fields>3) ff_put_v(bc, tmp_size);
- if(tmp_fields>4) ff_put_v(bc, 0 /*tmp_res*/);
- if(tmp_fields>5) ff_put_v(bc, j);
- if(tmp_fields>6) ff_put_v(bc, tmp_match);
- if(tmp_fields>7) ff_put_v(bc, tmp_head_idx);
+ if (tmp_fields > 0) put_s(bc, tmp_pts);
+ if (tmp_fields > 1) ff_put_v(bc, tmp_mul);
+ if (tmp_fields > 2) ff_put_v(bc, tmp_stream);
+ if (tmp_fields > 3) ff_put_v(bc, tmp_size);
+ if (tmp_fields > 4) ff_put_v(bc, 0 /*tmp_res*/);
+ if (tmp_fields > 5) ff_put_v(bc, j);
+ if (tmp_fields > 6) ff_put_v(bc, tmp_match);
+ if (tmp_fields > 7) ff_put_v(bc, tmp_head_idx);
}
- ff_put_v(bc, nut->header_count-1);
- for(i=1; i<nut->header_count; i++){
+ ff_put_v(bc, nut->header_count - 1);
+ for (i = 1; i < nut->header_count; i++) {
ff_put_v(bc, nut->header_len[i]);
avio_write(bc, nut->header[i], nut->header_len[i]);
}
}
-static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream *st, int i){
- NUTContext *nut = avctx->priv_data;
+static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc,
+ AVStream *st, int i)
+{
+ NUTContext *nut = avctx->priv_data;
AVCodecContext *codec = st->codec;
+
ff_put_v(bc, i);
- switch(codec->codec_type){
- case AVMEDIA_TYPE_VIDEO: ff_put_v(bc, 0); break;
- case AVMEDIA_TYPE_AUDIO: ff_put_v(bc, 1); break;
+ switch (codec->codec_type) {
+ case AVMEDIA_TYPE_VIDEO: ff_put_v(bc, 0); break;
+ case AVMEDIA_TYPE_AUDIO: ff_put_v(bc, 1); break;
case AVMEDIA_TYPE_SUBTITLE: ff_put_v(bc, 2); break;
- default : ff_put_v(bc, 3); break;
+ default: ff_put_v(bc, 3); break;
}
ff_put_v(bc, 4);
- if (codec->codec_tag){
+ if (codec->codec_tag) {
avio_wl32(bc, codec->codec_tag);
} else {
av_log(avctx, AV_LOG_ERROR, "No codec tag defined for stream %d\n", i);
@@ -416,7 +433,7 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream
ff_put_v(bc, codec->extradata_size);
avio_write(bc, codec->extradata, codec->extradata_size);
- switch(codec->codec_type){
+ switch (codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:
ff_put_v(bc, codec->sample_rate);
ff_put_v(bc, 1);
@@ -426,10 +443,11 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream
ff_put_v(bc, codec->width);
ff_put_v(bc, codec->height);
- if(st->sample_aspect_ratio.num<=0 || st->sample_aspect_ratio.den<=0){
+ if (st->sample_aspect_ratio.num <= 0 ||
+ st->sample_aspect_ratio.den <= 0) {
ff_put_v(bc, 0);
ff_put_v(bc, 0);
- }else{
+ } else {
ff_put_v(bc, st->sample_aspect_ratio.num);
ff_put_v(bc, st->sample_aspect_ratio.den);
}
@@ -441,21 +459,23 @@ static int write_streamheader(AVFormatContext *avctx, AVIOContext *bc, AVStream
return 0;
}
-static int add_info(AVIOContext *bc, const char *type, const char *value){
+static int add_info(AVIOContext *bc, const char *type, const char *value)
+{
put_str(bc, type);
put_s(bc, -1);
put_str(bc, value);
return 1;
}
-static int write_globalinfo(NUTContext *nut, AVIOContext *bc){
- AVFormatContext *s= nut->avf;
+static int write_globalinfo(NUTContext *nut, AVIOContext *bc)
+{
+ AVFormatContext *s = nut->avf;
AVDictionaryEntry *t = NULL;
AVIOContext *dyn_bc;
- uint8_t *dyn_buf=NULL;
- int count=0, dyn_size;
- int ret = avio_open_dyn_buf(&dyn_bc);
- if(ret < 0)
+ uint8_t *dyn_buf = NULL;
+ int count = 0, dyn_size;
+ int ret = avio_open_dyn_buf(&dyn_bc);
+ if (ret < 0)
return ret;
while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX)))
@@ -468,13 +488,13 @@ static int write_globalinfo(NUTContext *nut, AVIOContext *bc){
ff_put_v(bc, count);
- dyn_size= avio_close_dyn_buf(dyn_bc, &dyn_buf);
+ dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
avio_write(bc, dyn_buf, dyn_size);
av_free(dyn_buf);
return 0;
}
-static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id){
+static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id) {
AVFormatContext *s= nut->avf;
AVStream* st = s->streams[stream_id];
AVDictionaryEntry *t = NULL;
@@ -482,7 +502,7 @@ static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id){
uint8_t *dyn_buf=NULL;
int count=0, dyn_size, i;
int ret = avio_open_dyn_buf(&dyn_bc);
- if(ret < 0)
+ if (ret < 0)
return ret;
while ((t = av_dict_get(st->metadata, "", t, AV_DICT_IGNORE_SUFFIX)))
@@ -516,9 +536,9 @@ static int write_streaminfo(NUTContext *nut, AVIOContext *bc, int stream_id){
static int write_chapter(NUTContext *nut, AVIOContext *bc, int id)
{
AVIOContext *dyn_bc;
- uint8_t *dyn_buf = NULL;
+ uint8_t *dyn_buf = NULL;
AVDictionaryEntry *t = NULL;
- AVChapter *ch = nut->avf->chapters[id];
+ AVChapter *ch = nut->avf->chapters[id];
int ret, dyn_size, count = 0;
ret = avio_open_dyn_buf(&dyn_bc);
@@ -541,7 +561,7 @@ static int write_chapter(NUTContext *nut, AVIOContext *bc, int id)
return 0;
}
-static int write_index(NUTContext *nut, AVIOContext *bc){
+static int write_index(NUTContext *nut, AVIOContext *bc) {
int i;
Syncpoint dummy= { .pos= 0 };
Syncpoint *next_node[2] = { NULL };
@@ -552,25 +572,25 @@ static int write_index(NUTContext *nut, AVIOContext *bc){
ff_put_v(bc, nut->sp_count);
- for(i=0; i<nut->sp_count; i++){
+ for (i=0; i<nut->sp_count; i++) {
av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp, (void**)next_node);
ff_put_v(bc, (next_node[1]->pos >> 4) - (dummy.pos>>4));
dummy.pos = next_node[1]->pos;
}
- for(i=0; i<nut->avf->nb_streams; i++){
+ for (i=0; i<nut->avf->nb_streams; i++) {
StreamContext *nus= &nut->stream[i];
int64_t last_pts= -1;
int j, k;
- for(j=0; j<nut->sp_count; j++){
+ for (j=0; j<nut->sp_count; j++) {
int flag = (nus->keyframe_pts[j] != AV_NOPTS_VALUE) ^ (j+1 == nut->sp_count);
int n = 0;
- for(; j<nut->sp_count && (nus->keyframe_pts[j] != AV_NOPTS_VALUE) == flag; j++)
+ for (; j<nut->sp_count && (nus->keyframe_pts[j] != AV_NOPTS_VALUE) == flag; j++)
n++;
ff_put_v(bc, 1 + 2*flag + 4*n);
- for(k= j - n; k<=j && k<nut->sp_count; k++) {
- if(nus->keyframe_pts[k] == AV_NOPTS_VALUE)
+ for (k= j - n; k<=j && k<nut->sp_count; k++) {
+ if (nus->keyframe_pts[k] == AV_NOPTS_VALUE)
continue;
av_assert0(nus->keyframe_pts[k] > last_pts);
ff_put_v(bc, nus->keyframe_pts[k] - last_pts);
@@ -586,7 +606,8 @@ static int write_index(NUTContext *nut, AVIOContext *bc){
return 0;
}
-static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
+static int write_headers(AVFormatContext *avctx, AVIOContext *bc)
+{
NUTContext *nut = avctx->priv_data;
AVIOContext *dyn_bc;
int i, ret;
@@ -594,29 +615,30 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
ff_metadata_conv_ctx(avctx, ff_nut_metadata_conv, NULL);
ret = avio_open_dyn_buf(&dyn_bc);
- if(ret < 0)
+ if (ret < 0)
return ret;
write_mainheader(nut, dyn_bc);
put_packet(nut, bc, dyn_bc, 1, MAIN_STARTCODE);
- for (i=0; i < nut->avf->nb_streams; i++){
+ for (i = 0; i < nut->avf->nb_streams; i++) {
ret = avio_open_dyn_buf(&dyn_bc);
- if(ret < 0)
+ if (ret < 0)
return ret;
- if ((ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i)) < 0)
+ ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i);
+ if (ret < 0)
return ret;
put_packet(nut, bc, dyn_bc, 1, STREAM_STARTCODE);
}
ret = avio_open_dyn_buf(&dyn_bc);
- if(ret < 0)
+ if (ret < 0)
return ret;
write_globalinfo(nut, dyn_bc);
put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
for (i = 0; i < nut->avf->nb_streams; i++) {
ret = avio_open_dyn_buf(&dyn_bc);
- if(ret < 0)
+ if (ret < 0)
return ret;
ret = write_streaminfo(nut, dyn_bc, i);
if (ret < 0)
@@ -624,7 +646,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
if (ret > 0)
put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
else {
- uint8_t* buf;
+ uint8_t *buf;
avio_close_dyn_buf(dyn_bc, &buf);
av_free(buf);
}
@@ -644,22 +666,23 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc){
put_packet(nut, bc, dyn_bc, 1, INFO_STARTCODE);
}
- nut->last_syncpoint_pos= INT_MIN;
+ nut->last_syncpoint_pos = INT_MIN;
nut->header_count++;
return 0;
}
-static int nut_write_header(AVFormatContext *s){
+static int nut_write_header(AVFormatContext *s)
+{
NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb;
int i, j, ret;
- nut->avf= s;
+ nut->avf = s;
- nut->stream = av_mallocz(sizeof(StreamContext)*s->nb_streams);
- nut->chapter = av_mallocz(sizeof(ChapterContext)*s->nb_chapters);
- nut->time_base= av_mallocz(sizeof(AVRational )*(s->nb_streams +
- s->nb_chapters));
+ nut->stream = av_mallocz(sizeof(StreamContext ) * s->nb_streams);
+ nut->chapter = av_mallocz(sizeof(ChapterContext) * s->nb_chapters);
+ nut->time_base= av_mallocz(sizeof(AVRational ) *(s->nb_streams +
+ s->nb_chapters));
if (!nut->stream || !nut->chapter || !nut->time_base) {
av_freep(&nut->stream);
av_freep(&nut->chapter);
@@ -667,48 +690,47 @@ static int nut_write_header(AVFormatContext *s){
return AVERROR(ENOMEM);
}
- for(i=0; i<s->nb_streams; i++){
- AVStream *st= s->streams[i];
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
int ssize;
AVRational time_base;
ff_parse_specific_params(st->codec, &time_base.den, &ssize, &time_base.num);
- if(st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->sample_rate) {
- time_base = (AVRational){1, st->codec->sample_rate};
+ if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && st->codec->sample_rate) {
+ time_base = (AVRational) {1, st->codec->sample_rate};
} else {
time_base = ff_choose_timebase(s, st, 48000);
}
avpriv_set_pts_info(st, 64, time_base.num, time_base.den);
- for(j=0; j<nut->time_base_count; j++){
- if(!memcmp(&time_base, &nut->time_base[j], sizeof(AVRational))){
+ for (j = 0; j < nut->time_base_count; j++)
+ if (!memcmp(&time_base, &nut->time_base[j], sizeof(AVRational))) {
break;
}
- }
- nut->time_base[j]= time_base;
- nut->stream[i].time_base= &nut->time_base[j];
- if(j==nut->time_base_count)
+ nut->time_base[j] = time_base;
+ nut->stream[i].time_base = &nut->time_base[j];
+ if (j == nut->time_base_count)
nut->time_base_count++;
- if(INT64_C(1000) * time_base.num >= time_base.den)
+ if (INT64_C(1000) * time_base.num >= time_base.den)
nut->stream[i].msb_pts_shift = 7;
else
nut->stream[i].msb_pts_shift = 14;
- nut->stream[i].max_pts_distance= FFMAX(time_base.den, time_base.num) / time_base.num;
+ nut->stream[i].max_pts_distance =
+ FFMAX(time_base.den, time_base.num) / time_base.num;
}
for (i = 0; i < s->nb_chapters; i++) {
AVChapter *ch = s->chapters[i];
- for (j = 0; j < nut->time_base_count; j++) {
+ for (j = 0; j < nut->time_base_count; j++)
if (!memcmp(&ch->time_base, &nut->time_base[j], sizeof(AVRational)))
break;
- }
- nut->time_base[j] = ch->time_base;
+ nut->time_base[j] = ch->time_base;
nut->chapter[i].time_base = &nut->time_base[j];
- if(j == nut->time_base_count)
+ if (j == nut->time_base_count)
nut->time_base_count++;
}
@@ -731,52 +753,62 @@ static int nut_write_header(AVFormatContext *s){
return 0;
}
-static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc, AVPacket *pkt){
- int flags= 0;
-
- if(pkt->flags & AV_PKT_FLAG_KEY ) flags |= FLAG_KEY;
- if(pkt->stream_index != fc->stream_id ) flags |= FLAG_STREAM_ID;
- if(pkt->size / fc->size_mul ) flags |= FLAG_SIZE_MSB;
- if(pkt->pts - nus->last_pts != fc->pts_delta) flags |= FLAG_CODED_PTS;
- if(pkt->size > 2*nut->max_distance ) flags |= FLAG_CHECKSUM;
- if(FFABS(pkt->pts - nus->last_pts)
- > nus->max_pts_distance) flags |= FLAG_CHECKSUM;
- if( pkt->size < nut->header_len[fc->header_idx]
- || (pkt->size > 4096 && fc->header_idx)
- || memcmp(pkt->data, nut->header[fc->header_idx], nut->header_len[fc->header_idx]))
- flags |= FLAG_HEADER_IDX;
+static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc,
+ AVPacket *pkt)
+{
+ int flags = 0;
+
+ if (pkt->flags & AV_PKT_FLAG_KEY)
+ flags |= FLAG_KEY;
+ if (pkt->stream_index != fc->stream_id)
+ flags |= FLAG_STREAM_ID;
+ if (pkt->size / fc->size_mul)
+ flags |= FLAG_SIZE_MSB;
+ if (pkt->pts - nus->last_pts != fc->pts_delta)
+ flags |= FLAG_CODED_PTS;
+ if (pkt->size > 2 * nut->max_distance)
+ flags |= FLAG_CHECKSUM;
+ if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance)
+ flags |= FLAG_CHECKSUM;
+ if (pkt->size < nut->header_len[fc->header_idx] ||
+ (pkt->size > 4096 && fc->header_idx) ||
+ memcmp(pkt->data, nut->header[fc->header_idx],
+ nut->header_len[fc->header_idx]))
+ flags |= FLAG_HEADER_IDX;
return flags | (fc->flags & FLAG_CODED);
}
-static int find_best_header_idx(NUTContext *nut, AVPacket *pkt){
+static int find_best_header_idx(NUTContext *nut, AVPacket *pkt)
+{
int i;
- int best_i = 0;
- int best_len= 0;
+ int best_i = 0;
+ int best_len = 0;
- if(pkt->size > 4096)
+ if (pkt->size > 4096)
return 0;
- for(i=1; i<nut->header_count; i++){
- if( pkt->size >= nut->header_len[i]
- && nut->header_len[i] > best_len
- && !memcmp(pkt->data, nut->header[i], nut->header_len[i])){
- best_i= i;
- best_len= nut->header_len[i];
+ for (i = 1; i < nut->header_count; i++)
+ if (pkt->size >= nut->header_len[i]
+ && nut->header_len[i] > best_len
+ && !memcmp(pkt->data, nut->header[i], nut->header_len[i])) {
+ best_i = i;
+ best_len = nut->header_len[i];
}
- }
return best_i;
}
-static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
- NUTContext *nut = s->priv_data;
- StreamContext *nus= &nut->stream[pkt->stream_index];
- AVIOContext *bc = s->pb, *dyn_bc;
+static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ NUTContext *nut = s->priv_data;
+ StreamContext *nus = &nut->stream[pkt->stream_index];
+ AVIOContext *bc = s->pb, *dyn_bc;
FrameCode *fc;
int64_t coded_pts;
- int best_length, frame_code, flags, needed_flags, i, header_idx, best_header_idx;
+ int best_length, frame_code, flags, needed_flags, i, header_idx;
+ int best_header_idx;
int key_frame = !!(pkt->flags & AV_PKT_FLAG_KEY);
- int store_sp=0;
+ int store_sp = 0;
int ret;
if (pkt->pts < 0) {
@@ -784,146 +816,148 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
return AVERROR(EINVAL);
}
- if(1LL<<(20+3*nut->header_count) <= avio_tell(bc))
+ if (1LL << (20 + 3 * nut->header_count) <= avio_tell(bc))
write_headers(s, bc);
- if(key_frame && !(nus->last_flags & FLAG_KEY))
- store_sp= 1;
+ if (key_frame && !(nus->last_flags & FLAG_KEY))
+ store_sp = 1;
- if(pkt->size + 30/*FIXME check*/ + avio_tell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
- store_sp= 1;
+ if (pkt->size + 30 /*FIXME check*/ + avio_tell(bc) >= nut->last_syncpoint_pos + nut->max_distance)
+ store_sp = 1;
//FIXME: Ensure store_sp is 1 in the first place.
- if(store_sp){
- Syncpoint *sp, dummy= {.pos= INT64_MAX};
+ if (store_sp) {
+ Syncpoint *sp, dummy = { .pos = INT64_MAX };
ff_nut_reset_ts(nut, *nus->time_base, pkt->dts);
- for(i=0; i<s->nb_streams; i++){
- AVStream *st= s->streams[i];
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
int64_t dts_tb = av_rescale_rnd(pkt->dts,
nus->time_base->num * (int64_t)nut->stream[i].time_base->den,
nus->time_base->den * (int64_t)nut->stream[i].time_base->num,
AV_ROUND_DOWN);
- int index= av_index_search_timestamp(st, dts_tb, AVSEEK_FLAG_BACKWARD);
- if(index>=0) dummy.pos= FFMIN(dummy.pos, st->index_entries[index].pos);
+ int index = av_index_search_timestamp(st, dts_tb,
+ AVSEEK_FLAG_BACKWARD);
+ if (index >= 0)
+ dummy.pos = FFMIN(dummy.pos, st->index_entries[index].pos);
}
- if(dummy.pos == INT64_MAX)
- dummy.pos= 0;
- sp= av_tree_find(nut->syncpoints, &dummy, (void *) ff_nut_sp_pos_cmp,
- NULL);
+ if (dummy.pos == INT64_MAX)
+ dummy.pos = 0;
+ sp = av_tree_find(nut->syncpoints, &dummy, (void *)ff_nut_sp_pos_cmp,
+ NULL);
- nut->last_syncpoint_pos= avio_tell(bc);
- ret = avio_open_dyn_buf(&dyn_bc);
- if(ret < 0)
+ nut->last_syncpoint_pos = avio_tell(bc);
+ ret = avio_open_dyn_buf(&dyn_bc);
+ if (ret < 0)
return ret;
put_tt(nut, nus->time_base, dyn_bc, pkt->dts);
- ff_put_v(dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos)>>4 : 0);
+ ff_put_v(dyn_bc, sp ? (nut->last_syncpoint_pos - sp->pos) >> 4 : 0);
put_packet(nut, bc, dyn_bc, 1, SYNCPOINT_STARTCODE);
- ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0/*unused*/, pkt->dts);
+ ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts);
- if((1ll<<60) % nut->sp_count == 0)
- for(i=0; i<s->nb_streams; i++){
+ if ((1ll<<60) % nut->sp_count == 0)
+ for (i=0; i<s->nb_streams; i++) {
int j;
StreamContext *nus = &nut->stream[i];
nus->keyframe_pts = av_realloc(nus->keyframe_pts, 2*nut->sp_count*sizeof(*nus->keyframe_pts));
- if(!nus->keyframe_pts)
+ if (!nus->keyframe_pts)
return AVERROR(ENOMEM);
- for(j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++)
+ for (j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++)
nus->keyframe_pts[j] = AV_NOPTS_VALUE;
}
}
av_assert0(nus->last_pts != AV_NOPTS_VALUE);
- coded_pts = pkt->pts & ((1<<nus->msb_pts_shift)-1);
- if(ff_lsb2full(nus, coded_pts) != pkt->pts)
- coded_pts= pkt->pts + (1<<nus->msb_pts_shift);
+ coded_pts = pkt->pts & ((1 << nus->msb_pts_shift) - 1);
+ if (ff_lsb2full(nus, coded_pts) != pkt->pts)
+ coded_pts = pkt->pts + (1 << nus->msb_pts_shift);
- best_header_idx= find_best_header_idx(nut, pkt);
+ best_header_idx = find_best_header_idx(nut, pkt);
- best_length=INT_MAX;
- frame_code= -1;
- for(i=0; i<256; i++){
- int length= 0;
- FrameCode *fc= &nut->frame_code[i];
- int flags= fc->flags;
+ best_length = INT_MAX;
+ frame_code = -1;
+ for (i = 0; i < 256; i++) {
+ int length = 0;
+ FrameCode *fc = &nut->frame_code[i];
+ int flags = fc->flags;
- if(flags & FLAG_INVALID)
+ if (flags & FLAG_INVALID)
continue;
- needed_flags= get_needed_flags(nut, nus, fc, pkt);
+ needed_flags = get_needed_flags(nut, nus, fc, pkt);
- if(flags & FLAG_CODED){
+ if (flags & FLAG_CODED) {
length++;
flags = needed_flags;
}
- if((flags & needed_flags) != needed_flags)
+ if ((flags & needed_flags) != needed_flags)
continue;
- if((flags ^ needed_flags) & FLAG_KEY)
+ if ((flags ^ needed_flags) & FLAG_KEY)
continue;
- if(flags & FLAG_STREAM_ID)
- length+= ff_get_v_length(pkt->stream_index);
+ if (flags & FLAG_STREAM_ID)
+ length += ff_get_v_length(pkt->stream_index);
- if(pkt->size % fc->size_mul != fc->size_lsb)
+ if (pkt->size % fc->size_mul != fc->size_lsb)
continue;
- if(flags & FLAG_SIZE_MSB)
+ if (flags & FLAG_SIZE_MSB)
length += ff_get_v_length(pkt->size / fc->size_mul);
- if(flags & FLAG_CHECKSUM)
- length+=4;
+ if (flags & FLAG_CHECKSUM)
+ length += 4;
- if(flags & FLAG_CODED_PTS)
+ if (flags & FLAG_CODED_PTS)
length += ff_get_v_length(coded_pts);
- if( (flags & FLAG_CODED)
- && nut->header_len[best_header_idx] > nut->header_len[fc->header_idx]+1){
+ if ( (flags & FLAG_CODED)
+ && nut->header_len[best_header_idx] > nut->header_len[fc->header_idx] + 1) {
flags |= FLAG_HEADER_IDX;
}
- if(flags & FLAG_HEADER_IDX){
+ if (flags & FLAG_HEADER_IDX) {
length += 1 - nut->header_len[best_header_idx];
- }else{
+ } else {
length -= nut->header_len[fc->header_idx];
}
- length*=4;
- length+= !(flags & FLAG_CODED_PTS);
- length+= !(flags & FLAG_CHECKSUM);
+ length *= 4;
+ length += !(flags & FLAG_CODED_PTS);
+ length += !(flags & FLAG_CHECKSUM);
- if(length < best_length){
- best_length= length;
- frame_code=i;
+ if (length < best_length) {
+ best_length = length;
+ frame_code = i;
}
}
av_assert0(frame_code != -1);
- fc= &nut->frame_code[frame_code];
- flags= fc->flags;
- needed_flags= get_needed_flags(nut, nus, fc, pkt);
- header_idx= fc->header_idx;
+ fc = &nut->frame_code[frame_code];
+ flags = fc->flags;
+ needed_flags = get_needed_flags(nut, nus, fc, pkt);
+ header_idx = fc->header_idx;
ffio_init_checksum(bc, ff_crc04C11DB7_update, 0);
avio_w8(bc, frame_code);
- if(flags & FLAG_CODED){
- ff_put_v(bc, (flags^needed_flags) & ~(FLAG_CODED));
+ if (flags & FLAG_CODED) {
+ ff_put_v(bc, (flags ^ needed_flags) & ~(FLAG_CODED));
flags = needed_flags;
}
- if(flags & FLAG_STREAM_ID) ff_put_v(bc, pkt->stream_index);
- if(flags & FLAG_CODED_PTS) ff_put_v(bc, coded_pts);
- if(flags & FLAG_SIZE_MSB) ff_put_v(bc, pkt->size / fc->size_mul);
- if(flags & FLAG_HEADER_IDX) ff_put_v(bc, header_idx= best_header_idx);
+ if (flags & FLAG_STREAM_ID) ff_put_v(bc, pkt->stream_index);
+ if (flags & FLAG_CODED_PTS) ff_put_v(bc, coded_pts);
+ if (flags & FLAG_SIZE_MSB ) ff_put_v(bc, pkt->size / fc->size_mul);
+ if (flags & FLAG_HEADER_IDX) ff_put_v(bc, header_idx = best_header_idx);
- if(flags & FLAG_CHECKSUM) avio_wl32(bc, ffio_get_checksum(bc));
- else ffio_get_checksum(bc);
+ if (flags & FLAG_CHECKSUM) avio_wl32(bc, ffio_get_checksum(bc));
+ else ffio_get_checksum(bc);
avio_write(bc, pkt->data + nut->header_len[header_idx], pkt->size - nut->header_len[header_idx]);
- nus->last_flags= flags;
- nus->last_pts= pkt->pts;
+ nus->last_flags = flags;
+ nus->last_pts = pkt->pts;
//FIXME just store one per syncpoint
- if(flags & FLAG_KEY) {
+ if (flags & FLAG_KEY) {
av_add_index_entry(
s->streams[pkt->stream_index],
nut->last_syncpoint_pos,
@@ -931,11 +965,11 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
0,
0,
AVINDEX_KEYFRAME);
- if(nus->keyframe_pts && nus->keyframe_pts[nut->sp_count] == AV_NOPTS_VALUE)
+ if (nus->keyframe_pts && nus->keyframe_pts[nut->sp_count] == AV_NOPTS_VALUE)
nus->keyframe_pts[nut->sp_count] = pkt->pts;
}
- if(!nut->max_pts_tb || av_compare_ts(nut->max_pts, *nut->max_pts_tb, pkt->pts, *nus->time_base) < 0) {
+ if (!nut->max_pts_tb || av_compare_ts(nut->max_pts, *nut->max_pts_tb, pkt->pts, *nus->time_base) < 0) {
nut->max_pts = pkt->pts;
nut->max_pts_tb = nus->time_base;
}
@@ -943,22 +977,23 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt){
return 0;
}
-static int nut_write_trailer(AVFormatContext *s){
- NUTContext *nut= s->priv_data;
+static int nut_write_trailer(AVFormatContext *s)
+{
+ NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb, *dyn_bc;
int i, ret;
- while(nut->header_count<3)
+ while (nut->header_count < 3)
write_headers(s, bc);
ret = avio_open_dyn_buf(&dyn_bc);
- if(ret >= 0) {
+ if (ret >= 0) {
write_index(nut, dyn_bc);
put_packet(nut, bc, dyn_bc, 1, INDEX_STARTCODE);
}
ff_nut_free_sp(nut);
- for(i=0; i<s->nb_streams; i++)
+ for (i=0; i<s->nb_streams; i++)
av_freep(&nut->stream[i].keyframe_pts);
av_freep(&nut->stream);
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index cc13eafef1f1f14386d7949b905fa81a31b20f24..357b4122c7a9e607def1b066c7aedb31140de7d0 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -216,9 +216,8 @@ static int yuv4_write_header(AVFormatContext *s)
return AVERROR(EIO);
if (s->streams[0]->codec->codec_id != AV_CODEC_ID_RAWVIDEO) {
- av_log(s, AV_LOG_ERROR,
- "A non-rawvideo stream was selected, but yuv4mpeg only handles rawvideo streams\n");
- return AVERROR(EINVAL);
+ av_log(s, AV_LOG_ERROR, "ERROR: Only rawvideo supported.\n");
+ return AVERROR_INVALIDDATA;
}
switch (s->streams[0]->codec->pix_fmt) {